749 Commits

Author	SHA1	Message	Date
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
Romain Neutron	9f8dd943b3	Fix #110 : make user management table sortable	2011-12-26 17:24:50 +01:00
Romain Neutron	c6a60052c6	Add option to apply template to Twig templates	2011-12-26 16:08:49 +01:00
Romain Neutron	ee74a93598	Add header titles for admin user editing	2011-12-26 14:12:32 +01:00
Romain Neutron	8c687ec222	Add header titles for admin user editing	2011-12-26 14:12:28 +01:00
Romain Neutron	4698087c6c	Fix 115: udnefined constant GV_captcha_public_key	2011-12-26 13:12:38 +01:00
Romain Neutron	f40f648dd1	Fix 113 : bad file name encoding	2011-12-26 13:10:08 +01:00
Romain Neutron	75ca21cb92	Fix 113 : bad file name encoding	2011-12-26 13:09:02 +01:00
Romain Neutron	cf71abc285	Basket skins	2011-12-26 12:19:35 +01:00
Romain Neutron	23457654ea	Add qunit	2011-12-26 12:16:50 +01:00
Romain Neutron	f61a96996a	Prod JS	2011-12-26 12:16:20 +01:00
Romain Neutron	21adc58dd3	Refactor basket_adapter	2011-12-26 12:15:57 +01:00
Romain Neutron	d90998ac12	Menage	2011-12-26 12:09:58 +01:00
Romain Neutron	344a831e10	Add Prod JS	2011-12-26 12:09:34 +01:00
Romain Neutron	cbad5d5371	Refactor basket_adapter	2011-12-26 12:09:26 +01:00
Romain Neutron	0a218b6607	Production JS	2011-12-26 10:47:17 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +01:00
Romain Neutron	c7be5710a6	Fix upload page	2011-12-21 17:50:17 +01:00
Romain Neutron	574da8c092	Story rewrite rules	2011-12-21 17:44:15 +01:00
Romain Neutron	18cbd18d02	Baskets routes	2011-12-21 17:43:26 +01:00
Nicolas Le Goff	ed92922842	Merge	2011-12-20 20:00:52 +01:00
Nicolas Le Goff	a6edeb691f	Merge	2011-12-20 19:58:10 +01:00
Nicolas Le Goff	9cd0d6d7aa	Fix bug #101	2011-12-20 18:34:19 +01:00
Nicolas Le Goff	54c8a7a138	Fix #101 : Non graphical tasks does not update their values in database	2011-12-20 18:27:14 +01:00
Romain Neutron	fb787e864f	Merge branch 'Fix99' into 3.6	2011-12-20 17:39:11 +01:00
Romain Neutron	6913a41cd3	Merge bug archivage	2011-12-20 17:05:18 +01:00
Romain Neutron	ca6df7d28c	Merge Archiving bug	2011-12-20 16:52:32 +01:00
Romain Neutron	39c664545d	Baskets routes	2011-12-20 14:07:48 +01:00
Romain Neutron	31c1eb3edf	Basket route	2011-12-19 19:17:02 +01:00
Romain Neutron	4fdc965306	Add humane.js	2011-12-19 17:47:50 +01:00