550 Commits

Author	SHA1	Message	Date
Romain Neutron	841d0eac49	Add some cache to geonames	2012-02-09 19:07:16 +01:00
Romain Neutron	ba91eddb39	Add dedicated route for user preferences	2012-02-09 16:57:16 +01:00
Romain Neutron	9ad8af5d22	Fix removing document visual alert	2012-02-09 16:04:09 +01:00
Romain Neutron	7830d9ff02	Rename file	2012-02-08 20:03:59 +01:00
Romain Neutron	34b5d3f93f	Add patch	2012-02-08 20:03:13 +01:00
Romain Neutron	5cf548079e	Implement navigation in list editor	2012-02-08 19:28:18 +01:00
Romain Neutron	b7aab5c30a	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-08 16:24:20 +01:00
Romain Neutron	d27cd4e6ab	Vocabulary classes	2012-02-08 16:15:48 +01:00
Nicolas Le Goff	97454bd1fd	removed memcached as available adapter	2012-02-08 11:45:48 +01:00
Nicolas Le Goff	39e193943e	removed check for memcached extension	2012-02-08 11:44:59 +01:00
Romain Neutron	b16f5d63ab	Fix ACL	2012-02-07 19:54:59 +01:00
Romain Neutron	b0c2c098fe	Merge with master	2012-02-07 19:46:23 +01:00
Romain Neutron	d3eee39ddd	Fix bug cache replication	2012-02-07 19:43:44 +01:00
Romain Neutron	26a1e3b916	Revert bad merge	2012-02-07 18:02:23 +01:00
Romain Neutron	d475e00cfa	Merge with master	2012-02-07 17:47:39 +01:00
Romain Neutron	fb2b423cd8	Fix #320	2012-02-07 17:24:52 +01:00
Romain Neutron	d0642b40ce	Fix #319	2012-02-07 17:02:38 +01:00
Romain Neutron	dfa39b8f1e	Fix bugs	2012-02-07 16:54:19 +01:00
Romain Neutron	5b28333da5	Merge with master	2012-02-07 14:51:36 +01:00
Romain Neutron	07d79f758b	Merge with master	2012-02-07 14:30:00 +01:00
Romain Neutron	3f9cf2c7a0	Fix autoregister	2012-02-07 13:25:22 +01:00
Romain Neutron	a3dc2062ee	Coding standards	2012-02-06 13:25:06 +01:00
Nicolas Le Goff	47d2c433cd	fix build & add loader classes	2012-02-03 18:42:33 +01:00
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
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