Commit Graph

271 Commits

Author SHA1 Message Date
Romain Neutron
eb4cfff264 Use a stable version of Get-In 2014-01-13 18:44:00 +01:00
Romain Neutron
f7ce16ef70 Update dependencies 2013-12-20 17:55:52 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
e0c1f600dd Merge branch '3.8'
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
2013-12-03 21:32:46 +01:00
Romain Neutron
458aac8dd8 Add JMS translation tools 2013-12-03 20:05:20 +01:00
Romain Neutron
2c9cee15a4 Update to symfony 2.4.0 2013-12-03 20:02:23 +01:00
Romain Neutron
e197609a2f Update symfony 2.4 to latest commit 2013-12-03 19:41:25 +01:00
Romain Neutron
900c62cb84 Fix #1598 #1599 : Fix support for portrait videos. 2013-12-03 18:14:45 +01:00
Nicolas Le Goff
b751d0ef3e Remove DoctrineFixtures mechanism 2013-11-22 15:14:40 +01:00
Nicolas Le Goff
48c9932367 Remove obsolete namespaces 2013-11-22 11:24:26 +01:00
Romain Neutron
17a23e0c4b Update to symfony 2.3.7 2013-11-20 13:04:50 +01:00
Nicolas Le Goff
4c58b141ee Fix neutron comments 2013-11-18 14:37:16 +01:00
Nicolas Le Goff
1da2a68f93 Update composer 2013-11-18 14:33:43 +01:00
Romain Neutron
2898b317c4 Drop PHP 5.3 support 2013-11-18 13:08:30 +01:00
Romain Neutron
2072f9e0e0 Merge branch '3.8'
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
2013-11-08 19:04:26 +01:00
Romain Neutron
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
4ca6170cae Merge branch '3.8'
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
2013-10-31 15:52:12 +01:00
Romain Neutron
fa88305bfe Update to latest twig 2013-10-31 13:23:26 +01:00
Romain Neutron
7f5c1b54d8 Update dependencies, bump to latest Symfony 2.4 2013-10-31 12:48:31 +01:00
Romain Neutron
de95c37f09 Fix dependencies 2013-10-30 18:11:12 +01:00
Romain Neutron
0680da5f24 Update to stable task manager 2013-10-29 18:46:37 +01:00
Romain Neutron
e423ee00c3 Update dependencies 2013-10-29 18:46:35 +01:00
Romain Neutron
e1145bd3cb Import process manager 2013-10-29 18:41:39 +01:00
Romain Neutron
96ac795d8d Merge branch '3.8'
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
2013-10-28 18:21:15 +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
637c7a64c3 Fix composer dependencies 2013-10-23 18:41:57 +02:00
Romain Neutron
a805c94524 Merge branch '3.8'
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
2013-10-21 19:05: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
5d56a36bee Update dependencies 2013-10-17 11:50:18 +02:00
Romain Neutron
972a68e847 Update dependencies, fix travis build 2013-10-10 11:44:05 +02:00
Romain Neutron
a2bbdc88d4 Bump to Symfony 2.4 and Silex 1.1 2013-08-26 10:09:28 +02:00
Romain Neutron
2be961e28c Merge branch '3.8' 2013-08-08 11:06:59 +02:00
Romain Neutron
31eb660cd0 Merge pull request #548 from romainneutron/temporary-files
[3.8] Cleanup temporary files
2013-08-07 10:52:30 -07:00
Romain Neutron
012234d628 Merge branch '3.8' 2013-08-07 17:58:18 +02:00
Romain Neutron
1c94e12a8f Cleanup temporary files 2013-08-07 17:45:10 +02:00
Romain Neutron
8ed8813fb9 Bump to php-exiftool 0.3.0 2013-08-07 16:04:52 +02:00
Romain Neutron
ec54f7a79a Bump master to version 3.9-dev 2013-08-06 11:36:55 +02:00
Romain Neutron
fe818fc9fe Update composer dependencies 2013-07-22 13:14:31 +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
9b995e5555 Bump to mediavorus 0.4.x-dev 2013-07-03 14:28:16 +02:00
Romain Neutron
afcdf0f976 Bump to PHP-XPDF 0.2 2013-07-03 12:22:54 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
6c62fe7d16 Update doctrine data fixture dependency 2013-07-02 12:46:03 +02:00
Romain Neutron
efd0f86fe2 Update dependencies to stable ones 2013-07-01 12:16:46 +02:00
Romain Neutron
c0f2a67dd4 Remove composer custom repositories 2013-06-28 12:34:03 +02:00
Romain Neutron
11f78307d9 Add branch alias 2013-06-27 15:13:33 +02:00
Romain Neutron
4b06608caa Update to media-alchemyst 0.3 2013-06-27 12:43:24 +02:00
Romain Neutron
b56cebad2b Bump to symfony 2.3 2013-06-13 20:59:00 +02:00