6605 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	3e9f628003	Fix #1549 : recognize IE11	2013-10-25 15:12:46 +02:00
Romain Neutron	f26a85fca5	Fix #1549 : Fix wording	2013-10-25 15:07:56 +02:00
Romain Neutron	6992bf3615	Fix ACL cache issue	2013-10-25 15:05:40 +02:00
Romain Neutron	e636d2ab32	Fix thumbnail access	2013-10-25 13:51:38 +02:00
Romain Neutron	cf2c07865c	Merge pull request #712 from romainneutron/master ... Merge 3.8 in master	2013-10-25 04:49:40 -07:00
Romain Neutron	fafe2dca0f	Fix latest merge	2013-10-25 13:47:35 +02:00
Romain Neutron	f20a65c8fb	Merge pull request #713 from nlegoff/homepage_ie_fix ... [3.8] Homepage ie fix	2013-10-25 03:08:49 -07:00
Nicolas Le Goff	65147550d4	Fix input colors in IE	2013-10-24 20:14:37 +02:00
Romain Neutron	762f758705	Merge branch '3.8' ... Conflicts: bower.json lib/Alchemy/Phrasea/Controller/Prod/Feed.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Item.php lib/classes/eventsmanager/notify/feed.php tests/classes/Feed/Entry/Feed_Entry_ItemTest.php	2013-10-24 14:05:04 +02:00
Romain Neutron	7850cf030c	Revert travis to use latest Indexer build	2013-10-24 12:30:34 +02:00
Romain Neutron	349e84d969	Temporary build with indexer version 3.10.2.3 to avoid failure	2013-10-23 21:29:26 +02:00
Romain Neutron	637c7a64c3	Fix composer dependencies	2013-10-23 18:41:57 +02:00
Romain Neutron	29258cafec	Merge pull request #711 from romainneutron/fix-1531 ... [3.8] Fix #1531 : Allow preview access on public feed entry items	2013-10-22 04:49:55 -07:00
Romain Neutron	3633c1a926	Fix #1531 : Allow preview access on public feed entry items	2013-10-22 12:44:14 +02:00
Romain Neutron	3ea4da0386	Merge pull request #708 from nlegoff/galleria ... [3.8] Enhance homepage customization	2013-10-22 03:11:08 -07:00
Romain Neutron	8ab538c70f	Merge pull request #710 from romainneutron/fix-1532 ... Fix #1532 : Add checkbox on feed creation to disable email notifications	2013-10-22 03:09:28 -07:00
Nicolas Le Goff	66facbabea	Add Bootstrap Carousel & Galleria as homepage presentation mode	2013-10-22 11:27:40 +02:00
Romain Neutron	22b2dddcf8	Fix #1532 : Add checkbox on feed creation to disable email notifications	2013-10-22 11:09:29 +02:00
Romain Neutron	a805c94524	Merge branch '3.8' ... Conflicts: composer.json composer.lock lib/classes/task/Scheduler.php	2013-10-21 19:05:37 +02:00
Romain Neutron	7bfe89a15e	Merge pull request #695 from jygaulier/3.8-fix1496 ... [WIP][3.8] fix #1496	2013-10-21 09:47:07 -07:00
Romain Neutron	2b0d68af1b	Merge pull request #707 from romainneutron/fix-1529 ... [3.8] Fix #1529 : Update to PHP-FFMpeg 0.4	2013-10-21 09:41:54 -07:00
Nicolas Le Goff	6e59e7aae6	Fix #1518 Can not edit tags in metadatas settings	2013-10-21 18:39:19 +02:00
Nicolas Le Goff	187aa620cf	Add login template variable to get last published items	2013-10-21 16:42:36 +02:00
Romain Neutron	1a6e1075cd	Fix #1529 : Update to PHP-FFMpeg 0.4	2013-10-21 14:45:37 +02:00
Romain Neutron	0c8c175ab5	Merge pull request #706 from nlegoff/fix_1497 ... [3.8] Fix #1497 Resizing images is not working on tablet in paysage mode	2013-10-18 08:32:04 -07:00
Nicolas Le Goff	f9cd105e51	Fix #1497 Resizing images is not working on tablet in paysage mode	2013-10-18 16:11:54 +02:00
Romain Neutron	42cb682dd5	Use custom repo for tcpdf	2013-10-18 15:55:39 +02:00
Romain Neutron	0fa375b9bc	Merge branch '3.8' ... Conflicts: composer.json composer.lock lib/classes/task/Scheduler.php	2013-10-18 15:01:47 +02:00
Romain Neutron	a0aa9cc97f	Merge pull request #703 from romainneutron/fix-1542 ... Update dependencies, revert Process to a windows working version	2013-10-18 01:34:19 -07:00
Romain Neutron	631772d998	Merge pull request #704 from romainneutron/fix-1540 ... Fix #1540 : Unable to start scheduler on Windows platform	2013-10-18 01:34:00 -07:00
Romain Neutron	922653deb4	Merge pull request #702 from romainneutron/fix-1537 ... Fix #1537 : SearchEngine collection filter does not work in classic	2013-10-17 04:59:15 -07:00
Romain Neutron	c28019adb4	Merge pull request #701 from romainneutron/fix-dependencies ... Update dependencies	2013-10-17 04:58:54 -07:00
Romain Neutron	2007a8b357	Merge pull request #699 from romainneutron/fix-1500 ... Fix feeds upgrade	2013-10-17 04:58:13 -07:00
Romain Neutron	29511251c7	Merge pull request #696 from romainneutron/orm-patches ... Fix ORM patches	2013-10-17 04:57:35 -07:00
Romain Neutron	f1db13cede	Fix #1540 : Unable to start scheduler on Windows platform	2013-10-17 13:55:58 +02:00
Romain Neutron	43ed2fb4ec	Update dependencies, revert Process to a windows working version	2013-10-17 12:02:15 +02:00
Romain Neutron	51b0ca05df	Fix #1537 : SearchEngine collection filter does not work in classic	2013-10-17 11:58:38 +02:00
Romain Neutron	5d56a36bee	Update dependencies	2013-10-17 11:50:18 +02:00
Romain Neutron	c2cf4d51ca	Merge pull request #700 from nlegoff/fix1539 ... [3.8] Fix #1539 Cooliris is not displayed	2013-10-16 10:12:59 -07:00
Nicolas Le Goff	af2fdc1eac	Fix1539	2013-10-16 19:09:20 +02:00
Romain Neutron	1b6dd391f8	Fix feeds upgrade	2013-10-16 10:36:59 +02:00
Romain Neutron	f7dfe893b4	Merge branch '3.8' ... Conflicts: bower.json	2013-10-15 19:11:39 +02:00
Romain Neutron	cc75ef5ac6	Merge pull request #698 from nlegoff/fix_login_css ... [3.8] Enhance CSS for homepage customization	2013-10-15 09:57:06 -07:00
Romain Neutron	3e03343825	Merge pull request #692 from nlegoff/fix1522 ... [3.8] Fix #1522 issue with jquery ui & multiselect plugin in report	2013-10-15 09:56:40 -07:00
Nicolas Le Goff	1d04c418cd	Remove jquery multiselect plugin	2013-10-15 15:06:52 +02:00
Nicolas Le Goff	358ef398a5	Enhance login css	2013-10-15 15:02:02 +02:00
Romain Neutron	989c1b80e8	Merge pull request #689 from romainneutron/fix-1528 ... [3.8] Fix #1528 : Allow collection order only on available collections	2013-10-15 05:57:36 -07:00
Romain Neutron	e5989c70b0	Update changelog	2013-10-15 14:56:55 +02:00
Romain Neutron	7618106667	Fix ORM patches	2013-10-15 14:38:17 +02:00
Romain Neutron	92fe657e80	Fix #1528 : Restrict collection ordering on available collections	2013-10-15 14:14:44 +02:00