Jean-Yves Gaulier
|
82a5082335
|
fix #PHRAS-316 #time 1h
|
2015-01-27 18:11:08 +01:00 |
|
Nicolas Le Goff
|
e43036aaf1
|
PHRAS-316 Fix animated gif delay
|
2015-01-21 16:14:45 +01:00 |
|
Nicolas Le Goff
|
5e33fdafe4
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/classes/caption/field.php
lib/classes/module/report/activity.php
lib/classes/module/report/download.php
lib/classes/task/period/apibridge.php
|
2014-12-16 13:07:25 +01:00 |
|
Nicolas Le Goff
|
b83bce0254
|
Fix flickr
|
2014-12-15 15:33:29 +01:00 |
|
Nicolas Le Goff
|
ae25c00ad9
|
Update composer.json
|
2014-12-10 15:45:16 +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
|
43eed94871
|
PHRAS-348 #fix previews of eps are wrong size
|
2014-11-19 15:52:33 +01:00 |
|
Mathieu Darse
|
37445b3151
|
Add hoa compiler
|
2014-10-22 11:15:05 +02:00 |
|
Nicolas Le Goff
|
f695f4ec37
|
Force free memory
|
2014-10-20 10:06:04 +02:00 |
|
Nicolas Le Goff
|
10a83bc6c4
|
Fix latest merge
|
2014-10-13 12:58:20 +02:00 |
|
Nicolas Le Goff
|
c708ade187
|
Update cpsr.json
|
2014-10-08 18:43:33 +02:00 |
|
Nicolas Le Goff
|
5156b13af5
|
Update exiftool dependencies
|
2014-09-22 13:35:13 +02:00 |
|
Nicolas Le Goff
|
f48ab9e1cc
|
Update dependencies
|
2014-09-10 18:57:18 +02:00 |
|
Nicolas Le Goff
|
4fa1f613e4
|
Fix latest merge
|
2014-08-13 17:40:40 +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
|
8da9354fd3
|
Update cpsr.lock
|
2014-07-30 18:19:26 +02:00 |
|
Nicolas Le Goff
|
e17493aa0b
|
Add extended response format for API
|
2014-07-30 16:47:49 +02:00 |
|
Nicolas Le Goff
|
3565d1c795
|
Merge branch '3.8' into fix-latest-merge
Conflicts:
CHANGELOG.md
bower.json
composer.json
composer.lock
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Records.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Media/Subdef/Image.php
lib/conf.d/_GV_template.inc
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
templates/web/prod/Story/Reorder.html.twig
templates/web/prod/WorkZone/Macros.html.twig
templates/web/prod/actions/Download/prepare.html.twig
templates/web/prod/templates/push.html.twig
|
2014-07-11 17:19:39 +02:00 |
|
Nicolas Le Goff
|
cbae125fc2
|
PHRAS-152 #fix Add flatten option to disable transparancy
|
2014-07-07 20:03:53 +02:00 |
|
Nicolas Le Goff
|
f0f4b3b0e1
|
PHRAS-185 #fix flickr bridge connection
|
2014-07-07 18:33:53 +02:00 |
|
Nicolas Le Goff
|
5e2dd0216a
|
Fix latest merge
|
2014-06-24 14:56:09 +02:00 |
|
Nicolas Le Goff
|
5d5ff6c1fe
|
Update doctrine
|
2014-06-24 01:12:59 +02:00 |
|
Nicolas Le Goff
|
1250f8ab0b
|
Fix latest merge
|
2014-06-19 16:11:27 +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
|
2253badd8e
|
Update cpsr lock
|
2014-06-11 20:13:04 +02:00 |
|
Nicolas Le Goff
|
b825ccc5d8
|
Update cpsr.lock to fetch latest mediavorus && ffmpeg
|
2014-06-10 16:19:19 +02:00 |
|
Nicolas Le Goff
|
1054483ae9
|
Fix latest merge
|
2014-03-30 21:17:46 +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
|
a159926a36
|
Add new CSVProvider
|
2014-03-23 22:46:20 +01:00 |
|
Romain Neutron
|
82bd617477
|
Add compatibility with elasticsearch 1
|
2014-03-05 02:19:18 +01:00 |
|
Romain Neutron
|
bb7267eafb
|
Use rhumsaa/uuid instead of custom uuid implementation
|
2014-03-03 11:29:23 +01:00 |
|
Romain Neutron
|
92a4c35340
|
Substitute random string generator by Randomlib
|
2014-03-02 21:13:57 +01:00 |
|
Romain Neutron
|
3b7ba851e9
|
Add Doctrine data collector to profiler
|
2014-02-26 11:36:58 +01:00 |
|
Romain Neutron
|
5e8e8f59d5
|
Use Zippy to zip
|
2014-02-24 16:25:59 +01:00 |
|
Romain Neutron
|
2a534615bb
|
Update taskmanager versions
|
2014-02-17 12:30:03 +01:00 |
|
Romain Neutron
|
c0b152d73a
|
Add authorization strategy for WAMP topics
|
2014-02-15 11:38:51 +01:00 |
|
Romain Neutron
|
ff5a3a6c16
|
Add dependency on Ratchet and react ZMQ
|
2014-02-15 11:38:50 +01:00 |
|
Romain Neutron
|
5694b4d98f
|
Move JMS translation bundle from dev dependency to dependency
|
2014-02-13 20:16:55 +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
|
a2e7918b63
|
Update geonames server dependency for better logs
|
2014-02-05 16:41:15 +01:00 |
|
Nicolas Le Goff
|
0369a4eaf4
|
Fix composer.lock
|
2014-01-31 15:04:11 +01:00 |
|
Romain Neutron
|
d53e05e3bc
|
Fix #1673 : Avoid interpolation for image and videos
|
2014-01-31 12:45:12 +01:00 |
|
Romain Neutron
|
a6b623bec2
|
Update to symfony 2.3.9
|
2014-01-29 17:47:13 +01:00 |
|
Romain Neutron
|
f80fffbd91
|
Update to latest monolog
|
2014-01-17 16:55:42 +01:00 |
|
Romain Neutron
|
c67be34b84
|
Fix #1649 : Bump to mediavorus 0.4.3
|
2014-01-06 16:49:19 +01:00 |
|
Romain Neutron
|
413e9ae5e6
|
Fix #1629 : Update to PHP-FFmpeg 0.4.4
|
2013-12-17 18:01:56 +01:00 |
|
Romain Neutron
|
900c62cb84
|
Fix #1598 #1599 : Fix support for portrait videos.
|
2013-12-03 18:14:45 +01:00 |
|
Romain Neutron
|
17a23e0c4b
|
Update to symfony 2.3.7
|
2013-11-20 13:04:50 +01:00 |
|
Romain Neutron
|
95b0c24d4b
|
Use semver for Phraseanet version numbers
|
2013-11-07 17:49:39 +01:00 |
|