Benoît Burnichon
|
1e18b3e69f
|
This is a combination of 33 commits.
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
|
2016-04-20 16:22:14 +02:00 |
|
Benoît Burnichon
|
614394edc7
|
Method renaming
|
2016-01-26 14:25:08 +01:00 |
|
Florian BLOUET
|
0e97e4a0ae
|
moved skins/icon to assets/common/images/icons
|
2015-12-02 17:35:37 +01:00 |
|
Benoît Burnichon
|
b272ce5aac
|
Add some groups legacy, functional, web, authenticated
|
2015-06-15 19:30:51 +02:00 |
|
Benoît Burnichon
|
d473a6f69c
|
Fixup tests with proper clearing of cache.
|
2015-06-10 14:50:29 +02:00 |
|
Nicolas Le Goff
|
9a3e92ed9c
|
Multiple ORMs for all database
|
2015-02-12 17:58:45 +01:00 |
|
Romain Neutron
|
1713c23c59
|
Merge branch '3.8'
Conflicts:
bin/console
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/User/Adapter.php
lib/classes/media/Permalink/Adapter.php
lib/classes/media/abstract.php
lib/classes/media/subdef.php
lib/classes/p4file.php
lib/classes/record/preview.php
lib/conf.d/_GV_template.inc
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
tests/classes/media/Permalink/media_Permalink_AdapterTest.php
|
2014-03-03 17:00:17 +01:00 |
|
Romain Neutron
|
c5d3f97258
|
Fix PSR-0 file naming
|
2014-02-14 15:51:09 +01:00 |
|