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 |
|
Jean-Yves Gaulier
|
b149483d28
|
#PHRAS-223 #time 6h
|
2015-01-28 18:44:18 +01:00 |
|
Nicolas Le Goff
|
d82adbf109
|
Bump year to 2015
|
2015-01-20 14:08:25 +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
|
69260ac7c7
|
Remove guest access check for export controller
|
2014-09-25 12:43:02 +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
|
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
|
e0c749d69a
|
Merge pull request #1098 from nlegoff/some-385
[3.8.6] Fix some minor bugs
|
2014-07-25 18:11:13 +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
|
0345e0ee8e
|
Fix PHRAS-45 'mail' action is not logged anymore
|
2014-06-13 12:56:06 +02:00 |
|
Nicolas Le Goff
|
093d4f2cd1
|
Fix PHRAS-133 acknowledgment of receipt is not setted
|
2014-05-30 11:21:42 +02:00 |
|
Romain Neutron
|
8b6cb53a36
|
Add token entities
|
2014-03-05 15:27:43 +01:00 |
|
Nicolas Le Goff
|
eaa1feb765
|
Address PR comments
|
2014-02-19 17:29:27 +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 |
|
Nicolas Le Goff
|
c4eadb7e0e
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Lightbox.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Controller/Prod/TOU.php
lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Security/Firewall.php
lib/classes/task/abstract.php
tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
|
2014-02-05 19:42:22 +01:00 |
|
Romain Neutron
|
b9e4c599b2
|
Avoid exception driven logic
|
2014-02-05 16:43:49 +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
|
64456a8964
|
Remove phraseanet registry
|
2013-12-20 16:44:22 +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
|
a165907b95
|
Fix #1627 : FTP receiver does not get its email
|
2013-12-18 10:47:16 +01:00 |
|
Romain Neutron
|
2ba164701d
|
Use symfony translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
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
|
de05dcd113
|
Remove deprecated comments in prod controllers
|
2013-10-30 18:52:41 +01:00 |
|
Romain Neutron
|
1af022b84f
|
Declare prod controllers as services, remove "call" methods
|
2013-10-30 18:47:40 +01:00 |
|
Romain Neutron
|
4c90f168a7
|
Remove unused use statements
|
2013-09-04 14:25:01 +02:00 |
|
Romain Neutron
|
8b3e06ec4c
|
Fix ftp connection test experience
|
2013-08-30 13:37:45 +02:00 |
|
Nicolas Le Goff
|
6a8312ca64
|
Add FtpCredentials entity
|
2013-08-23 12:09:50 +02:00 |
|
Romain Neutron
|
3f47cc248d
|
Remove registry's GV_RootPath calls
|
2013-06-19 19:25:16 +02:00 |
|
Romain Neutron
|
4161ef2e31
|
Use url generator everywhere
|
2013-06-13 09:44:16 +02:00 |
|
Romain Neutron
|
76413165ff
|
Update authentication to service provider
|
2013-05-29 14:22:51 +02:00 |
|
Romain Neutron
|
cf0f13d9c9
|
Add TokensServiceProvider
|
2013-04-30 18:44:35 +02:00 |
|
Romain Neutron
|
53206af159
|
Fix CS lib/Alchemy
|
2013-01-29 16:38:00 +01:00 |
|
Romain Neutron
|
8325c35f91
|
Add better exception handling for emails
|
2013-01-29 12:06:02 +01:00 |
|
Romain Neutron
|
303c7e859a
|
Remove unnecessary try catch blocks
|
2013-01-29 11:12:54 +01:00 |
|
Romain Neutron
|
aa18c48306
|
Fix unit tests
|
2013-01-29 09:34:20 +01:00 |
|
Romain Neutron
|
9cce7ab8f9
|
Update notifications
|
2013-01-29 09:34:18 +01:00 |
|
Romain Neutron
|
842ad40985
|
Bump copyright year
|
2013-01-21 23:28:58 +01:00 |
|
Romain Neutron
|
985fcd4657
|
Merge branch '3.7'
|
2012-11-09 15:03:09 +01:00 |
|
Nicolas Le Goff
|
103e46891a
|
Add anonymous export option
|
2012-10-25 11:14:10 +02:00 |
|
Nicolas Le Goff
|
60e01595e1
|
Set DI container as \set_export::build_zip parameter
|
2012-10-25 11:14:07 +02:00 |
|
Nicolas Le Goff
|
ad762b0bc8
|
Fix CS & some refactor
Fix tests
FIx tests
|
2012-10-20 18:59:14 +02: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 |
|