2632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	b75205a807	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-03-09 11:54:20 +01:00
Romain Neutron	41ee30fc8b	Bump to version 3.5.13 3.5.13	2012-03-09 11:54:00 +01:00
Romain Neutron	81e7b2c082	Bump to version 3.6.0.0RC1 3.6.0.0RC1	2012-03-09 11:52:30 +01:00
Romain Neutron	e3429ec5f6	Update proposition	2012-03-09 11:50:23 +01:00
Romain Neutron	394a40f01e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-09 00:33:43 +01:00
Romain Neutron	2c5fab4da7	Fix presentation	2012-03-09 00:32:53 +01:00
Romain Neutron	1f3ad530ae	Remove unwanted hydration	2012-03-08 19:07:04 +01:00
Ysolyne Gresille	e559ca6520	Add DS_Store to gitignore	2012-03-08 17:42:04 +01:00
Ysolyne Gresille	0e838def33	Fix Oauth2	2012-03-08 17:40:28 +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	fb060cd8cf	Fix insert coll	2012-03-08 16:16:53 +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	68f3acfd9f	Fix locales	2012-03-08 14:34:58 +01:00
Romain Neutron	9a0422d6bb	Fix locales	2012-03-08 14:34:28 +01:00
Romain Neutron	d7aacd7eef	Fix locales	2012-03-08 14:34:11 +01:00
Ysolyne Gresille	08c48e633d	CSS Oauth pages corrected	2012-03-08 13:23:22 +01:00
Nicolas Le Goff	e8237e2e7d	fix thumb title overflow in browser	2012-03-08 13:01:05 +01:00
Nicolas Le Goff	34708b27d5	add /records/caption/ api route test	2012-03-08 12:52:26 +01:00
Nicolas Le Goff	09ac5372aa	fix patch PDOException issue	2012-03-08 12:47:44 +01:00
Nicolas Le Goff	fe01a6574f	add /records/caption/ route to API	2012-03-08 12:17:03 +01:00
Nicolas Le Goff	d18489c30e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 11:33:53 +01:00
Nicolas Le Goff	7b89c0204f	fix #518 Creation de reportage avec ajout de la selection courante n'est pas pris en compte.	2012-03-08 11:33:44 +01:00
Romain Neutron	cf629822d0	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 11:28:55 +01:00
Romain Neutron	e2def9fbc7	Upgrade locales	2012-03-08 11:27:35 +01:00
Romain Neutron	547db9d883	Upgrade locales	2012-03-08 11:27:12 +01:00
Romain Neutron	b90804fd17	Upgrade locales	2012-03-08 11:26:09 +01:00
Nicolas Le Goff	88e3b5242a	fix bridge load containers	2012-03-08 11:12:06 +01:00
Nicolas Le Goff	87495d0a1a	fix bridge z-index issue	2012-03-07 19:50:38 +01:00
Nicolas Le Goff	98bac7c8e7	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 19:01:32 +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
Romain Neutron	02d1bb867b	Add default charset table	2012-03-07 18:23:15 +01:00
Romain Neutron	166e2fc248	Add lazy load to caption fields	2012-03-07 18:22:30 +01:00
Romain Neutron	78fd25cb78	Fix command message	2012-03-07 18:22:14 +01:00
Romain Neutron	f7cf4848e6	Update vendors	2012-03-07 18:21:22 +01:00
Nicolas Le Goff	41df16f924	fix FrameC icon menu ie css issue	2012-03-07 17:07:50 +01:00
Romain Neutron	3f89deb153	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 16:01:20 +01:00
Romain Neutron	0fb0d3add2	Disable sphinxql magic	2012-03-07 16:00:59 +01:00
Romain Neutron	63a880d333	Convert "truncate" to delete from because it fails when there are foreign keys	2012-03-07 16:00:41 +01:00
Nicolas Le Goff	18610410b3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 15:59:05 +01:00
Nicolas Le Goff	77bd5fd263	fix IE css alignment issue on prod toolbar button	2012-03-07 15:58:52 +01:00
Ysolyne Gresille	d9a7d3398a	bugfix Oauth pages' visualisation on mobile	2012-03-07 15:18:56 +01:00
Romain Neutron	948e6a3fc1	Fix installer	2012-03-07 15:15:38 +01:00
Nicolas Le Goff	d7d52275c0	use finder component to retrieve css and fix namespace issue	2012-03-07 11:58:59 +01:00
Romain Neutron	c2a9ee7542	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 11:46:11 +01:00
Romain Neutron	d02b04ece6	Fix update sphinx	2012-03-07 11:46:01 +01:00