Nicolas Le Goff
|
1f03451bfc
|
Add user manager & user manipulator
|
2013-10-28 12:57:04 +01:00 |
|
Romain Neutron
|
18d1667598
|
Sanitize XML data
|
2013-10-28 12:36:39 +01:00 |
|
Romain Neutron
|
aa95bfdba2
|
Merge pull request #715 from romainneutron/fix-1550
[3.8] Fix #1550 : Remove feed entry items that are not related to a record
|
2013-10-25 10:05:09 -07:00 |
|
Romain Neutron
|
da60ce8a40
|
Merge pull request #724 from nlegoff/remove_index_sorter
[3.8] Ensure sorter index is removed
|
2013-10-25 10:01:14 -07: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
|
ffb9ac73d0
|
Fix #1550 : Remove feed entry items that are not related to a record
|
2013-10-25 17:58:27 +02: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 |
|
Nicolas Le Goff
|
92bc9c0d39
|
Ensure sorter index is removed
|
2013-10-25 16:59:27 +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
|
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
|
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
|
eb6eb689e0
|
Fix #1535 : API does not display search engine suggestions correctly
|
2013-10-10 18:00:09 +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
|
e87aa5afb3
|
Fix #1524 : API search query is discarded with GET method
|
2013-10-10 13:39:59 +02:00 |
|
Romain Neutron
|
5996e590bc
|
Reset exiftool writer before writing
|
2013-10-09 12:18:16 +02:00 |
|
Romain Neutron
|
097e1f21ae
|
Remove calls to dropped orders table
|
2013-10-07 18:36:52 +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 |
|
Romain Neutron
|
1dfbff5666
|
Merge branch '3.8'
Conflicts:
CHANGELOG.md
bin/developer
lib/classes/module/console/systemUpgrade.php
www/skins/report/jquery-ui.css
|
2013-10-03 15:29:22 +02:00 |
|
Romain Neutron
|
642a1a5657
|
Fix CS
|
2013-10-03 15:24:15 +02:00 |
|
Romain Neutron
|
1b9a90d635
|
Fix office plugin class name
|
2013-10-03 15:24:15 +02:00 |
|
Romain Neutron
|
d4c2e5959e
|
Fix #1491 : Fix cache serialization in case of controlled vocabulary
|
2013-10-03 15:24:15 +02:00 |
|
Romain Neutron
|
0a86cb635e
|
Merge pull request #671 from nlegoff/fix1499
[3.8] Fix #1499 Increase default task memory overflow
|
2013-10-03 06:18:02 -07:00 |
|
Romain Neutron
|
1df6296c8b
|
Merge pull request #673 from romainneutron/fix-1489
[3.8] Fix 1489 Let errors happen when they occur
|
2013-10-03 06:17:42 -07:00 |
|
Nicolas Le Goff
|
b66da8861a
|
Fix #1499 Increase default task memory overflow
|
2013-10-03 14:29:27 +02:00 |
|
Romain Neutron
|
abae32ca5f
|
Fix #1489 : Let errors happen when they occur
|
2013-10-02 18:30:48 +02:00 |
|
Nicolas Le Goff
|
d7c720ed7d
|
Fix #1501 increase usr_login column size
|
2013-10-02 17:33:26 +02:00 |
|
Romain Neutron
|
2651d16d20
|
Merge pull request #664 from nlegoff/fix_1343
[3.8] Fix #1343 Display default name if label is empty
|
2013-10-01 02:48:09 -07:00 |
|
Romain Neutron
|
eb590780ca
|
Fix CS
|
2013-09-30 18:26:32 +02:00 |
|