920 Commits

Author	SHA1	Message	Date
Romain Neutron	5779ca900b	Basket Browser css	2012-01-11 21:01:28 +01:00
Romain Neutron	7689a52fef	Add user.png icon	2012-01-11 21:00:54 +01:00
Romain Neutron	530e5599d6	Add push rewrite rules	2012-01-11 21:00:29 +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
Romain Neutron	78fa03a59c	Merge branch 'HotFix' into 3.6	2012-01-11 15:45:08 +01:00
Romain Neutron	3d2923a627	Fix presets	2012-01-11 15:43:47 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Romain Neutron	9a761b59c3	Merge with master	2012-01-11 14:29:47 +01:00
Romain Neutron	b60daf20a8	Fix search status in client	2012-01-11 13:48:30 +01:00
Romain Neutron	7f77c19f6b	Fix search status in client	2012-01-11 13:48:19 +01:00
Romain Neutron	9560192996	Fix templates with strict wariables	2012-01-11 12:55:49 +01:00
Nicolas Le Goff	d61b08ecea	load connexion from connexion file	2012-01-11 12:27:34 +01:00
Romain Neutron	29b0d5d1a0	Enhancement graphique prod	2012-01-11 10:43:03 +01:00
Romain Neutron	8be9cac424	Update prod CSS	2012-01-11 10:42:18 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	43dabbe867	Fix #196 : applya template during registration removes registration on other collections	2012-01-10 20:46:08 +01:00
Romain Neutron	99ca258c1c	Removed some console.log	2012-01-10 20:29:21 +01:00
Romain Neutron	3b4b04e3c6	WorkZone browser CSS	2012-01-10 20:28:42 +01:00
Romain Neutron	48ffdefc88	Add options to default dialog	2012-01-10 12:49:48 +01:00
Romain Neutron	ccf08e05eb	Merge with master	2012-01-10 10:25:02 +01:00
Romain Neutron	0b27c161c5	Fix editing records	2012-01-09 20:32:58 +01:00
Romain Neutron	de10de6a12	Substitution enhancement	2012-01-09 20:09:02 +01:00
Romain Neutron	ad22cd791e	Merge branch 'templates' into 3.6	2012-01-06 18:14:22 +01:00
Romain Neutron	354231b60b	Add icon to templates user	2012-01-06 18:13:36 +01:00
Romain Neutron	8768f86926	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-06 17:34:10 +01:00
Nicolas Le Goff	47f3ba2520	merge	2012-01-06 16:55:10 +01:00
Nicolas Le Goff	a8ddaf1f98	add twig service	2012-01-06 16:31:34 +01:00
Nicolas Le Goff	590fe1cdcd	add twig service	2012-01-06 16:30:58 +01:00
Nicolas Le Goff	8a9e965a3d	add twig service	2012-01-06 16:30:12 +01:00
Nicolas Le Goff	e1535924f4	add twig service	2012-01-06 16:28:02 +01:00
Nicolas Le Goff	be09baf9f4	add twig service	2012-01-06 16:27:32 +01:00
Nicolas Le Goff	fcfa9db2c3	add twig service	2012-01-06 16:27:00 +01:00
Nicolas Le Goff	9831cc45c3	add twig service	2012-01-06 16:25:33 +01:00
Romain Neutron	d933c64b2f	Use of secured scheme for external apis in case of https	2012-01-06 14:42:41 +01:00
Romain Neutron	64ce815e81	Merge with master	2012-01-06 13:30:56 +01:00
Romain Neutron	d9b611cceb	Fix download IE6	2012-01-06 13:14:53 +01:00
Romain Neutron	8ff2f6fc59	Fix download IE6	2012-01-05 23:44:54 +01:00
Romain Neutron	d429c81401	Fix #165 : push with long urls does not work	2012-01-05 18:32:42 +01:00
Romain Neutron	a709129824	Merge with master	2012-01-05 14:56:13 +01:00
Romain Neutron	9a10f70859	Fix #159 : push search filters	2012-01-05 12:37:26 +01:00
Romain Neutron	0dd490fa23	Merge branch 'hotfix' into 3.6	2012-01-05 12:10:29 +01:00
Romain Neutron	65bf53f077	Fix Classic collection display	2012-01-05 12:09:04 +01:00
Romain Neutron	b1710cabb6	Merge branch 'regs' into 3.6	2012-01-04 18:08:33 +01:00
Romain Neutron	7abb602f9a	Fix #156 : editing presets does not contain meta_struct_ids	2012-01-04 18:02:29 +01:00
Romain Neutron	30e4b37888	Merge with master	2012-01-04 16:24:47 +01:00
Romain Neutron	d4250bcae8	Fix #150 : missing notifications when receiving a validation	2012-01-04 15:15:38 +01:00
Romain Neutron	a81b6aade9	Fix JS Build	2012-01-04 11:41:58 +01:00
Romain Neutron	6cf3276af5	Fix JS Build	2012-01-04 11:15:05 +01:00
Romain Neutron	1c7c5ce701	Fix JS Build	2012-01-04 11:00:44 +01:00
Romain Neutron	39ef843a5d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 10:47:16 +01:00