hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,803 Commits 268 Branches 107 Tags
9c84ea3803fe6575645cbc3871a03cc097cc8dba
Commit Graph

260 Commits

Author SHA1 Message Date
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
Romain Neutron
675c3ae859 Use tagged tcpdf version 2013-06-01 11:51:21 +02:00
Romain Neutron
dbf4951a15 Add dependencies for plugins 2013-05-31 11:40:52 +02:00
Romain Neutron
ab4a368ea8 Update dependencies 2013-05-29 14:23:17 +02:00
Romain Neutron
dc4be58ca8 Update dependencies 2013-05-29 14:23:12 +02:00
Nicolas Le Goff
f2f388fec7 Add behat and mink as dev dependencies 2013-05-29 14:23:07 +02:00
Romain Neutron
60c32bbce0 Update dependencies 2013-05-29 14:22:59 +02:00
Romain Neutron
550bbef153 Add facebook and recaptcha as dependencies 2013-05-29 14:22:52 +02:00
Romain Neutron
7ba46abaff Address github annotations 2013-05-27 23:49:39 +02:00
Nicolas Le Goff
1ff4e4060b Add field application 
Add asset dependencies

Add field model

Add field tests

Add field app

Add JS build

Add end file blank line

Adjust asset dependencies version

Remove assets test libraries from build

Remove unecessary comments

Add end file blank line

Fix indent
 2013-05-27 23:26:05 +02:00
Romain Neutron
8ebc3ee9ad Update dependencies to support jms/serializer 2013-05-27 23:24:52 +02:00
Romain Neutron
2471eb1a36 Cleanup minification controller 2013-05-24 19:41:34 +02:00