749 Commits

Author	SHA1	Message	Date
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
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00
Romain Neutron	8dcd5af3cc	Fix #146 : Choice button does not work in lightbox	2012-01-04 10:43:10 +01:00
jygaulier	d15abe329e	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 17:47:05 +01:00
Nicolas Le Goff	43a396eb8e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-03 16:35:02 +01:00
Nicolas Le Goff	43fbee03c2	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 16:17:49 +01:00
Nicolas Le Goff	e540bd39d3	Merge branch 'fix_report' into 3.6	2012-01-03 16:15:10 +01:00
Nicolas Le Goff	6872ceb3db	fix #138 report / user downloads	2012-01-03 16:12:41 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Nicolas Le Goff	c4de980ba7	replace config.inc	2012-01-03 14:54:12 +01:00
Romain Neutron	dfa31dc3b8	Add link to autoregister setup	2012-01-03 14:22:06 +01:00
Romain Neutron	654ca168c7	Removed invite and autoregister links from dashboard	2012-01-03 14:21:13 +01:00
jygaulier	e47f864ff0	fix bug on custom tasks	2012-01-03 13:50:47 +01:00
Romain Neutron	2818211b2a	Fix #139 : unable to change status	2012-01-03 13:50:34 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
jygaulier	0370bec2e3	fix bug on custom tasks	2012-01-03 12:19:35 +01:00
Romain Neutron	008b1d66f6	Fix #140 : bad calendar in english	2012-01-03 11:27:03 +01:00
Romain Neutron	54c38e57d5	removes old print files	2011-12-30 16:39:23 +01:00
Romain Neutron	31b70fc70f	Activate printer	2011-12-30 16:17:36 +01:00
Romain Neutron	66863430e4	Add printer rewrite rules	2011-12-30 16:17:08 +01:00
Romain Neutron	6c58c8f5f9	Fix input:radio display	2011-12-30 16:15:15 +01:00
Romain Neutron	a9667b8e2a	Removed bit.ly	2011-12-30 12:47:25 +01:00