1278 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jygaulier	d5137d991e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-31 19:54:45 +01:00
jygaulier	d86657c633	fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving	2012-01-31 19:32:24 +01:00
jygaulier	ab44742882	fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving	2012-01-31 19:30:40 +01:00
Romain Neutron	b016d30897	Merge with master	2012-01-31 19:08:49 +01:00
Romain Neutron	32deb6a7af	Add builder script	2012-01-31 18:46:12 +01:00
Romain Neutron	99a344774f	Coding standards	2012-01-31 18:35:27 +01:00
Romain Neutron	dcb4933438	Coding standards	2012-01-31 18:30:48 +01:00
Romain Neutron	f94dce8571	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-31 18:29:07 +01:00
Romain Neutron	1626246f7f	Merge with master	2012-01-31 18:28:49 +01:00
Romain Neutron	ff4e7f1825	Fix tooltip in Client / IE 7	2012-01-31 18:24:56 +01:00
Romain Neutron	b80b1ce76c	Use of default query for guest users	2012-01-31 17:37:29 +01:00
Romain Neutron	ff21840b67	Fix glitch	2012-01-31 17:37:02 +01:00
Nicolas Le Goff	50af32532e	correct rfc oauth2.0 V9 issue, scope and state value are no more provided if not filled in authorization response	2012-01-31 17:05:44 +01:00
Romain Neutron	716f377fdd	User who can change status can see hidden status	2012-01-31 16:58:39 +01:00
Romain Neutron	6a3c186e2a	Fix datetime format	2012-01-31 16:45:22 +01:00
Romain Neutron	25c736525a	Fix chgstatus	2012-01-31 15:59:51 +01:00
Romain Neutron	f060323941	Fix cached desynchro	2012-01-31 15:57:50 +01:00
Nicolas Le Goff	05452bef0e	remove var_dump	2012-01-31 12:36:11 +01:00
Nicolas Le Goff	ba84c9ea77	fix twig strict variable issue	2012-01-31 12:35:12 +01:00
Romain Neutron	f06ed9d8b1	Merge with master	2012-01-31 12:10:48 +01:00
Romain Neutron	4dcb569cea	Merge with master	2012-01-31 12:10:03 +01:00
Romain Neutron	afb42193e7	Merge with master	2012-01-31 12:09:07 +01:00
Romain Neutron	36d328df5c	Push / LIst	2012-01-31 12:03:04 +01:00
Romain Neutron	bda6154602	User Add simple form	2012-01-31 12:02:38 +01:00
Romain Neutron	bde51e0b46	Mustache Push templates	2012-01-31 12:02:19 +01:00
Romain Neutron	04f4489f2d	ENhanced push css	2012-01-31 12:01:54 +01:00
Romain Neutron	144352d0db	Add push icons	2012-01-31 12:01:37 +01:00
Romain Neutron	022041c297	Add Search icon	2012-01-31 12:01:00 +01:00
Romain Neutron	0a9d1845a8	Upgraded to jQuery UI 1.8.17	2012-01-31 11:59:01 +01:00
Romain Neutron	15f533e74a	Upgraded to jQuery UI 1.8.17	2012-01-31 11:58:24 +01:00
Romain Neutron	8e0d42333b	Upgraded to jQuery UI 1.8.17	2012-01-31 11:58:08 +01:00
Romain Neutron	fd94d296f8	Upgraded to jQuery UI 1.8.17	2012-01-31 11:57:44 +01:00
Romain Neutron	d28e9227c2	Fix Coding standards	2012-01-31 11:55:10 +01:00
Romain Neutron	4fdf00bd7f	Fix Coding standards	2012-01-31 11:54:31 +01:00
Romain Neutron	bb0b958830	Fix Coding standards	2012-01-31 11:54:22 +01:00
Romain Neutron	916cc03377	Update proxy	2012-01-31 11:53:13 +01:00
Romain Neutron	6f18aa0c88	Improved UsrLists methods	2012-01-31 11:46:29 +01:00
Romain Neutron	8d85ad9521	Improved push methods	2012-01-31 11:45:57 +01:00
Romain Neutron	1b5d9708c5	Added a new default twig filter "get_class"	2012-01-31 11:44:47 +01:00
Romain Neutron	6fb9efe1b3	Add a callback option to Phraseanet Alerts	2012-01-31 11:43:45 +01:00
Romain Neutron	ce11876411	Add cache and wait stack to MustacheRenderer	2012-01-31 11:43:21 +01:00
Romain Neutron	135c76b258	Add javascript to feedback	2012-01-31 11:42:50 +01:00
Romain Neutron	b1c38627ea	Upgraded main template	2012-01-31 11:42:12 +01:00
Romain Neutron	d0b1a40584	Upgrade code to Phraseanet Alerts	2012-01-31 11:39:29 +01:00
Romain Neutron	0a21461ab7	Upgrade code to jQuery 1.7.1	2012-01-31 11:39:06 +01:00
Romain Neutron	df334dea60	Upgraded to jQuery UI 1.8.17	2012-01-31 11:37:55 +01:00
Romain Neutron	2dd6fc9354	Upgrade to jQuery UI 1.8.17	2012-01-31 11:37:08 +01:00
Romain Neutron	5d8211395a	Upgrade to jQuery UI 1.8.17	2012-01-31 11:35:01 +01:00
Romain Neutron	69abf305d4	Removed sleep connections	2012-01-31 11:33:35 +01:00
Romain Neutron	b171c298d0	Add unique constraint fir a usr in a list	2012-01-31 11:31:39 +01:00