Florian BLOUET
|
0e97e4a0ae
|
moved skins/icon to assets/common/images/icons
|
2015-12-02 17:35:37 +01:00 |
|
Nicolas Le Goff
|
ed3ffb59a6
|
Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer
Conflicts:
bin/console
bower.json
composer.json
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Border/Manager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/classes/caption/field.php
lib/classes/record/Interface.php
templates/web/prod/index.html.twig
www/skins/prod/000000/prodcolor.css
|
2015-03-10 14:36:31 +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 |
|
Nicolas Le Goff
|
111755fa9b
|
Refactor status display
|
2015-02-19 15:14:23 +01:00 |
|
Nicolas Le Goff
|
948971eba4
|
PHRAS-408 #fix
|
2015-02-11 19:47:48 +01:00 |
|
Romain Neutron
|
e9e9d149a1
|
Locale simplification
|
2013-12-03 20:05:20 +01:00 |
|
Romain Neutron
|
e7421e1fdd
|
Fix twig tags
|
2013-12-03 20:02:39 +01:00 |
|
Romain Neutron
|
906d4ba9c5
|
Localize status bits
|
2013-06-14 09:47:54 +02:00 |
|
Romain Neutron
|
1a13d02c2a
|
Remove status bit name, use only labels
|
2013-06-14 09:47:53 +02:00 |
|
Romain Neutron
|
4161ef2e31
|
Use url generator everywhere
|
2013-06-13 09:44:16 +02:00 |
|
Romain Neutron
|
133595635c
|
[SearchEngine] Finalize search engine refactor
|
2013-01-17 11:43:36 +01:00 |
|
Nicolas Le Goff
|
ed946cc026
|
cleanup & refactor
|
2012-09-03 18:09:01 +02:00 |
|
Nicolas Le Goff
|
db40a0bf7c
|
fix some bugs
|
2012-09-03 18:09:01 +02:00 |
|
Nicolas Le Goff
|
aeb14dcf15
|
remove response->send
fix testes
fix testes
fix tests
fix tests
fix paths
|
2012-09-03 18:08:59 +02:00 |
|
Nicolas Le Goff
|
d95795c02f
|
add /admin/statusbit/ & /admin/structure/
|
2012-09-03 18:08:55 +02:00 |
|