Romain Neutron
|
ea7523f1db
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Lightbox.php
lib/Alchemy/Phrasea/Controller/Permalink.php
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
lib/Alchemy/Phrasea/Controller/Prod/Order.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Share.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Controller/Setup.php
lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Feed/Entry/Item.php
lib/classes/record/adapter.php
lib/classes/task/Scheduler.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/writemeta.php
tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
|
2013-10-31 14:01:44 +01:00 |
|
Romain Neutron
|
9b471fdf76
|
Fix CS
|
2013-10-31 11:53:30 +01:00 |
|
Romain Neutron
|
64cbe2a57d
|
Remove user comments in root controllers
|
2013-10-30 19:16:51 +01:00 |
|
Romain Neutron
|
9f086f4f05
|
Declare user controllers as services, remove "call" methods
|
2013-10-30 19:16:25 +01:00 |
|
Nicolas Le Goff
|
53cafa7117
|
Fix #1189 notifications display is broken
|
2013-05-30 18:59:59 +02:00 |
|
Romain Neutron
|
76413165ff
|
Update authentication to service provider
|
2013-05-29 14:22:51 +02:00 |
|
Romain Neutron
|
53206af159
|
Fix CS lib/Alchemy
|
2013-01-29 16:38:00 +01:00 |
|
Romain Neutron
|
842ad40985
|
Bump copyright year
|
2013-01-21 23:28:58 +01:00 |
|
Nicolas Le Goff
|
ec8d577a41
|
Add missing class declaration
Fix tests
Update tests
Fix CS
|
2012-10-19 17:32:12 +02:00 |
|
Nicolas Le Goff
|
12fe0c2283
|
Remove duplicated routes
Fix Cs
FixCS
|
2012-10-19 17:32:05 +02:00 |
|
Nicolas Le Goff
|
45c3e564df
|
Fix PR
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Records.php
templates/web/prod/Share/record.html.twig
|
2012-10-18 15:45:52 +02:00 |
|
Nicolas Le Goff
|
1f4debee45
|
Fix Tests
remove useless comment
Add end line
Conflicts:
templates/web/prod/Share/record.html.twig
|
2012-10-18 15:45:52 +02:00 |
|
Nicolas Le Goff
|
19f1bca120
|
Fix CS
Add comments
Remove bad ident
Undo modification
Conflicts:
templates/web/common/dialog_export.html.twig
|
2012-10-18 15:45:50 +02:00 |
|
Nicolas Le Goff
|
cde9ce18ae
|
Add prod refactor
Fix issue
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Share.php
lib/Alchemy/Phrasea/Controller/User/Notifications.php
lib/Alchemy/Phrasea/Controller/User/Preferences.php
templates/web/common/dialog_export.html.twig
|
2012-10-18 15:45:50 +02:00 |
|