685 Commits

Author	SHA1	Message	Date
Romain Neutron	09d092ce83	Fix User Edit	2012-01-19 10:36:28 +01:00
Romain Neutron	e7fddf7177	Refactor caption_field	2012-01-18 18:43:01 +01:00
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	37742b67c6	Rename twig templates	2012-01-18 14:18:55 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Nicolas Le Goff	555b5be34b	handle case where a DC field is null	2012-01-17 16:52:42 +01:00
Romain Neutron	af860e2fa6	Merge with master	2012-01-16 20:19:20 +01:00
Romain Neutron	c813082407	Fix #227 : Import/Export users	2012-01-16 19:30:12 +01:00
Romain Neutron	81b8797b66	Add import to users lists	2012-01-13 13:17:48 +01:00
Romain Neutron	6593e81b5f	Add Push Template	2012-01-12 15:34:12 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	3b79ba0808	Fix strict variables	2012-01-11 21:00:06 +01:00
Romain Neutron	d952fa6da9	Fix strict variables	2012-01-11 20:59:52 +01:00
Romain Neutron	810e42a15d	Browser templates	2012-01-11 20:59:18 +01:00
Romain Neutron	94abb51fe8	User Tooltip template	2012-01-11 20:58:44 +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	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Romain Neutron	867cdce1bd	Fix templates with strict wariables	2012-01-11 12:55:28 +01:00
Nicolas Le Goff	b06a1eda8d	add raw filter for error & warning	2012-01-11 12:08:56 +01:00
Romain Neutron	8a9b93c1ff	Merge with master	2012-01-11 11:29:01 +01:00
Romain Neutron	de7931f7e2	Fix user_infos_tab overflow	2012-01-11 11:25:32 +01:00
Romain Neutron	dc471acd9e	Enhancement graphique prod	2012-01-11 10:43:24 +01:00
Romain Neutron	93cab95f33	Added WorkZone CSS	2012-01-10 20:29:46 +01:00
Romain Neutron	5a064954a2	WorkZone browser templates	2012-01-10 20:27:59 +01:00
Romain Neutron	9c6071e77b	Merge branch 'HotFix' into 3.6	2012-01-10 13:10:08 +01:00
Romain Neutron	09b5ceab3b	Fix table layout for editing users on small screens	2012-01-10 13:08:07 +01:00
Romain Neutron	532b13649c	Add link to basket browser	2012-01-10 12:50:21 +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	be2f50e903	Merge with master	2012-01-06 17:42:11 +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	df18606e11	remove html escape for display links	2012-01-06 16:24:14 +01:00
Romain Neutron	2f752d2bd9	Fix #171 : base_id / sbas_id params not filtered on page 2 in admin user search	2012-01-06 15:58:04 +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	66f7efa392	Fix #167 : HTML tag error	2012-01-06 13:21:33 +01:00
Romain Neutron	d429c81401	Fix #165 : push with long urls does not work	2012-01-05 18:32:42 +01:00
Romain Neutron	8879665760	Fix #163 : Dpi sizes	2012-01-05 17:22:37 +01:00
Romain Neutron	f71268e067	Fix #157 : wrong record number in basket validation summary	2012-01-05 12:43:38 +01:00
Romain Neutron	3e2ec0d385	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 18:08:44 +01:00
Romain Neutron	b1710cabb6	Merge branch 'regs' into 3.6	2012-01-04 18:08:33 +01:00
Romain Neutron	ec78866557	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 18:07:53 +01:00
Romain Neutron	9835fa1ff7	Fix #155 : wrong stories caption	2012-01-04 18:03:38 +01:00
Nicolas Le Goff	0688a9f58a	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 17:55:16 +01:00
Nicolas Le Goff	0ebb8b0908	merge	2012-01-04 17:04:15 +01:00
Nicolas Le Goff	544e55bd32	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 16:57:48 +01:00
Nicolas Le Goff	06f539e7d5	fix install with no databox & trans string	2012-01-04 16:54:23 +01:00
Romain Neutron	30e4b37888	Merge with master	2012-01-04 16:24:47 +01:00
Romain Neutron	4159aeb720	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 16:19:45 +01:00
Nicolas Le Goff	bf840a8c04	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 15:20:05 +01:00