2513 Commits

Author	SHA1	Message	Date
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
Nicolas Le Goff	6720192ba0	Merge branch 'fix_report' into 3.6	2012-01-04 15:18:47 +01:00
Nicolas Le Goff	b321d1540e	fix #153 No display of thumbs in report	2012-01-04 15:15:47 +01:00
Romain Neutron	dd40dcdf97	Fix #154 : short history of record are missing authors of actions	2012-01-04 14:38:54 +01:00
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00
Romain Neutron	a7078c2e17	Fix Typo	2012-01-04 10:32:40 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Romain Neutron	74bb32cb8b	Fix #136 : untranslated strings	2012-01-03 14:57:52 +01:00
Romain Neutron	dfa31dc3b8	Add link to autoregister setup	2012-01-03 14:22:06 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
Romain Neutron	18ebb16080	Moving interface	2012-01-02 16:19:47 +01:00
Romain Neutron	3ec68a60b2	Printer view	2012-01-02 12:51:28 +01:00
Romain Neutron	8e8f014e6c	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-30 12:48:11 +01:00
Romain Neutron	a9667b8e2a	Removed bit.ly	2011-12-30 12:47:25 +01:00
Romain Neutron	ea0a544567	Removed bit.ly	2011-12-30 12:45:52 +01:00
Romain Neutron	4e970c5e56	Fix #135 / #134	2011-12-30 12:17:19 +01:00
Romain Neutron	d0fc37b957	Fix #134 : browsing a story	2011-12-30 11:40:21 +01:00
Nicolas Le Goff	a852449971	fix bridge testes	2011-12-30 00:33:44 +01:00
Romain Neutron	cc871662b6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-29 19:32:13 +01:00
Romain Neutron	028b72f271	Fix build	2011-12-29 19:31:45 +01:00
Nicolas Le Goff	e4c198b41b	Merge cooliris branch	2011-12-29 18:48:15 +01:00
Nicolas Le Goff	c70755e9ec	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-29 18:46:51 +01:00
Nicolas Le Goff	521b9b2b4b	fix cooliris feed issue & fix rss tests	2011-12-29 18:45:26 +01:00