685 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	2783790b8f	Remove upload access when useless	2012-03-30 14:58:43 +02:00
Romain Neutron	cc554909c0	Merge 3.6 fixes	2012-03-30 14:52:43 +02:00
Romain Neutron	0594b5135e	Fix push user add box	2012-03-30 14:49:13 +02:00
Romain Neutron	e3af882050	Fix templates using business fields	2012-03-30 13:44:19 +02:00
Romain Neutron	815a15fe5e	Add businessfields option to FTP	2012-03-22 18:26:20 +01:00
Romain Neutron	31165c6816	Add business fields options in export dialog	2012-03-22 17:04:22 +01:00
Romain Neutron	5ad365956c	Fix audio thumbnails formatting	2012-03-22 16:38:56 +01:00
Romain Neutron	2a69ceac6a	Implements business fields in view	2012-03-21 17:55:32 +01:00
Romain Neutron	a9bd1f2d6c	Add business fields in admin interface	2012-03-21 13:18:37 +01:00
Romain Neutron	fa20b6abcb	Fix typo	2012-03-20 12:12:15 +01:00
Romain Neutron	d4e6a716d9	Fix typo	2012-03-20 12:11:10 +01:00
Romain Neutron	fa698fbdda	Coding Standards	2012-03-19 19:04:48 +01:00
Romain Neutron	79889eba2b	Upgrade locales	2012-03-19 18:08:28 +01:00
Romain Neutron	4a02e5a20d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-19 17:05:11 +01:00
Nicolas Le Goff	e20999015c	Fix validation basketelements sorting	2012-03-19 17:03:05 +01:00
Romain Neutron	73f1de710d	Fix referesh message	2012-03-19 15:34:49 +01:00
Romain Neutron	87cb0b2299	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-19 13:40:34 +01:00
Romain Neutron	6463b6e66d	Vocabulary control can be applied only to monovalued fields	2012-03-19 13:34:47 +01:00
Nicolas Le Goff	00ca39126a	add reset user rights from admin panel	2012-03-16 20:08:41 +01:00
Romain Neutron	8e64da10e4	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-13 12:01:53 +01:00
Romain Neutron	037b7985fe	Merge with master	2012-03-13 12:01:21 +01:00
Romain Neutron	fc4e1b3d91	Fix add in basket	2012-03-13 11:44:25 +01:00
Nicolas Le Goff	f4249bda0b	fix css issue	2012-03-12 18:42:50 +01:00
Nicolas Le Goff	bea7e4a371	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-12 18:15:21 +01:00
Romain Neutron	ea3ff89416	Fix mobile app	2012-03-12 18:14:12 +01:00
Nicolas Le Goff	c3fda09044	fix capcha home page	2012-03-12 18:13:54 +01:00
Nicolas Le Goff	89e47e15c6	Fix IE7 overflows	2012-03-12 17:40:14 +01:00
Romain Neutron	35995034cf	Fix index overflow	2012-03-12 17:29:31 +01:00
Romain Neutron	82d9eeef7b	Coding standards	2012-03-09 12:49:13 +01:00
Ysolyne Gresille	92b7798ea6	graphic integration Oauth Pages (correction for devices)	2012-03-08 17:35:48 +01:00
Ysolyne Gresille	429a1bef9b	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 17:27:47 +01:00
Nicolas Le Goff	41f037511d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 16:20:47 +01:00
Nicolas Le Goff	4f70076d2b	fix #525 add image tooltip	2012-03-08 16:20:34 +01:00
Romain Neutron	f8d71a9bca	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 14:35:22 +01:00
Romain Neutron	9a0422d6bb	Fix locales	2012-03-08 14:34:28 +01:00
Nicolas Le Goff	e8237e2e7d	fix thumb title overflow in browser	2012-03-08 13:01:05 +01:00
Nicolas Le Goff	87495d0a1a	fix bridge z-index issue	2012-03-07 19:50:38 +01:00
Nicolas Le Goff	79bf8408dd	fix ie7 z-index	2012-03-07 19:01:11 +01:00
Nicolas Le Goff	45e0c7fd05	Fix IE7 Overflow	2012-03-07 18:48:28 +01:00
Nicolas Le Goff	ba0df0d633	fix ie7 toolbar css issue	2012-03-07 18:34:18 +01:00
Nicolas Le Goff	41df16f924	fix FrameC icon menu ie css issue	2012-03-07 17:07:50 +01:00
Ysolyne Gresille	d9a7d3398a	bugfix Oauth pages' visualisation on mobile	2012-03-07 15:18:56 +01:00
Nicolas Le Goff	0c631e1b24	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 10:57:22 +01:00
Nicolas Le Goff	884eb75f53	fix #516 Appliquer les droits dans Feedback: pb correspondance boutons / icônes	2012-03-07 10:57:13 +01:00
Romain Neutron	2091a6401a	Fix thesaurus search	2012-03-07 10:56:26 +01:00
Romain Neutron	1748ed42a0	Fix boulette	2012-03-06 18:57:15 +01:00
Romain Neutron	700eec5c28	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-06 18:55:55 +01:00
Nicolas Le Goff	cac45f65d3	enhance push front	2012-03-06 18:34:30 +01:00
Nicolas Le Goff	1445d624aa	fix unshare list	2012-03-06 17:45:28 +01:00
Nicolas Le Goff	c85e27f9b6	fix css push issue enhance css UserAdd template	2012-03-06 16:58:20 +01:00