Nicolas Le Goff
|
de7988689e
|
Update directory structure & allow to configure paths (tmp, log, cache)
|
2014-09-05 15:57:00 +02:00 |
|
Romain Neutron
|
5d843ab370
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Border/Manager.php
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
lib/Alchemy/Phrasea/Helper/User/Manage.php
lib/classes/User/Adapter.php
lib/classes/connection.php
lib/classes/connection/abstract.php
lib/classes/connection/interface.php
lib/classes/connection/pdo.php
lib/classes/patch/370alpha7a.php
lib/classes/patch/370alpha8a.php
lib/classes/record/adapter.php
lib/classes/task/period/RecordMover.php
tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
|
2014-03-03 00:05:11 +01:00 |
|
Romain Neutron
|
035576cefc
|
Fix #1705 : MySQL connection might be lost after long operations
|
2014-03-02 02:19:13 +01:00 |
|
Romain Neutron
|
5a5da77662
|
Use Doctrine DBAL instead of custom connection
|
2014-02-22 23:55:12 +01:00 |
|
Romain Neutron
|
e20c915775
|
Avoid using getPartialReference
|
2014-02-20 16:14:01 +01:00 |
|
Nicolas Le Goff
|
ba464ad497
|
Fix CS
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
7fb44d2b43
|
Fix merge
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
f2b2efe54c
|
Fix load partial references
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
65e6b44671
|
Enhance User migration
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
7c0d1e3d8d
|
Fix user migration
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
2973513519
|
Fix user migration
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
7b9106d298
|
Update patches
|
2014-02-19 17:29:25 +01:00 |
|
Nicolas Le Goff
|
26bd977d5f
|
Delete references to usr.usr_id field in entities
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
lib/conf.d/migrations.yml
Conflicts:
lib/Alchemy/Phrasea/ACL/BasketACL.php
lib/Alchemy/Phrasea/Authentication/Authenticator.php
lib/Alchemy/Phrasea/Controller/Prod/Order.php
lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Model/Entities/Basket.php
lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
lib/Alchemy/Phrasea/Model/Entities/Feed.php
lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
lib/Alchemy/Phrasea/Model/Entities/Session.php
lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
lib/Alchemy/Phrasea/Model/Entities/UsrList.php
lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
lib/classes/API/V1/adapter.php
templates/mobile/lightbox/sc_note.html.twig
templates/web/admin/connected-users.html.twig
templates/web/admin/publications/fiche.html.twig
templates/web/lightbox/IE6/agreement_box.html.twig
templates/web/lightbox/agreement_box.html.twig
templates/web/lightbox/basket_content_report.html.twig
templates/web/lightbox/sc_note.html.twig
templates/web/prod/WorkZone/Browser/Basket.html.twig
templates/web/prod/WorkZone/Browser/Results.html.twig
templates/web/prod/WorkZone/Macros.html.twig
templates/web/prod/actions/Feedback/List-Share.html.twig
templates/web/prod/actions/Feedback/ListsMacros.html.twig
templates/web/prod/orders/order_box.html.twig
templates/web/prod/orders/order_item.html.twig
templates/web/prod/upload/lazaret.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
|
2014-02-19 17:29:25 +01:00 |
|
Romain Neutron
|
e233e5afa6
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/http/request.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
|
2014-01-06 15:38:14 +01:00 |
|
Romain Neutron
|
d519c13e56
|
Bump copyright year
|
2014-01-06 15:28:12 +01:00 |
|
Nicolas Le Goff
|
98fee5038b
|
Use short array syntax
|
2013-11-18 14:40:20 +01:00 |
|
Nicolas Le Goff
|
d8ea06b521
|
Fix migration
|
2013-11-18 14:36:45 +01:00 |
|
Nicolas Le Goff
|
6d2530295c
|
Patch CS consistency
|
2013-11-18 14:35:39 +01:00 |
|
Nicolas Le Goff
|
99d4895f57
|
Add DoctrineMigration Patch
|
2013-11-18 14:35:38 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
2072f9e0e0
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Core/Version.php
|
2013-11-08 19:04:26 +01:00 |
|
Romain Neutron
|
f8411a604e
|
Fix patch naming mess
|
2013-11-07 17:49:39 +01:00 |
|