1702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	41e32e72bd	Code formatting	2012-02-02 11:28:14 +01:00
Romain Neutron	b025bf0eda	List Item mustache badge	2012-02-02 11:27:44 +01:00
Romain Neutron	fbd3c9c159	Push CSS	2012-02-02 11:27:11 +01:00
Romain Neutron	7976e94b73	resized PushBox	2012-02-02 11:26:54 +01:00
Romain Neutron	9a9e20ae29	List Manager	2012-02-02 11:26:22 +01:00
Romain Neutron	dd1714fbfa	List Manager	2012-02-02 11:26:06 +01:00
Romain	8c1fdfbc78	Merge pull request #23 from jschne/3.6 ... add somme conf for qunit continuous integration	2012-02-01 07:14:37 -08:00
Jonathan SCHNEIDER	e50ca4c15d	add somme conf for qunit	2012-02-01 15:54:58 +01:00
Romain Neutron	a332aebe68	Fix build	2012-01-31 23:33:33 +01:00
Romain Neutron	0f28f12fe7	Merge	2012-01-31 23:04:28 +01:00
Romain Neutron	2fbbe3fbbe	removed test DB	2012-01-31 23:02:13 +01:00
Romain Neutron	35da359350	Fix build	2012-01-31 23:01:35 +01:00
Romain Neutron	6d9dde4575	Merge	2012-01-31 22:23:00 +01:00
Romain Neutron	067561a734	Merge with master	2012-01-31 22:22:54 +01:00
Romain Neutron	deb98a49b8	Merge	2012-01-31 22:05:39 +01:00
Romain Neutron	a9c0740b3a	Push javascript	2012-01-31 22:05:18 +01:00
Romain Neutron	289537c0ea	Use of JS language	2012-01-31 22:04:34 +01:00
Romain Neutron	406db0c4e1	Add languages	2012-01-31 22:04:00 +01:00
Romain Neutron	3e9ad6a63f	Refactor namespace	2012-01-31 22:03:51 +01:00
Romain Neutron	12492995c5	Updated builder	2012-01-31 21:43:29 +01:00
Romain Neutron	012c65125d	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-31 20:31:23 +01:00
Romain Neutron	23ac371f50	Bump to version 3.5.10	2012-01-31 20:28:55 +01:00
jygaulier	5feebb8355	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-31 20:06:55 +01:00
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