780 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	631c48804c	change redirect access_user from index.php to /	2012-02-03 16:14:33 +01:00
Nicolas Le Goff	90e8004fb8	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 16:11:06 +01:00
Nicolas Le Goff	f7cb1688c7	Change redirection from index.php to /	2012-02-03 16:10:55 +01:00
Nicolas Le Goff	683fb4cd4e	Moved gatekeeper from core to bootstrap	2012-02-03 16:10:32 +01:00
Nicolas Le Goff	6a437a3831	fix #312 subdef structure for a preview is duplicate	2012-02-03 15:32:52 +01:00
Romain Neutron	3e0ddf5e13	Use of new push icons	2012-02-03 13:00:09 +01:00
Romain Neutron	03988283b3	Fix #299	2012-02-02 19:58:46 +01:00
Romain Neutron	548ddc14e5	Fix build	2012-02-02 19:02:08 +01:00
Romain Neutron	0c8a7ac84e	Removed console.log	2012-02-02 16:31:31 +01:00
Romain Neutron	203770fdee	Fix typo	2012-02-02 16:27:44 +01:00
Romain Neutron	97bf29a5f2	Fix language detection	2012-02-02 16:19:27 +01:00
Romain Neutron	6935f1ac6e	Cleaning version	2012-02-02 15:56:33 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +01:00
Romain Neutron	b3b53372c0	Push cleanup	2012-02-02 15:25:22 +01:00
Romain Neutron	5439b3450c	Added User_Query::get_total_page method and various paramaters for query ( Activity/Templates/Position/Country/Company)	2012-02-02 11:29:45 +01:00
Romain Neutron	41e32e72bd	Code formatting	2012-02-02 11:28:14 +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	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
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
jygaulier	72078aa836	-	2012-01-31 19:21:06 +01:00
Romain Neutron	99a344774f	Coding standards	2012-01-31 18:35:27 +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	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	f060323941	Fix cached desynchro	2012-01-31 15:57:50 +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	69abf305d4	Removed sleep connections	2012-01-31 11:33:35 +01:00
Nicolas Le Goff	c4f14a8f05	delete prod module	2012-01-30 17:02:35 +01:00
Romain Neutron	190b5992ff	Cleaning opened connections	2012-01-30 12:00:34 +01:00
Nicolas Le Goff	9376144dbf	fix #274 add intl & twig extension in check::system	2012-01-27 19:40:23 +01:00
Nicolas Le Goff	c50cdc097c	merge	2012-01-27 17:20:10 +01:00
Nicolas Le Goff	694f943d23	complete admin controller tests	2012-01-27 17:16:50 +01:00
Romain Neutron	b299e7d042	Fix build	2012-01-26 19:12:51 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	56fc13c5bb	Removed a space	2012-01-25 19:14:48 +01:00
Romain Neutron	81631e1bbc	Removed debug	2012-01-25 18:54:12 +01:00
Romain Neutron	de5ffe76ae	Cleanup	2012-01-25 18:47:04 +01:00
Romain Neutron	fc1a0abb19	Cleanup	2012-01-25 18:45:28 +01:00
Romain Neutron	e1c95b49a5	Merge with master	2012-01-25 17:25:25 +01:00