3848 Commits

Author	SHA1	Message	Date
Romain Neutron	f4428d2ff4	Fix build	2013-10-28 12:45:16 +01:00
Romain Neutron	212b09afa2	Merge branch '3.8' ... Conflicts: lib/Alchemy/Phrasea/Controller/Permalink.php	2013-10-25 18:50:15 +02:00
Romain Neutron	35e9e692d2	Fix ACL cache issue	2013-10-25 18:47:26 +02:00
Romain Neutron	6a53038803	Merge pull request #721 from romainneutron/fix-1544 ... [3.8] Fix #1544 : Upgrade data command fails	2013-10-25 08:44:16 -07:00
Romain Neutron	5e6399a501	Merge pull request #718 from romainneutron/fix-1547 ... [3.8] Fix #1549 : recognize IE11	2013-10-25 08:36:51 -07:00
Romain Neutron	07a6cf56ba	Merge pull request #717 from romainneutron/fix-1549 ... [3.8] Fix #1549 : Fix wording	2013-10-25 08:36:37 -07:00
Romain Neutron	8b510031a0	Fix #1544 : Upgrade data command fails	2013-10-25 16:02:53 +02:00
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	e636d2ab32	Fix thumbnail access	2013-10-25 13:51:38 +02:00
Romain Neutron	fafe2dca0f	Fix latest merge	2013-10-25 13:47:35 +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	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
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
Nicolas Le Goff	187aa620cf	Add login template variable to get last published items	2013-10-21 16:42:36 +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	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	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	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
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	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
Romain Neutron	b7d8f777fd	Merge pull request #694 from romainneutron/fix-1535 ... [3.8] Fix #1535 : API does not display search engine suggestions correctly	2013-10-15 04:05:30 -07:00
jygaulier	f32d561c98	fix #1496	2013-10-14 16:58:32 +02:00
Romain Neutron	1551d03f95	Merge pull request #686 from romainneutron/fix-1527 ... [3.8] Fix #1527 : Wrong offset for classic query result	2013-10-10 09:09:43 -07:00
Romain Neutron	eca23ce8c1	Merge pull request #688 from romainneutron/fix-1520 ... [3.8] Fix #1520 : Avoid fatal error while editing from multiple databoxes	2013-10-10 09:03:04 -07:00
Romain Neutron	32005914e2	Merge pull request #687 from romainneutron/fix-1524 ... [3.8] Fix #1524 : API search query is discarded with GET method	2013-10-10 09:02:42 -07:00
Romain Neutron	eb6eb689e0	Fix #1535 : API does not display search engine suggestions correctly	2013-10-10 18:00:09 +02:00
Nicolas Le Goff	d4b7280c81	Fix #1522 Issue with jquery ui tabs & multiselect	2013-10-10 16:20:20 +02:00
Romain Neutron	7e8a34c599	Merge branch '3.8' ... Conflicts: bin/developer build-env.sh composer.json composer.lock	2013-10-10 13:42:42 +02:00
Romain Neutron	9e916a8fcc	Fix #1527 : Wrong offset for classic query result	2013-10-10 13:40:10 +02:00
Romain Neutron	e87aa5afb3	Fix #1524 : API search query is discarded with GET method	2013-10-10 13:39:59 +02:00
Romain Neutron	5538a6924c	Fix #1520 : Avoid fatal error while editing from multiple databoxes	2013-10-10 13:39:47 +02:00
Romain Neutron	f648ea296f	Fix #1488 : Push / Feedback name is now mandatory	2013-10-10 13:39:07 +02:00
Romain Neutron	5996e590bc	Reset exiftool writer before writing	2013-10-09 12:18:16 +02:00
Romain Neutron	41306fec74	Update defautl configurations	2013-10-09 12:16:43 +02:00
Romain Neutron	097e1f21ae	Remove calls to dropped orders table	2013-10-07 18:36:52 +02:00
Nicolas Le Goff	2b7ecdd0a0	Add Phraseanet namespace for twig templates	2013-10-07 14:26:50 +02:00
Romain Neutron	6345fcc83a	Add uninstaller for development purposes	2013-10-07 10:08:11 +02:00
Romain Neutron	0a950b0ae6	Add uninstaller for development purposes	2013-10-04 17:29:13 +02:00
Romain Neutron	d716e91169	Merge branch '3.8' ... Conflicts: composer.lock	2013-10-04 15:15:04 +02:00
Nicolas Le Goff	9fc8fbc194	Fix API password grant type authentication	2013-10-03 17:12:46 +02:00
Romain Neutron	5ceaa35717	Fix latest merge	2013-10-03 16:41:59 +02:00