Jean-Yves Gaulier
|
0c75189a64
|
PHRAS-508_acl-cache
- refactor : acl strings changed to ACL class constants
- code cleanup
- wip but try to merge for bc break test
|
2016-10-26 16:13:47 +02:00 |
|
Florian BLOUET
|
4efc2dbba2
|
PHRAS-681 - fix variable initialisation
|
2016-02-17 15:09:30 +01:00 |
|
Florian BLOUET
|
a7b124940f
|
PHRAS-681 - add missing initialisation for variable
|
2016-02-17 15:09:30 +01:00 |
|
Florian BLOUET
|
91edc4d822
|
PHRAS-681 - fix default value of advanced search options: sort value and sort order
|
2016-02-17 15:09:30 +01:00 |
|
Benoît Burnichon
|
51023c5533
|
bump copyright year
|
2016-01-05 13:38:14 +01:00 |
|
Jean-Yves Gaulier
|
ef7de07b1a
|
#PHRAS-610 #time 10h
|
2015-08-18 16:50:55 +02:00 |
|
Jean-Yves Gaulier
|
3ac83408fc
|
#PHRAS-610 #time 2d
WIP
|
2015-08-17 15:18:33 +02:00 |
|
Benoît Burnichon
|
d645b92afa
|
Add AclAware Trait
|
2015-07-02 12:33:18 +02:00 |
|
Benoît Burnichon
|
4880f2bf5a
|
Add getAuthenticator usage
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
|
2015-07-02 12:33:18 +02:00 |
|
Nicolas Le Goff
|
ed3ffb59a6
|
Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer
Conflicts:
bin/console
bower.json
composer.json
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Border/Manager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/classes/caption/field.php
lib/classes/record/Interface.php
templates/web/prod/index.html.twig
www/skins/prod/000000/prodcolor.css
|
2015-03-10 14:36:31 +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 |
|
Nicolas Le Goff
|
5db1d56f64
|
Fix advanced search display
|
2014-12-23 18:19:21 +01:00 |
|
Nicolas Le Goff
|
10a83bc6c4
|
Fix latest merge
|
2014-10-13 12:58:20 +02:00 |
|
Nicolas Le Goff
|
28eecf6a09
|
Merge branch '3.8'
Conflicts:
.gitignore
bin/console
composer.json
composer.lock
hudson/fixtures.sql
lib/Alchemy/Phrasea/Command/Developer/IniReset.php
lib/Alchemy/Phrasea/Command/Setup/Install.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/Prod.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Setup/Upgrade.php
lib/classes/media/subdef.php
lib/classes/task/period/RecordMover.php
templates/web/prod/index.html.twig
templates/web/setup/step2.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/db-ref.sqlite
vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
|
2014-10-09 19:40:33 +02:00 |
|
Nicolas Le Goff
|
8a7d49bbbf
|
PHRAS-294 #fix display sort & date fields in advanced search
|
2014-09-25 15:06:33 +02:00 |
|
Romain Neutron
|
92a4c35340
|
Substitute random string generator by Randomlib
|
2014-03-02 21:13:57 +01:00 |
|
Nicolas Le Goff
|
b341495c88
|
Fix tests
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
c156f842c7
|
Remove User_Adapter
|
2014-02-19 17:28:53 +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
|
09c74afab6
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Helper/Prod.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
lib/classes/User/Adapter.php
lib/classes/caption/Field/Value.php
lib/classes/collection.php
lib/classes/module/report/filter.php
lib/classes/task/period/ftp.php
templates/web/common/dialog_export.html.twig
templates/web/report/ajax_dashboard_content_child.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
|
2013-12-18 12:12:58 +01:00 |
|
Romain Neutron
|
2cb9dda244
|
Fix #1605 : Add advanced search reset on production load.
|
2013-12-10 11:48:17 +01:00 |
|
Romain Neutron
|
051d9f4035
|
Remove license comments
|
2013-11-20 16:49:29 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +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
|
d2bc4f4a23
|
Add AuthenticationServiceProvider
|
2013-05-29 14:22:50 +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 |
|
Romain Neutron
|
ec36dc7dc8
|
Fix tests
|
2012-12-18 11:49:00 +01:00 |
|
Romain Neutron
|
0eaa5db98e
|
Merge branch '3.7'
|
2012-12-17 15:30:05 +01:00 |
|
Romain Neutron
|
5a50c922cc
|
Fix #1033 : Remember collections selection on production reload
|
2012-12-12 16:55:49 +01:00 |
|
Romain Neutron
|
527b68e0f5
|
Merge with 3.7
|
2012-11-07 16:16:13 +01:00 |
|
Romain Neutron
|
da6f7a00c0
|
Fix simplexml calls
|
2012-11-06 15:06:11 +01:00 |
|
Romain Neutron
|
0565bce475
|
Remove user variable assignment
|
2012-10-04 15:44:49 +02:00 |
|
Romain Neutron
|
86eadb1e9b
|
Update Helpers
|
2012-10-04 15:43:13 +02:00 |
|
Romain Neutron
|
9f11445265
|
Namespaces cleanup
|
2012-07-27 12:26:12 +02:00 |
|
Romain Neutron
|
e28184167e
|
Fix CS
|
2012-06-19 10:40:14 +02:00 |
|
Romain Neutron
|
4afa21d419
|
Fix CS
|
2012-05-23 00:01:29 +02:00 |
|
Romain Neutron
|
7d9eb63246
|
Remove unused package annotation
|
2012-04-26 02:09:59 +02:00 |
|
Romain Neutron
|
70519a471a
|
Update copyright year
|
2012-04-26 02:06:29 +02:00 |
|
Romain Neutron
|
ade22295ad
|
Fix CS
|
2012-04-26 00:55:53 +02:00 |
|
Romain Neutron
|
82d9eeef7b
|
Coding standards
|
2012-03-09 12:49:13 +01:00 |
|
Romain Neutron
|
948e6a3fc1
|
Fix installer
|
2012-03-07 15:15:38 +01:00 |
|
Romain Neutron
|
ec4ec4931d
|
Refactor Appbox
|
2012-02-21 16:16:25 +01:00 |
|
Romain Neutron
|
3e9ad6a63f
|
Refactor namespace
|
2012-01-31 22:03:51 +01:00 |
|
Romain Neutron
|
06b8df26b1
|
Fix coding standards
|
2012-01-26 12:32:37 +01:00 |
|
Romain Neutron
|
73962138fa
|
Refactor Core::request
|
2012-01-12 14:26:42 +01:00 |
|
Romain Neutron
|
10f74f0265
|
Refactor
|
2011-12-16 20:00:16 +01:00 |
|
Romain Neutron
|
57bcd3b971
|
Renamed RequestHandler => Helper
|
2011-12-16 17:20:17 +01:00 |
|