2444 Commits

Author	SHA1	Message	Date
Romain Neutron	4e64f9a1a2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-18 14:24:57 +01:00
Romain Neutron	2ba5fe78f9	Refactor include pathes	2012-01-18 14:24:18 +01:00
Romain Neutron	de69f0357e	Refactor caption_field	2012-01-18 14:22:31 +01:00
Nicolas Le Goff	8c203b6fce	add remove of all configuration file when rollback	2012-01-18 14:14:36 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Nicolas Le Goff	a3c84216a6	add message for Exception_Databox_CollectionNotFound exception	2012-01-17 16:34:37 +01:00
jygaulier	e5828f06bb	-	2012-01-17 12:03:41 +01:00
Romain Neutron	af860e2fa6	Merge with master	2012-01-16 20:19:20 +01:00
Romain Neutron	b24c6bab43	Fix #228: Stamp logo non visible	2012-01-16 20:06:55 +01:00
Romain Neutron	aef4cdf5f3	Add exiftool namespaces : http://owl.phy.queensu.ca/~phil/exiftool/TagNames/XMP.html#iptcCore and ... http://owl.phy.queensu.ca/~phil/exiftool/TagNames/XMP.html#xmpRights	2012-01-16 19:56:17 +01:00
Romain Neutron	c813082407	Fix #227 : Import/Export users	2012-01-16 19:30:12 +01:00
Romain Neutron	785fd657d0	Add notice "copy paste this link if you can not click it" in mails	2012-01-13 12:49:48 +01:00
Romain Neutron	5133425a7c	Fix Bug : collection order is not saved	2012-01-13 12:44:44 +01:00
Romain Neutron	1cdaa8d726	Fix Bug in push search : only last search parameters is taken	2012-01-13 12:41:05 +01:00
Romain Neutron	b37703b506	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-13 12:16:59 +01:00
Nicolas Le Goff	85a7239c82	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-12 19:01:11 +01:00
Nicolas Le Goff	65cce08fad	add task to check configuration file	2012-01-12 18:54:39 +01:00
Romain Neutron	56f620e6e6	Merge branch 'HotFix' into 3.6	2012-01-12 16:42:14 +01:00
Romain Neutron	6b60e88356	Fix serialize string in ACL	2012-01-12 16:41:07 +01:00
Romain Neutron	41f99bff9e	Merge	2012-01-12 16:05:49 +01:00
Romain Neutron	65215d69e2	Fix collection cache name bug	2012-01-12 16:03:49 +01:00
Romain Neutron	aee1516d6c	Add preview rights on validation	2012-01-12 15:44:28 +01:00
Romain Neutron	bf4d67872a	Add \ACL constants for logging grant access	2012-01-12 14:28:07 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	e9beddc80e	Fix include path bugs	2012-01-11 20:57:54 +01:00
Nicolas Le Goff	b774bfce9d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-11 16:59:15 +01:00
Nicolas Le Goff	99296ec696	rename service.yml in services.yml	2012-01-11 16:40:29 +01:00
Nicolas Le Goff	bd986fade3	check if tech_datas has Width & Height key	2012-01-11 16:30:53 +01:00
Romain Neutron	2c3425a460	Merge	2012-01-11 15:35:57 +01:00
Romain Neutron	bffd7e6ce7	Fix #207 : cache is not well refreshed	2012-01-11 15:33:46 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Romain Neutron	4fc8da1d15	Fix #206 : search by date	2012-01-11 14:46:06 +01:00
Nicolas Le Goff	c5c4418020	load connexion from connexion file	2012-01-11 12:29:44 +01:00
Nicolas Le Goff	703f84177b	modify static::is_installed	2012-01-11 12:26:21 +01:00
Nicolas Le Goff	1a5ec7d0cf	check if configuration is installed	2012-01-11 12:25:43 +01:00
Nicolas Le Goff	cf513dd792	load connexion from connexion file	2012-01-11 12:24:40 +01:00
Nicolas Le Goff	0196f69f84	load connexion from connexion file	2012-01-11 12:24:23 +01:00
Nicolas Le Goff	8a12e24218	load connexion from connexion file & ... and modify create methode	2012-01-11 12:24:06 +01:00
Romain Neutron	fc3bb9a6fd	Merge with master	2012-01-11 12:15:30 +01:00
Romain Neutron	8dbedd0e87	Fix story export	2012-01-11 12:12:37 +01:00
Romain Neutron	f583cf60f8	Merge branch 'FixFTP' into 3.6	2012-01-11 11:57:43 +01:00
Romain Neutron	6d830053d1	Fix logfile	2012-01-11 11:56:47 +01:00
Romain Neutron	8a9b93c1ff	Merge with master	2012-01-11 11:29:01 +01:00
Romain Neutron	85f44ce8c5	Do not alert when validation is finished	2012-01-11 11:24:01 +01:00
Romain Neutron	5c8d00397c	Allox usr_mail to be null	2012-01-11 11:18:13 +01:00
Romain Neutron	10cab0374c	Fix substitute	2012-01-11 11:01:22 +01:00
Romain Neutron	f7a669c07d	Syntax	2012-01-11 10:44:36 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	a3ebb45317	Fix refactor	2012-01-10 21:07:29 +01:00
Romain Neutron	ecc82f6222	Merge master fix	2012-01-10 20:33:17 +01:00