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
|
589169299c
|
Fix merge 3.8
|
2014-12-09 14:01:00 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Nicolas Le Goff
|
7d44a356e3
|
CUS-120 #fix editon date for records
|
2014-11-18 17:47:33 +01:00 |
|
Nicolas Le Goff
|
10a83bc6c4
|
Fix latest merge
|
2014-10-13 12:58:20 +02:00 |
|
Romain Neutron
|
c4bf6c3c67
|
Convert custom events to symfony events
|
2014-09-09 21:21:38 +02:00 |
|
Nicolas Le Goff
|
de7988689e
|
Update directory structure & allow to configure paths (tmp, log, cache)
|
2014-09-05 15:57:00 +02:00 |
|
Nicolas Le Goff
|
46da7be65d
|
Merge branch '3.8'
Conflicts:
.travis.yml
bin/developer
build-env.sh
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
|
2014-08-19 15:30:25 +02:00 |
|
Nicolas Le Goff
|
cbd0bb0558
|
Fix install
|
2014-08-19 15:00:36 +02:00 |
|
Nicolas Le Goff
|
9e2083dfe4
|
Add init command
|
2014-08-13 18:21:57 +02:00 |
|
Nicolas Le Goff
|
2899f152fb
|
Merge branch '3.8' into fix-latest-merge
Conflicts:
README.md
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/result.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskrun.php
lib/classes/set/export.php
lib/conf.d/_GV_template.inc
lib/conf.d/configuration.yml
templates/web/admin/setup.html.twig
templates/web/admin/tasks/list.html.twig
templates/web/api/auth/end_user_authorization.html.twig
templates/web/prod/actions/Feedback/list.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/upload/upload.html.twig
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/api/v1/api_v1_resultTest.php
|
2014-08-11 20:28:03 +02:00 |
|
Nicolas Le Goff
|
746a0c660b
|
Add content negotiation event subscriber
|
2014-07-30 16:47:49 +02:00 |
|
Nicolas Le Goff
|
e17493aa0b
|
Add extended response format for API
|
2014-07-30 16:47:49 +02:00 |
|
Nicolas Le Goff
|
66fa05f4ee
|
Fix CS
|
2014-07-17 15:17:04 +02:00 |
|
Nicolas Le Goff
|
3bdb63f94e
|
Fix latest merge
|
2014-06-24 00:34:07 +02:00 |
|
Nicolas Le Goff
|
a8da584666
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Language.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
lib/Alchemy/Phrasea/Controller/Report/Informations.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Developers.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/ZipArchiveImproved.php
lib/classes/caption/Field/Value.php
lib/classes/caption/record.php
lib/classes/eventsmanager/notify/feed.php
lib/classes/media/subdef.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/export.php
lib/classes/setup.php
lib/classes/task/abstract.php
lib/classes/task/period/emptyColl.php
lib/classes/uuid.php
lib/conf.d/_GV_template.inc
lib/conf.d/bases_structure.xml
lib/conf.d/configuration.yml
lib/conf.d/minifyGroupsConfig.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/account/account.html.twig
templates/web/account/base.html.twig
templates/web/admin/databox/databox.html.twig
templates/web/admin/index.html.twig
templates/web/admin/setup.html.twig
templates/web/admin/tree.html.twig
templates/web/client/index.html.twig
templates/web/common/caption.html.twig
templates/web/common/caption_templates/answer.html.twig
templates/web/common/caption_templates/basket_element.html.twig
templates/web/common/caption_templates/internal_publi.html.twig
templates/web/common/caption_templates/lazaret.html.twig
templates/web/common/caption_templates/overview.html.twig
templates/web/common/caption_templates/preview.html.twig
templates/web/common/index_bootstrap.html.twig
templates/web/common/indexfloat.html.twig
templates/web/common/thumbnail.html.twig
templates/web/developers/application_form.html.twig
templates/web/lightbox/IE6/feed.html.twig
templates/web/lightbox/IE6/validate.html.twig
templates/web/lightbox/feed.html.twig
templates/web/lightbox/validate.html.twig
templates/web/prod/actions/Download/prepare.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/index.html.twig
templates/web/prod/preview/caption.html.twig
templates/web/prod/results/answerlist.html.twig
templates/web/thesaurus/accept.html.twig
templates/web/thesaurus/export-text-dialog.html.twig
templates/web/thesaurus/export-text.html.twig
templates/web/thesaurus/export-topics-dialog.html.twig
templates/web/thesaurus/export-topics.html.twig
templates/web/thesaurus/index.html.twig
templates/web/thesaurus/link-field-step1.html.twig
templates/web/thesaurus/link-field-step2.html.twig
templates/web/thesaurus/link-field-step3.html.twig
templates/web/thesaurus/new-term.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
templates/web/thesaurus/thesaurus.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
tests/classes/Feed/Feed_AggregateTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
tests/db-ref.sqlite
|
2014-06-17 15:30:41 +02:00 |
|
Nicolas Le Goff
|
b92370cca2
|
Merge pull request #1021 from nlegoff/api-doctrine
[READY][3.9] Transform api_* tables to doctrine entities
|
2014-06-13 14:13:23 +02:00 |
|
Nicolas Le Goff
|
e5b8817c46
|
PHP CS fix
|
2014-05-30 15:22:00 +02:00 |
|
Nicolas Le Goff
|
bce71ec7ed
|
Fix default session lifetime to 0
|
2014-05-26 19:23:57 +02:00 |
|
Nicolas Le Goff
|
2cd0f1879d
|
Move init session to session manager subscriber
|
2014-05-23 14:43:47 +02:00 |
|
Nicolas Le Goff
|
83e63e731a
|
Fix tests
|
2014-05-23 14:43:47 +02:00 |
|
Nicolas Le Goff
|
c0d25176a7
|
Register session manager subscriber
|
2014-05-23 14:43:47 +02:00 |
|
Jean-Yves Gaulier
|
3434e4cab2
|
added patch, redirect parm, translations
|
2014-05-23 14:43:46 +02:00 |
|
Jean-Yves Gaulier
|
86d326c704
|
CS
|
2014-05-23 14:43:46 +02:00 |
|
Jean-Yves Gaulier
|
192c2fbb55
|
PHRAS-46 #fix
PHRAS-16 #time 40h
|
2014-05-23 14:43:46 +02:00 |
|
Nicolas Le Goff
|
541f35dd02
|
Enhance thumbnail display
|
2014-05-05 10:02:25 +02:00 |
|
Nicolas Le Goff
|
ef6147ca30
|
Fix caption display
|
2014-04-23 12:18:17 +02:00 |
|
Jean-Yves Gaulier
|
9b46626639
|
Fix highlight filter
|
2014-04-14 14:58:55 +02:00 |
|
Nicolas Le Goff
|
3b1c9cb05c
|
Split thesaurus filter in highlight & bounce filters
|
2014-04-14 14:54:14 +02:00 |
|
Jean-Yves Gaulier
|
761437154c
|
Fix thesaurus bounce
|
2014-04-14 14:54:14 +02:00 |
|
Nicolas Le Goff
|
e97ed2b3f1
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Client/Root.php
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
lib/Alchemy/Phrasea/Controller/Prod/Root.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Export.php
lib/Alchemy/Phrasea/Controller/Report/Informations.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/format.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/classes/Feed/Feed_CollectionTest.php
tests/classes/api/v1/api_v1_adapterTest.php
|
2014-03-30 09:00:17 +02:00 |
|
Nicolas Le Goff
|
fa9189f78a
|
Add oauth2 adapter as a service
|
2014-03-24 12:29:38 +01:00 |
|
Nicolas Le Goff
|
2e1a505774
|
Create phraseanet oauth application when installation is done
|
2014-03-24 12:29:37 +01:00 |
|
Nicolas Le Goff
|
782ed07a20
|
Add Api Application middleware provider
|
2014-03-24 12:28:17 +01:00 |
|
Nicolas Le Goff
|
42cac0d3c4
|
Fix unit tests
|
2014-03-23 22:46:21 +01:00 |
|
Nicolas Le Goff
|
a159926a36
|
Add new CSVProvider
|
2014-03-23 22:46:20 +01:00 |
|
Romain Neutron
|
8b6cb53a36
|
Add token entities
|
2014-03-05 15:27:43 +01:00 |
|
Romain Neutron
|
92a4c35340
|
Substitute random string generator by Randomlib
|
2014-03-02 21:13:57 +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
|
a0fc4b2360
|
Fix CS
|
2014-02-26 12:44:32 +01:00 |
|
Romain Neutron
|
399a514910
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Application.php
tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriberTest.php
|
2014-02-26 12:39:34 +01:00 |
|
Romain Neutron
|
fce3ba73ff
|
Fix api cookies remover
Conflicts:
lib/Alchemy/Phrasea/Application.php
|
2014-02-25 17:53:37 +01:00 |
|
Romain Neutron
|
5e8e8f59d5
|
Use Zippy to zip
|
2014-02-24 16:25:59 +01:00 |
|
Romain Neutron
|
4c29ea5a7a
|
Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users
Conflicts:
lib/classes/ACL.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/report/add.php
lib/classes/module/report/edit.php
lib/classes/module/report/push.php
lib/classes/module/report/sent.php
lib/classes/module/report/validate.php
lib/classes/record/preview.php
|
2014-02-20 18:02:27 +01:00 |
|
Romain Neutron
|
12f9575a8b
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/classes/API/OAuth2/Adapter.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/User/Adapter.php
lib/classes/base.php
lib/classes/connection.php
lib/classes/databox/cgu.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/bridgeuploadfail.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/console/taskState.php
lib/classes/module/console/taskrun.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/order.php
lib/classes/task/abstract.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/ftp.php
lib/classes/task/period/ftpPull.php
templates/web/prod/upload/lazaret.html.twig
|
2014-02-20 16:05:23 +01:00 |
|
Nicolas Le Goff
|
ab9362dd60
|
Fix neutron comment's
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
5635553f71
|
Fix neutron's comments
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
53ae0ccc24
|
Remove User_Adapter Inteface References
|
2014-02-19 17:29:25 +01:00 |
|