Benoît Burnichon
|
93fd4bda03
|
Add orderable status in admin forms
|
2016-02-24 17:23:06 +01:00 |
|
Nicolas Le Goff
|
5b3e699599
|
Merge remote-tracking branch 'upstream/3.8'
Conflicts:
bower.json
composer.lock
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/User/Query.php
lib/classes/patch/320alpha4b.php
templates/web/admin/statusbit.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/lazaret.html.twig
templates/web/prod/upload/upload-flash.html.twig
www/scripts/apps/login/home/config.js
www/skins/prod/000000/prodcolor.css
www/skins/prod/959595/prodcolor.css
|
2015-02-23 19:16:56 +01:00 |
|
Jean-Yves Gaulier
|
41cd9c3f17
|
#PHRAS-325
add parameter "adapt" to route "/embed/substitute"
fix : substituted was indicated only for thumbnails on prod/tools/recreate
|
2015-02-18 18:12:11 +01:00 |
|
Romain Neutron
|
354232f61a
|
Bump copyright year
|
2014-01-06 15:40:56 +01:00 |
|
Romain Neutron
|
6ab51d55f8
|
Add missing headers
|
2013-11-20 19:03:55 +01:00 |
|
Romain Neutron
|
2069d40544
|
Use composer as application autoloader
|
2013-01-18 17:47:25 +01:00 |
|