50 Commits

Author	SHA1	Message	Date
Romain Neutron	ec4ec4931d	Refactor Appbox	2012-02-21 16:16:25 +01:00
Romain Neutron	2590ab6ddd	Add control on BasketRepo	2012-02-17 16:08:00 +01:00
Romain Neutron	cd2fed388a	Restrict access to Bridge to flatten stories	2012-02-16 10:36:36 +01:00
Romain Neutron	b92de384f5	Add support for StoryWZ	2012-02-16 10:36:15 +01:00
Romain Neutron	8a154e21c1	Coding Standards	2012-02-13 18:23:06 +01:00
Romain Neutron	ce1e7ecaac	Add workzone sort	2012-02-09 18:06:44 +01:00
Romain Neutron	2265884821	Fix gender selection in user admin	2012-02-09 17:32:54 +01:00
Romain Neutron	7323edb162	Remove attached and Deleted stories from the workzone on load	2012-02-09 17:11:21 +01:00
Romain Neutron	b4f772b2a8	Remove attached and Deleted stories from the workzone on load	2012-02-09 17:09:04 +01:00
Romain Neutron	2166a6cdfe	Add vocabulary id to edit	2012-02-08 16:24:07 +01:00
Romain Neutron	067561a734	Merge with master	2012-01-31 22:22:54 +01:00
Romain Neutron	3e9ad6a63f	Refactor namespace	2012-01-31 22:03:51 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	e1c95b49a5	Merge with master	2012-01-25 17:25:25 +01:00
Nicolas Le Goff	6d31db1ae4	merge	2012-01-23 19:17:08 +01:00
Nicolas Le Goff	725c69775f	correct syntax error	2012-01-23 18:56:05 +01:00
Romain Neutron	9d17412df2	Fix edit load	2012-01-23 18:51:34 +01:00
Romain Neutron	b47b63261b	Add use of core serializer	2012-01-23 18:16:09 +01:00
Romain Neutron	11f7ab23aa	Use source properties if available	2012-01-20 13:37:09 +01:00
Romain Neutron	d462f0b6c4	Use of JS new objects in editing	2012-01-19 17:56:35 +01:00
Romain Neutron	0af3396131	Fix Helper Edit	2012-01-19 10:36:10 +01:00
Romain Neutron	562744f6c7	Refactor caption_field	2012-01-18 18:20:15 +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	c6ea536ab6	Refactor caption_field	2012-01-18 14:20:05 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Nicolas Le Goff	ba4dd7ddb9	raise unauthorized exception when authenticated user do not have proper rights	2012-01-17 16:31:57 +01:00
Romain Neutron	af860e2fa6	Merge with master	2012-01-16 20:19:20 +01:00
Nicolas Le Goff	cc890c73f2	fix namespace issue	2012-01-13 13:10:05 +01:00
Nicolas Le Goff	e47abc19e7	add namespace	2012-01-13 13:06:12 +01:00
Romain Neutron	e631a4598e	Move user search in push controller	2012-01-12 15:31:59 +01:00
Romain Neutron	73962138fa	Refactor Core::request	2012-01-12 14:26:42 +01:00
Romain Neutron	278195fcfd	Fix Namespaces bugs	2012-01-11 20:57:27 +01:00
Romain Neutron	8a9b93c1ff	Merge with master	2012-01-11 11:29:01 +01:00
Nicolas Le Goff	47f3ba2520	merge	2012-01-06 16:55:10 +01:00
Nicolas Le Goff	64a99dbffb	add twig service	2012-01-06 16:35:37 +01:00
Romain Neutron	a709129824	Merge with master	2012-01-05 14:56:13 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Romain Neutron	a1e447fe66	Push controller	2012-01-02 16:20:23 +01:00
Romain Neutron	3f559a36d7	Push Controllers	2012-01-02 12:52:46 +01:00
Romain Neutron	6684de2895	Add printer Helper	2011-12-30 16:16:19 +01:00
Romain Neutron	a6ce43217c	Fix Bug in grep_records	2011-12-30 16:15:52 +01:00
Romain Neutron	4e970c5e56	Fix #135 / #134	2011-12-30 12:17:19 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	d90998ac12	Menage	2011-12-26 12:09:58 +01:00
Romain Neutron	70c762e93d	Cleanup Helpers	2011-12-24 03:14:19 +01:00
Romain Neutron	1fc83e6019	Cleanup Helpers	2011-12-24 03:08:30 +01:00
Romain Neutron	10f74f0265	Refactor	2011-12-16 20:00:16 +01:00
Romain Neutron	6167678f52	Fix Typo	2011-12-16 17:35:03 +01:00
Romain Neutron	57bcd3b971	Renamed RequestHandler => Helper	2011-12-16 17:20:17 +01:00