Romain Neutron
|
2c9cee15a4
|
Update to symfony 2.4.0
|
2013-12-03 20:02:23 +01:00 |
|
Romain Neutron
|
4a7304435b
|
Fix tests
|
2013-12-03 19:41:25 +01:00 |
|
Romain Neutron
|
f519d3e8b8
|
Fix route generation parameters
|
2013-12-03 19:41:25 +01:00 |
|
Romain Neutron
|
e197609a2f
|
Update symfony 2.4 to latest commit
|
2013-12-03 19:41:25 +01:00 |
|
Romain Neutron
|
0bcbdd08ec
|
Merge pull request #821 from nlegoff/remove_json3
[3.9] Remove json3 dependency
|
2013-12-03 08:56:45 -08:00 |
|
Nicolas Le Goff
|
f0edc0c27e
|
Remove json3 dependency
|
2013-12-02 18:59:18 +01:00 |
|
Romain Neutron
|
4f31cfeefc
|
Merge branch '3.8'
Conflicts:
bower.json
templates/web/common/index_bootstrap.html.twig
templates/web/common/menubar.html.twig
templates/web/login/layout/base-layout.html.twig
templates/web/prod/Baskets/Reorder.html.twig
|
2013-12-02 18:17:38 +01:00 |
|
Romain Neutron
|
845a53f545
|
Merge pull request #807 from nlegoff/usersettingservice
[3.9] Add settings service
|
2013-12-02 09:04:28 -08:00 |
|
Nicolas Le Goff
|
af94345f6c
|
Update User entity
|
2013-11-28 18:00:05 +01:00 |
|
Romain Neutron
|
7285717b80
|
Merge pull request #815 from nlegoff/menubar
[3.8] Add block to override menu bar title
|
2013-11-28 07:15:09 -08:00 |
|
Romain Neutron
|
18f63b4ce7
|
Merge pull request #817 from nlegoff/technical_data
[3.8] Wrap technical data into blocks
|
2013-11-28 05:07:45 -08:00 |
|
Romain Neutron
|
e7eb81dd0c
|
Merge pull request #814 from romainneutron/fix-1595
[3.8] Fix #1595 : Export document with its title returns a document named with its filename
|
2013-11-28 05:06:39 -08:00 |
|
Romain Neutron
|
c92ae5c49a
|
Merge pull request #813 from romainneutron/fix-1593
[3.8] Fix #1593 : "download" query parameter is not working anymore on permalink URIs
|
2013-11-28 05:06:16 -08:00 |
|
Romain Neutron
|
a518b7cc68
|
Merge pull request #812 from romainneutron/fix-1596
[3.8] Fix #1596 : Add datepicker input placeholder
|
2013-11-28 05:05:46 -08:00 |
|
Romain Neutron
|
18bfcd5ce8
|
Merge pull request #811 from nlegoff/fix1588
[3.8] Fix #1588 Error 400 when send email test
|
2013-11-28 05:03:57 -08:00 |
|
Nicolas Le Goff
|
7bbf00ff4b
|
Wrap technical data into blocks
|
2013-11-28 13:29:25 +01:00 |
|
Nicolas Le Goff
|
e2fcd816cc
|
Add block to override menu bar title
|
2013-11-28 12:38:24 +01:00 |
|
Romain Neutron
|
479daa5106
|
Merge pull request #809 from nlegoff/fix1600
[3.8] Fix #1600 Can not save a deleted field in admin field app
|
2013-11-28 03:15:16 -08:00 |
|
Romain Neutron
|
d1973bdc06
|
Fix #1595 : Export document with its title returns a document named with its filename
|
2013-11-28 11:56:40 +01:00 |
|
Romain Neutron
|
94d547d897
|
Fix #1593 : "download" query parameter is not working anymore on permalink URIs
|
2013-11-28 11:49:19 +01:00 |
|
Romain Neutron
|
deb5e7ea75
|
Fix #1596 : Add datepicker input placeholder
|
2013-11-28 11:29:04 +01:00 |
|
Nicolas Le Goff
|
7384a376b6
|
Fix #1588 Error 400 when send email test
|
2013-11-28 11:24:08 +01:00 |
|
Nicolas Le Goff
|
afde85140f
|
Fix #1600 Can not save a deleted field in admin field app
|
2013-11-28 11:08:42 +01:00 |
|
Romain Neutron
|
5504f9013a
|
Merge pull request #805 from nlegoff/fix1584
[3.8] Fix #1584 Unable to order medias
|
2013-11-27 03:12:47 -08:00 |
|
Nicolas Le Goff
|
52a8d9672c
|
Fix #1584 Unable to order medias
Conflicts:
templates/web/prod/Baskets/Reorder.html.twig
|
2013-11-27 12:09:55 +01:00 |
|
Nicolas Le Goff
|
0e69cd1bd4
|
Add DisplaySetting service
|
2013-11-27 12:01:25 +01:00 |
|
Romain Neutron
|
ef83ffa355
|
Merge pull request #806 from nlegoff/fix1590
[3.8] Fix #1590 IE popup Error message
|
2013-11-26 09:21:28 -08:00 |
|
Nicolas Le Goff
|
86b4e83054
|
Fix #1590 IE popup Error message: "A script on this page is causing Internet Explorer to run slowly"
|
2013-11-26 14:42:08 +01:00 |
|
Romain Neutron
|
e8dd0dfbfa
|
Merge pull request #802 from nlegoff/remove_fixtures
[3.9] Remove doctrine fixtures dependency
|
2013-11-22 08:10:39 -08:00 |
|
Nicolas Le Goff
|
640a8ee314
|
Fix tests
|
2013-11-22 15:14:40 +01:00 |
|
Nicolas Le Goff
|
e21d9c1a1d
|
Update cpsr.lock
|
2013-11-22 15:14:40 +01:00 |
|
Nicolas Le Goff
|
b751d0ef3e
|
Remove DoctrineFixtures mechanism
|
2013-11-22 15:14:40 +01:00 |
|
Romain Neutron
|
4890832822
|
Merge pull request #803 from nlegoff/update_namespace
[3.9] Remove obsolete namespaces in composer.json
|
2013-11-22 05:52:28 -08:00 |
|
Romain Neutron
|
512217d784
|
Merge pull request #804 from romainneutron/url-generator-trait
[3.9] Add UrlGenerator trait
|
2013-11-22 05:51:54 -08:00 |
|
Nicolas Le Goff
|
48c9932367
|
Remove obsolete namespaces
|
2013-11-22 11:24:26 +01:00 |
|
Romain Neutron
|
79dfa946d9
|
Add UrlGenerator trait
|
2013-11-22 09:32:21 +01:00 |
|
Romain Neutron
|
15fbe40b6e
|
Merge pull request #794 from nlegoff/fix1562
Fix #1562 Migration Error
|
2013-11-22 00:20:29 -08:00 |
|
Romain Neutron
|
9c7ef7b882
|
Merge branch '3.8'
|
2013-11-21 10:38:52 +01:00 |
|
Romain Neutron
|
b98c321c0c
|
Add memcached to travis services
|
2013-11-21 07:37:53 +01:00 |
|
Romain Neutron
|
058d47c967
|
Add memcached to travis services
|
2013-11-20 20:00:52 +01:00 |
|
Romain Neutron
|
ddaca15070
|
Merge pull request #799 from romainneutron/code-comments
[3.9] Remove commented code
|
2013-11-20 10:05:22 -08:00 |
|
Romain Neutron
|
d5624ab389
|
Merge pull request #800 from romainneutron/remove-license-comments
[3.9] Fix license comments
|
2013-11-20 10:04:50 -08:00 |
|
Romain Neutron
|
6ab51d55f8
|
Add missing headers
|
2013-11-20 19:03:55 +01:00 |
|
Romain Neutron
|
051d9f4035
|
Remove license comments
|
2013-11-20 16:49:29 +01:00 |
|
Romain Neutron
|
142b02799c
|
Merge branch '3.8'
|
2013-11-20 16:05:55 +01:00 |
|
Romain Neutron
|
0dde2f1388
|
Image should not be executables
|
2013-11-20 16:05:46 +01:00 |
|
Romain Neutron
|
cae61dfe1e
|
Remove commented code
|
2013-11-20 16:04:20 +01:00 |
|
Nicolas Le Goff
|
fba6b2500f
|
Fix #1562 MigrationError
|
2013-11-20 15:58:32 +01:00 |
|
Romain Neutron
|
8663f49228
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Core/Version.php
|
2013-11-20 15:53:50 +01:00 |
|
Romain Neutron
|
3b7e0c9a30
|
Bump to version 3.8.3-alpha.0
|
2013-11-20 15:51:13 +01:00 |
|