978 Commits

Author	SHA1	Message	Date
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
Romain Neutron	ea0a544567	Removed bit.ly	2011-12-30 12:45:52 +01:00
Romain Neutron	647946e802	Merge branch 'RequiredField' into 3.6	2011-12-28 23:12:23 +01:00
Romain Neutron	d0761afae1	Fix #129 : setup a databox field as required	2011-12-28 23:11:49 +01:00
Romain Neutron	c7e0dd378c	Merge branch 'FixSeparator' into 3.6	2011-12-28 23:05:46 +01:00
Romain Neutron	88552650a0	JY changes	2011-12-28 22:55:11 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Romain Neutron	b38f1f1227	Fix basket_adapter	2011-12-28 13:02:37 +01:00
Romain Neutron	4ab724b8de	Merge AdminFix	2011-12-27 19:25:13 +01:00
Romain Neutron	85d338217f	Fix admin CSS	2011-12-27 19:19:55 +01:00
Romain Neutron	458dc822ec	Selection is active on click, not mousedown	2011-12-27 19:18:11 +01:00
Romain Neutron	5b0f93de05	Basket refactor	2011-12-27 19:16:55 +01:00
Romain Neutron	1257da5d70	Workzone stories attach/detach	2011-12-27 19:15:30 +01:00
Romain Neutron	2c850bf74f	Syntax corrections	2011-12-27 15:51:19 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	e3727938fb	Merge branch 'FixSeparator' into 3.6	2011-12-27 14:36:19 +01:00
Romain Neutron	382be15123	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:46 +01:00
Romain Neutron	9c9b9a36b3	Refactor basket_adapter	2011-12-27 14:05:48 +01:00
Romain Neutron	00fef88ccd	Refactor basket_adapter	2011-12-27 14:05:22 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	6d0d60d713	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-26 17:26:37 +01:00