140 Commits

Author	SHA1	Message	Date
Romain Neutron	ade22295ad	Fix CS	2012-04-26 00:55:53 +02:00
Romain Neutron	dd994a9bd6	Fix CS	2012-04-25 17:38:49 +02:00
Romain Neutron	45a4af8f1b	Merge branch 'FixServerName' into Dev	2012-04-11 14:58:17 +02:00
Romain Neutron	6d57972c1e	Fix order master selection	2012-04-11 14:44:58 +02:00
Romain Neutron	23ba44e999	Merge branch 'Fix' into Dev	2012-04-04 15:03:13 +02:00
Romain Neutron	1719adadc5	Fix model application	2012-04-04 14:15:18 +02:00
Romain Neutron	9e640c27cf	Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer	2012-03-30 20:13:40 +02:00
Romain Neutron	8ecdff40e5	Remove debug	2012-03-21 17:17:10 +01:00
Romain Neutron	7a82a72e30	Cleanup after merge	2012-03-20 21:29:52 +01:00
Romain Neutron	7208f4e92e	Merge branch 'scheduler2' into Dev	2012-03-19 19:15:01 +01:00
Romain Neutron	e286c84eb1	Merge with Scheduler 2 branch	2012-03-19 19:14:10 +01:00
Romain Neutron	0c47f9229c	Merge branch 'Doctrine2.2' into Dev	2012-03-19 19:06:03 +01:00
Nicolas Le Goff	00ca39126a	add reset user rights from admin panel	2012-03-16 20:08:41 +01:00
Romain Neutron	196b8b17ef	Merge branch 'FixStamp' into 3.6	2012-03-15 15:33:19 +01:00
Romain Neutron	d60c3ec5b0	Fix Stamp	2012-03-15 15:32:38 +01:00
Romain Neutron	7a0495caf3	Merge with 3.6	2012-03-12 18:40:21 +01:00
Romain Neutron	82d9eeef7b	Coding standards	2012-03-09 12:49:13 +01:00
jygaulier	8bd291f569	Merge with master	2012-03-07 11:22:08 +01:00
jygaulier	8c767d28c7	New scheduler	2012-03-07 11:08:54 +01:00
Nicolas Le Goff	aac54b642b	add css rule	2012-03-02 18:24:48 +01:00
Nicolas Le Goff	f614dadc8d	fix #402 Ajouter un flush de cache dans l'admin	2012-03-02 18:23:13 +01:00
Nicolas Le Goff	a3afa0933b	fix #495 Autoriser l'inscription fait par un utilisateur	2012-02-29 16:59:37 +01:00
Romain Neutron	379926ccf5	Remove unused Autoload	2012-02-28 13:55:24 +01:00
Romain Neutron	9bd67a5361	Refactor Phrasea::start	2012-02-23 10:29:19 +01:00
Romain Neutron	0dcfec55c8	Refactor Configuration	2012-02-22 18:06:58 +01:00
Romain Neutron	a84954cf78	Cleanup	2012-02-21 16:53:28 +01:00
Romain Neutron	375fd3d493	Refactor Appbox	2012-02-21 16:01:55 +01:00
Romain Neutron	2d18aaf013	Add confirmation alerts when empty collection and database	2012-02-17 14:29:04 +01:00
Romain Neutron	fcd2a1a4b2	Confirm collection creation	2012-02-09 17:26:43 +01:00
Romain Neutron	97bf29a5f2	Fix language detection	2012-02-02 16:19:27 +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	5d8211395a	Upgrade to jQuery UI 1.8.17	2012-01-31 11:35:01 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	7319930d5c	Removed old controllers	2012-01-23 18:16:43 +01:00
Romain Neutron	d38103d410	Fix subdefs controller classname	2012-01-20 15:24:03 +01:00
Romain Neutron	1d8bbd34d3	Add vocabulary settings to controller	2012-01-20 15:23:49 +01:00
jygaulier	5a5f86a97b	-	2012-01-19 21:01:03 +01:00
jygaulier	e5828f06bb	-	2012-01-17 12:03:41 +01:00
Romain Neutron	41f99bff9e	Merge	2012-01-12 16:05:49 +01:00
Romain Neutron	65215d69e2	Fix collection cache name bug	2012-01-12 16:03:49 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	3ea1e067a0	Fix wrong path	2012-01-11 21:01:59 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Nicolas Le Goff	d61b08ecea	load connexion from connexion file	2012-01-11 12:27:34 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	43dabbe867	Fix #196 : applya template during registration removes registration on other collections	2012-01-10 20:46:08 +01:00
Nicolas Le Goff	9831cc45c3	add twig service	2012-01-06 16:25:33 +01:00
Romain Neutron	39ef843a5d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 10:47:16 +01:00
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00