jygaulier
|
3b2b72d681
|
fix #1553
|
2013-10-29 17:11:22 +01:00 |
|
Romain Neutron
|
910850396c
|
Move doctrine types to Phrasea namespace
|
2013-10-29 17:05:20 +01:00 |
|
Romain Neutron
|
18251456e4
|
Move doctrine proxies to Phrasea namespace
|
2013-10-29 17:00:32 +01:00 |
|
Romain Neutron
|
baecfdceb3
|
Move entities to Phrasea namespace
|
2013-10-29 16:56:49 +01:00 |
|
Romain Neutron
|
972ab94944
|
Add missing patch for orders
|
2013-10-29 12:31:35 +01:00 |
|
Romain Neutron
|
2dcbd2f985
|
Fix latest merge
|
2013-10-29 12:18:44 +01:00 |
|
Romain Neutron
|
09344f4703
|
Merge branch '3.8'
|
2013-10-29 10:32:10 +01:00 |
|
Romain Neutron
|
ebe4f00c6b
|
Fix doctrine transaction in lazaret patch
|
2013-10-28 23:20:42 +01:00 |
|
Romain Neutron
|
96ac795d8d
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/classes/Feed/Entry/Item.php
tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
|
2013-10-28 18:21:15 +01:00 |
|
Nicolas Le Goff
|
b45bc31135
|
Adress comments
|
2013-10-28 15:53:00 +01:00 |
|
Romain Neutron
|
0086a9d90f
|
Merge pull request #719 from nlegoff/fix_asset_plugin
[3.8] Register plugin_asset twig function
|
2013-10-28 05:42:35 -07:00 |
|
Romain Neutron
|
f12eae664f
|
Merge pull request #725 from romainneutron/fix-1545
[3.8] Sanitize XML data
|
2013-10-28 05:42:01 -07:00 |
|
Nicolas Le Goff
|
d5ff2f03e4
|
Rename ModelServiceProvider to ManipulatorServiceProvider
|
2013-10-28 12:57:05 +01:00 |
|
Nicolas Le Goff
|
9737a758d6
|
Remove user adapter interface
|
2013-10-28 12:57:05 +01:00 |
|
Nicolas Le Goff
|
23a5a1992e
|
Fix tests
|
2013-10-28 12:57:05 +01:00 |
|
Nicolas Le Goff
|
297f23dc06
|
Addressed romainneutron comments
|
2013-10-28 12:57:05 +01:00 |
|
Nicolas Le Goff
|
4eb7243120
|
Add UsrId property
|
2013-10-28 12:57:04 +01:00 |
|
Nicolas Le Goff
|
1f03451bfc
|
Add user manager & user manipulator
|
2013-10-28 12:57:04 +01:00 |
|
Romain Neutron
|
f4428d2ff4
|
Fix build
|
2013-10-28 12:45:16 +01:00 |
|
Nicolas Le Goff
|
c5c75ceb2f
|
Registe plugin_asset twig function
|
2013-10-28 12:44:29 +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
|
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 |
|
Nicolas Le Goff
|
92bc9c0d39
|
Ensure sorter index is removed
|
2013-10-25 16:59:27 +02: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 |
|