95 Commits

Author	SHA1	Message	Date
Romain Neutron	0dcfec55c8	Refactor Configuration	2012-02-22 18:06:58 +01:00
Romain Neutron	1d6eb86c90	Refactor Appbox	2012-02-21 16:09:34 +01:00
Romain Neutron	35201ab644	Coding standards	2012-02-14 17:55:52 +01:00
Romain Neutron	9916a84dd5	Add method to query on some users	2012-02-14 15:14:58 +01:00
Romain Neutron	8a154e21c1	Coding Standards	2012-02-13 18:23:06 +01:00
Romain Neutron	ba91eddb39	Add dedicated route for user preferences	2012-02-09 16:57:16 +01:00
Romain Neutron	5cf548079e	Implement navigation in list editor	2012-02-08 19:28:18 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +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	99a344774f	Coding standards	2012-01-31 18:35:27 +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	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	ad22cd791e	Merge branch 'templates' into 3.6	2012-01-06 18:14:22 +01:00
Romain Neutron	927eb16070	Fix template name	2012-01-06 17:59:42 +01:00
Romain Neutron	3b8d31eb64	get_applied_template returns template login	2012-01-06 17:52:45 +01:00
Romain Neutron	be2f50e903	Merge with master	2012-01-06 17:42:11 +01:00
Romain Neutron	75f0e416dc	User Query on sbas or bas should not return phantom users	2012-01-06 15:43:01 +01:00
Romain Neutron	2a16efd4bc	User Query on sbas or bas should not return phantom users	2012-01-06 15:00:14 +01:00
Romain Neutron	1977eedfac	User Query on sbas or bas should not return phantom users	2012-01-06 14:50:23 +01:00
Romain Neutron	64ce815e81	Merge with master	2012-01-06 13:30:56 +01:00
Romain Neutron	5d0965f48f	Fix Query on user name	2012-01-05 17:29:15 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Romain Neutron	732301fba2	Add User_Adapter::is_special method	2012-01-03 14:22:44 +01:00
Romain Neutron	afaf619891	Merge branch 'Fixinstaller' into 3.6	2012-01-02 17:12:06 +01:00
Romain Neutron	ec7ecd3533	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-02 16:27:30 +01:00
Romain Neutron	37d8fc26e9	Removed bas_manage right	2012-01-02 16:26:06 +01:00
jygaulier	d1457604f6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-02 11:59:07 +01:00
jygaulier	48adecbc7c	Add ldap_created	2012-01-02 11:58:57 +01:00
jygaulier	311d3ea19a	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-02 11:54:57 +01:00
jygaulier	6c9812da7e	add attribute ldap_created + get/set	2011-12-30 18:07:15 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	cf5333bbf0	Removed unused function	2011-12-26 20:38:53 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	6d0d60d713	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-26 17:26:37 +01:00
Romain Neutron	9f8dd943b3	Fix #110 : make user management table sortable	2011-12-26 17:24:50 +01:00
Romain Neutron	138ed434b2	Add method User_Adapter::get_template_owner	2011-12-26 16:04:47 +01:00
Romain Neutron	5dc97682be	Add method User_Query::only_template	2011-12-26 16:04:28 +01:00
Nicolas Le Goff	b50e6c930e	fix user_adapter::set_email	2011-12-20 17:33:41 +01:00
Romain Neutron	eeb9fa0d47	Adding uncommited fixes	2011-12-15 12:45:16 +01:00
Romain Neutron	e7c5a5875e	Add a method to get all email addresses that are duplicates	2011-12-08 16:42:08 +01:00
Romain Neutron	66bd51cc74	Add a get_last_connection method	2011-12-08 16:37:13 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00