Benoît Burnichon
|
51023c5533
|
bump copyright year
|
2016-01-05 13:38:14 +01:00 |
|
Benoît Burnichon
|
d645b92afa
|
Add AclAware Trait
|
2015-07-02 12:33:18 +02:00 |
|
Benoît Burnichon
|
26e6b91804
|
Admin Collection Controller
|
2015-03-30 17:25:14 +02:00 |
|
Nicolas Le Goff
|
bd4836aaa7
|
Remove Websockets dependencies
|
2015-03-10 09:55:43 +01:00 |
|
Nicolas Le Goff
|
949bf06cac
|
Merge branch '3.8'
Conflicts:
CHANGELOG.md
bin/console
bin/developer
bin/setup
bower.json
composer.json
composer.lock
features/bootstrap/FeatureContext.php
features/bootstrap/GuiContext.php
lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Client/Baskets.php
lib/Alchemy/Phrasea/Controller/Client/Root.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Property.php
lib/Alchemy/Phrasea/Controller/Prod/Records.php
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/User/Edit.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/Doctrine/Entities/AuthFailure.php
lib/Doctrine/Entities/Basket.php
lib/Doctrine/Entities/BasketElement.php
lib/Doctrine/Entities/LazaretAttribute.php
lib/Doctrine/Entities/LazaretCheck.php
lib/Doctrine/Entities/LazaretFile.php
lib/Doctrine/Entities/LazaretSession.php
lib/Doctrine/Entities/Session.php
lib/Doctrine/Entities/SessionModule.php
lib/Doctrine/Entities/StoryWZ.php
lib/Doctrine/Entities/UsrList.php
lib/Doctrine/Entities/UsrListEntry.php
lib/Doctrine/Entities/UsrListOwner.php
lib/Doctrine/Entities/ValidationData.php
lib/Doctrine/Entities/ValidationParticipant.php
lib/Doctrine/Entities/ValidationSession.php
lib/Doctrine/Logger/MonologSQLLogger.php
lib/Doctrine/Repositories/BasketRepository.php
lib/Doctrine/Repositories/ValidationParticipantRepository.php
lib/Doctrine/Types/Binary.php
lib/Doctrine/Types/Blob.php
lib/Doctrine/Types/Enum.php
lib/Doctrine/Types/LongBlob.php
lib/Doctrine/Types/VarBinary.php
lib/classes/API/OAuth2/Account.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/OAuth2/Application/OfficePlugin.php
lib/classes/API/OAuth2/AuthCode.php
lib/classes/API/OAuth2/RefreshToken.php
lib/classes/API/OAuth2/Token.php
lib/classes/API/V1/Abstract.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/exception/abstract.php
lib/classes/API/V1/exception/badrequest.php
lib/classes/API/V1/exception/forbidden.php
lib/classes/API/V1/exception/internalservererror.php
lib/classes/API/V1/exception/maintenance.php
lib/classes/API/V1/exception/methodnotallowed.php
lib/classes/API/V1/exception/notfound.php
lib/classes/API/V1/exception/unauthorized.php
lib/classes/API/V1/result.php
lib/classes/Exception/Feed/EntryNotFound.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/CollectionInterface.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/Image.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/User/Adapter.php
lib/classes/User/Interface.php
lib/classes/appbox/register.php
lib/classes/connection.php
lib/classes/connection/abstract.php
lib/classes/connection/interface.php
lib/classes/connection/pdo.php
lib/classes/connection/pdoStatementDebugger.php
lib/classes/deprecated/countries.php
lib/classes/deprecated/inscript.api.php
lib/classes/eventsmanager/event/test.php
lib/classes/ftpclient.php
lib/classes/http/request.php
lib/classes/media/subdef.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/patch/320alpha4b.php
lib/classes/patch/3715alpha1a.php
lib/classes/patch/379alpha1a.php
lib/classes/patch/380alpha10a.php
lib/classes/patch/380alpha11a.php
lib/classes/patch/380alpha13a.php
lib/classes/patch/380alpha14a.php
lib/classes/patch/380alpha15a.php
lib/classes/patch/380alpha16a.php
lib/classes/patch/380alpha17a.php
lib/classes/patch/380alpha18a.php
lib/classes/patch/380alpha3a.php
lib/classes/patch/380alpha4a.php
lib/classes/patch/380alpha6a.php
lib/classes/patch/380alpha8a.php
lib/classes/patch/380alpha9a.php
lib/classes/patch/381alpha1b.php
lib/classes/patch/381alpha2a.php
lib/classes/patch/381alpha3a.php
lib/classes/patch/381alpha4a.php
lib/classes/patch/383alpha1a.php
lib/classes/patch/383alpha2a.php
lib/classes/patch/383alpha3a.php
lib/classes/patch/383alpha4a.php
lib/classes/record/adapter.php
lib/classes/record/preview.php
lib/classes/recordutils.php
lib/classes/recordutils/audio.php
lib/classes/recordutils/document.php
lib/classes/recordutils/map.php
lib/classes/recordutils/video.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/apiwebhooks.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
templates/web/admin/collection/collection.html.twig
templates/web/common/dialog_export.html.twig
templates/web/common/menubar.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/upload-flash.html.twig
templates/web/prod/upload/upload.html.twig
templates/web/report/report_layout_child.html.twig
templates/web/setup/step2.html.twig
templates/web/thesaurus/new-synonym-dialog.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
|
2015-02-05 18:38:49 +01:00 |
|
Nicolas Le Goff
|
d82adbf109
|
Bump year to 2015
|
2015-01-20 14:08:25 +01:00 |
|
Romain Neutron
|
894c5fe620
|
Fix unit tests
|
2014-03-01 14:37:56 +01:00 |
|
Romain Neutron
|
8f87e8b1c8
|
Add user repository as a service
|
2014-02-28 19:58:12 +01:00 |
|
Romain Neutron
|
862fe696cb
|
Remove some circular references
|
2014-02-20 20:09:14 +01:00 |
|
Nicolas Le Goff
|
bd110bb8e7
|
Fix rebase master
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
3b0fe2eb75
|
Fix CS
|
2014-02-19 17:29:26 +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 |
|
Nicolas Le Goff
|
c156f842c7
|
Remove User_Adapter
|
2014-02-19 17:28:53 +01:00 |
|
Nicolas Le Goff
|
2aba3e8d8d
|
Merge pull request #957 from romainneutron/doctrine-namespace
[3.9] Add a namespace to Phraseanet doctrine entities
|
2014-02-19 11:37:09 +01:00 |
|
Romain Neutron
|
2de870c3f9
|
Add a namespace to Phraseanet doctrine entities
|
2014-02-18 19:32:08 +01:00 |
|
Romain Neutron
|
a834b3a4df
|
Add useful infos in session storage
|
2014-02-15 11:38:51 +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 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
3fbd4a7daa
|
Merge pull request #734 from nlegoff/acl_service
[3.9] Add ACL as a service
|
2013-11-05 08:08:09 -08:00 |
|
Romain Neutron
|
f27fa53d4c
|
Merge branch '3.8'
Conflicts:
.travis.yml
templates/web/setup/wrapper.html.twig
tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
|
2013-11-05 15:20:35 +01:00 |
|
Nicolas Le Goff
|
1fdf30c6af
|
Use ACL service provider to get user's ACL
|
2013-11-05 12:21:42 +01:00 |
|
Romain Neutron
|
50913c00ab
|
Fix disconnection on session delete
|
2013-11-04 19:10:45 +01:00 |
|
Romain Neutron
|
f11bf65c35
|
Fix entities namespace
|
2013-11-04 11:26:52 +01:00 |
|
Romain Neutron
|
1c27778001
|
Merge branch '3.8'
Conflicts:
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
|
2013-10-31 17:56:48 +01:00 |
|
Romain Neutron
|
24a6dce598
|
Fix #1555 : API sessions remains open
|
2013-10-31 15:19:24 +01:00 |
|
Romain Neutron
|
baecfdceb3
|
Move entities to Phrasea namespace
|
2013-10-29 16:56:49 +01:00 |
|
Romain Neutron
|
42db38d055
|
Add error pages, fix error handling and PHP conf
|
2013-06-17 17:01:35 +02:00 |
|
Romain Neutron
|
39b91e3faa
|
Remove unused variable
|
2013-06-01 22:02:24 +02:00 |
|
Romain Neutron
|
fa06b05307
|
Merge pull request #365 from nlegoff/fix_953
Fix #953 Close session properly
|
2013-05-29 13:38:31 -07:00 |
|
Nicolas Le Goff
|
a15ee1d729
|
Fix #953 Close session properly
Fix tests
|
2013-05-29 21:44:53 +02:00 |
|
Romain Neutron
|
38f38290c8
|
Fix CS
|
2013-05-29 21:21:02 +02:00 |
|
Romain Neutron
|
d8854282e6
|
Add missing headers and doc blocks
|
2013-05-29 14:23:21 +02:00 |
|
Romain Neutron
|
52b6bfe299
|
Update session cleanup
|
2013-05-29 14:23:12 +02:00 |
|
Romain Neutron
|
3d15cab376
|
Add Authenticator::refreshAccount
|
2013-05-29 14:22:52 +02:00 |
|
Romain Neutron
|
3515774c7e
|
Move reinitUser to public for tests
|
2013-05-29 14:22:51 +02:00 |
|
Romain Neutron
|
68485b34b4
|
Add AuthenticationServiceProvider
|
2013-05-29 14:22:50 +02:00 |
|