385 Commits

Author	SHA1	Message	Date
Romain Neutron	0d3aaf362d	Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet	2013-09-12 13:53:56 +02:00
Nicolas Le Goff	ed514432ca	Fix translation issues	2013-09-05 14:29:42 +02:00
Andrey	289c0294b2	Rebased, fixed minor bugs	2013-09-05 13:44:04 +02:00
Andrey	84300f3c92	Replaced remaining occurrences of Feed_ classes, updated tests	2013-09-05 13:44:04 +02:00
Andrey	affdfe7a0a	Implement RSSFeeds, fixed controllers implementation, fixed tests	2013-09-05 13:44:02 +02:00
Andrey	f117817e87	Implementation of doctrine entities	2013-09-05 13:43:04 +02:00
Romain Neutron	6974ca5fb9	Merge pull request #625 from nlegoff/fix_1445 ... [3.8] Fix #1445 Move record dialog improvement	2013-09-05 04:04:43 -07:00
Nicolas Le Goff	611b2ddab0	Fix #1444 Select size	2013-09-05 12:14:06 +02:00
Nicolas Le Goff	ce55141917	Fix #1445 Wording & issue while moving record from collections	2013-09-05 12:04:18 +02:00
Romain Neutron	44126841bc	Remove deprecated "on" / "off" default values	2013-07-18 19:06:49 +02:00
Romain Neutron	9032fbaed1	Update strings	2013-07-18 18:49:22 +02:00
jygaulier	56c884c852	add message if no doc editable	2013-07-18 15:28:57 +02:00
jygaulier	bf66cef3aa	"name" des sb supprimés au profit des labels traduits	2013-07-18 14:46:39 +02:00
Nicolas Le Goff	401a33ca65	Fix #1280 Css issue manager list	2013-07-12 19:28:13 +02:00
Romain Neutron	f444d4ed97	Merge pull request #491 from romainneutron/fix-1300 ... [3.8] Fix 1300	2013-07-11 09:46:22 -07:00
Romain Neutron	6e0702c9f1	Merge pull request #490 from romainneutron/fix-1279 ... [3.8] Fix #1279 : Fix "share a list" template	2013-07-11 08:49:11 -07:00
Romain Neutron	867be69b74	Fix #1300 : Story editing does not work	2013-07-11 16:17:49 +02:00
Romain Neutron	0e5b1d62a1	Fix #1279 : Fix "share a list" template	2013-07-11 15:33:37 +02:00
Romain Neutron	4e5591bb66	Fix #1298 : Preview tooltip URL has a double trailing slash	2013-07-11 12:49:41 +02:00
Nicolas Le Goff	ac6b3e439a	Fix #1218 & 1219 Enhance sharing window	2013-06-28 17:15:48 +02:00
Nicolas Le Goff	90bc96b72a	Fix tooltip + enhancement ... Adressed PR's comment Fix CSS issue	2013-06-24 15:50:59 +02:00
Nicolas Le Goff	764fa42f14	Update to jquery ui 1.10.3 ... Fix conflict & ui bugs Remove debug	2013-06-21 13:46:16 +02:00
Romain Neutron	ca519612c6	Merge pull request #415 from romainneutron/locale ... [3.8] Update locales	2013-06-18 06:33:20 -07:00
Romain Neutron	4fb39ff503	Update locales	2013-06-17 23:33:01 +02:00
Romain Neutron	241705a568	Merge pull request #399 from romainneutron/ip-proxies ... [3.8] Add trusted proxies configuration	2013-06-17 10:28:49 -07:00
Nicolas Le Goff	7c226e3349	Fix typo	2013-06-17 17:25:42 +02:00
Romain Neutron	42db38d055	Add error pages, fix error handling and PHP conf	2013-06-17 17:01:35 +02:00
Romain Neutron	906d4ba9c5	Localize status bits	2013-06-14 09:47:54 +02:00
Romain Neutron	f9b4978569	Merge pull request #390 from romainneutron/databox-labels ... [3.8] Add labels to databoxes	2013-06-13 07:41:05 -07:00
Romain Neutron	11a55bbd43	Add labels to databoxes	2013-06-13 09:45:43 +02:00
Romain Neutron	4161ef2e31	Use url generator everywhere	2013-06-13 09:44:16 +02:00
Romain Neutron	c084f20f85	Labelize collections	2013-06-01 01:29:07 +02:00
Romain Neutron	769f319638	Update templates to display databox fields labels	2013-05-30 18:12:31 +02:00
Romain Neutron	d2bc4f4a23	Add AuthenticationServiceProvider	2013-05-29 14:22:50 +02:00
Romain Neutron	77817d177f	Merge branch '3.7'	2013-03-22 15:07:12 +01:00
Nicolas Le Goff	e57bf3186e	Aspect ratio corrective	2013-03-22 15:03:01 +01:00
Nicolas Le Goff	02e5e2c216	Subsitution cleanup && test enhancement	2013-03-22 15:03:00 +01:00
Nicolas Le Goff	93aa9be0fa	Fix sub views substitution	2013-03-22 15:03:00 +01:00
Romain Neutron	370d603741	Merge branch '3.7'	2013-03-22 15:01:00 +01:00
Romain Neutron	84be237256	Merge pull request #322 from nlegoff/fix_1111 ... [3.7] Fix #1111 sub views substitution is broken	2013-03-21 11:42:56 -07:00
Nicolas Le Goff	3bcf24b611	Subsitution cleanup && test enhancement	2013-03-21 17:10:46 +01:00
Nicolas Le Goff	915749c224	Fix sub views substitution	2013-03-21 16:06:06 +01:00
Nicolas Le Goff	3dc3caf137	Remove ratio = 1 as default	2013-03-21 12:46:00 +01:00
Nicolas Le Goff	1a0753ea8f	Fix #1041 Keep video aspect ratio when extracting thumbnail using canva	2013-03-20 20:09:06 +01:00
Romain Neutron	dff686c87d	Merge branch '3.7'	2013-01-09 11:25:14 +01:00
Nicolas Le Goff	29405615be	Fix #1045 Bridge, ajout d'une application suplémentaire (ex:youtube) n'est pas possible des lors que l'on a envoyé une vidéo sur une application existante	2013-01-02 13:55:55 +01:00
Nicolas Le Goff	64eb27ffc2	Fix issue with dailymotion container	2013-01-02 13:55:55 +01:00
Romain Neutron	527b68e0f5	Merge with 3.7	2012-11-07 16:16:13 +01:00
Nicolas Le Goff	007518f225	Fix CS & escape javascript ouptut	2012-11-06 15:46:05 +01:00
Nicolas Le Goff	b02c8d7ebb	Fix #956 Bridge Apis account are now deletable	2012-11-06 15:00:26 +01:00