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 |
|
Romain Neutron
|
fa88305bfe
|
Update to latest twig
|
2013-10-31 13:23:26 +01:00 |
|
Romain Neutron
|
9d69c8dc3f
|
Use Twig 1.13, waiting for bug #1251 to be solved
|
2013-10-28 15:24:03 +01:00 |
|
Romain Neutron
|
1a6e1075cd
|
Fix #1529 : Update to PHP-FFMpeg 0.4
|
2013-10-21 14:45:37 +02:00 |
|
Romain Neutron
|
42cb682dd5
|
Use custom repo for tcpdf
|
2013-10-18 15:55:39 +02:00 |
|
Romain Neutron
|
43ed2fb4ec
|
Update dependencies, revert Process to a windows working version
|
2013-10-17 12:02:15 +02:00 |
|
Romain Neutron
|
972a68e847
|
Update dependencies, fix travis build
|
2013-10-10 11:44:05 +02:00 |
|
Romain Neutron
|
e99081df36
|
Update dependencies
|
2013-10-03 15:41:06 +02:00 |
|
Romain Neutron
|
921c3965c0
|
Update dependencies, especially PHP-FFMpeg and Media-Alchemyst
|
2013-09-05 13:06:24 +02:00 |
|
Romain Neutron
|
629afb93ff
|
Update dependencies, fix imagine transparency issue
|
2013-09-04 15:42:45 +02:00 |
|
Romain Neutron
|
ddac568387
|
Update media dependencies
|
2013-08-08 12:21:28 +02:00 |
|
Romain Neutron
|
0b7756a448
|
Update to sphinx 2.0.8
|
2013-08-07 20:08:20 +02:00 |
|
Romain Neutron
|
8ad88047a6
|
Update to symfony 2.3.3
|
2013-08-07 20:02:16 +02:00 |
|
Romain Neutron
|
8ed8813fb9
|
Bump to php-exiftool 0.3.0
|
2013-08-07 16:04:52 +02:00 |
|
Romain Neutron
|
09db501940
|
Upgrade dependencies
|
2013-08-07 12:39:54 +02:00 |
|
Romain Neutron
|
7bfcbfd83d
|
Update dependencies
|
2013-07-22 18:50:00 +02:00 |
|
Romain Neutron
|
fe818fc9fe
|
Update composer dependencies
|
2013-07-22 13:14:31 +02:00 |
|
Romain Neutron
|
0f1d2551bb
|
Fix dailymotion version
|
2013-07-10 19:20:25 +02:00 |
|
Romain Neutron
|
62fb36069f
|
Use stable version of dailymotion SDK
|
2013-07-10 14:53:53 +02:00 |
|
Romain Neutron
|
006d40c9e4
|
Use stable releases
|
2013-07-04 12:26:39 +02:00 |
|
Romain Neutron
|
58dcc0ab68
|
Update unstable dependencies
|
2013-07-03 16:14:42 +02:00 |
|