Florian BLOUET
0e97e4a0ae
moved skins/icon to assets/common/images/icons
2015-12-02 17:35:37 +01:00
Mathieu Darse
5c82e384ac
Enable collecting of GPS position references (North, South, East, West)
2015-11-13 10:28:57 +01:00
Benoît Burnichon
c97eedd40f
Deprecate is_grouping in favor of isStory
2015-07-13 18:14:51 +02:00
Benoît Burnichon
4241fd0e6c
WIP with cache
2015-06-10 19:09:38 +02:00
Benoît Burnichon
4db591a12a
PHPCS fixing and avoid returns in some constructors
2015-05-07 11:04:45 +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
a3ef1b606c
Makes static thumbnails delivery as default delivery && set symlink dir in www directory
2015-02-16 15:01:44 +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
Jean-Yves Gaulier
138008f7c6
#PHRAS-325 #time 5h
...
fix "substit" flag in subdef.
new api route /embed/substitute
parms :
- databox_id
- record_id
- name
- /file/
more properties returned by api / object "embed" :
- substituted
- created_on
- updated_on
2015-01-29 19:55:24 +01:00
Nicolas Le Goff
d82adbf109
Bump year to 2015
2015-01-20 14:08:25 +01:00
Nicolas Le Goff
8c6434cca0
Fix etag property hydratation
2015-01-14 16:51:45 +01:00
Nicolas Le Goff
75f65a2b99
Add etag parameter to invalidatebrowser cache
2015-01-13 15:54:07 +01:00
Nicolas Le Goff
e6c5c8e10e
Fix sha1_file perf issue
2015-01-06 12:54:30 +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
419509de68
Remove the use of old record_interface interface
2014-12-04 11:48:08 +01:00
Nicolas Le Goff
616337db33
Fix dump calculation
2014-11-26 00:19:18 +01:00
Nicolas Le Goff
4b5a1d79fb
Fix etags calculation
2014-11-21 14:55:10 +01:00
Nicolas Le Goff
68af5b3391
Returns 304 http code if images are not modified
2014-11-21 10:36:52 +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
2c6ba6b99f
Add static file mode to deliver thumbnails
2014-09-10 11:23:29 +02:00
Nicolas Le Goff
66fa05f4ee
Fix CS
2014-07-17 15:17:04 +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
5944809fc3
Fix H264 pseudostreaming mode
2014-05-13 20:32:50 +02:00
Nicolas Le Goff
68861f546b
PHRAS-70 Set default etags
2014-04-10 18:05:31 +02:00
Romain Neutron
1713c23c59
Merge branch '3.8'
...
Conflicts:
bin/console
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/User/Adapter.php
lib/classes/media/Permalink/Adapter.php
lib/classes/media/abstract.php
lib/classes/media/subdef.php
lib/classes/p4file.php
lib/classes/record/preview.php
lib/conf.d/_GV_template.inc
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
tests/classes/media/Permalink/media_Permalink_AdapterTest.php
2014-03-03 17:00:17 +01:00
Nicolas Le Goff
a55c23c013
Merge pull request #984 from romainneutron/h264
...
[Ready][3.8] Add H264 pseudo stream configuration
2014-03-03 15:03:31 +01:00
Romain Neutron
a3b941c3ec
Add H264 pseudo streaming tools
2014-02-28 20:18:40 +01:00
Romain Neutron
2df0f9d659
Merge branch '3.8'
2014-02-28 00:28:06 +01:00
Romain Neutron
5856992262
Remove disk IO on media_subdef::get_size
2014-02-27 15:53:44 +01:00
Romain Neutron
7f2be7d9aa
Use Guzzle\Http\Url for medias
2014-02-27 13:54:08 +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
Romain Neutron
2af21c064c
Avoid errors by explicitely namespacing root exception
2014-02-20 11:28:31 +01:00
Romain Neutron
97d96a6b32
Add elastic-search engine support
2014-01-27 20:12:13 +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
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
Romain Neutron
f95bd97fc3
Update to latest media alchemyst api
2013-06-27 12:43:24 +02:00
Romain Neutron
3f47cc248d
Remove registry's GV_RootPath calls
2013-06-19 19:25:16 +02:00
Romain Neutron
0a64895b34
Merge branch '3.7'
2013-04-02 17:17:20 +02:00
Romain Neutron
6480cefbcd
Merge branch '3.7'
2013-03-29 11:05:17 +01:00
Romain Neutron
c184278b40
Fix doc blocks
2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91
Fix CS lib/classes
2013-01-29 16:39:02 +01:00
Romain Neutron
842ad40985
Bump copyright year
2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544
Use composer as application autoloader
2013-01-18 17:47:25 +01:00
