Xavier Rousset
dc44ddb59b
Add colors on prompt
2019-06-12 15:47:37 +02:00
Xavier Rousset
b58f09de8d
Update wording and switch questions
2019-06-12 15:10:27 +02:00
Xavier Rousset
2441731b94
Update README
2019-06-11 17:25:39 +02:00
Xavier Rousset
b8efa93e39
PHRAS-2565 Update vars for PHP7-2 build, check of another builds in progress
2019-06-11 16:49:26 +02:00
Xavier Rousset
1fca66d326
PHRAS-2565 Add prompt to configure the build (triggered with --provision flag)
2019-06-11 16:44:39 +02:00
Nicolas Maillat
f05b8d2a47
Merge pull request #3070 from AlexandreBrach/PHRDPL-36_scheduler_startup
...
PHRDPL-36 #comment merge of remove supervisord & configure vars at startup
2019-06-07 17:32:45 +02:00
Alexandre BRACH
040172b509
PHRDPL-36 #comment remove supervisord & configure vars at startup
2019-06-07 17:05:32 +02:00
Nicolas Maillat
501a60e604
Merge pull request #3067 from HRavalomanana/PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font
...
PHRAS-2419 #comment merge Port to 4.1 - Prod - Answer grid - Refacto-Icons actions under Thumbnail
2019-06-07 15:42:48 +02:00
Nicolas Maillat
2f6eb6b02e
Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font
2019-06-07 15:29:51 +02:00
Nicolas Maillat
c06acf21ee
Update main.scss
2019-06-07 15:28:14 +02:00
Nicolas Maillat
449aa93762
Merge pull request #3064 from HRavalomanana/PHRAS-2386-Feedback_result_display
...
PHRAS-2386 #comment merge of feedback result display
2019-06-07 15:10:59 +02:00
Nicolas Maillat
4c25a9939d
Merge branch 'master' into PHRAS-2386-Feedback_result_display
2019-06-07 15:09:06 +02:00
Nicolas Maillat
7dd6028db4
Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font
2019-06-07 14:12:15 +02:00
Nicolas Maillat
cfaff0af2e
Merge pull request #3069 from alchemy-fr/PHRAS-2660_add_rabbitmq_conf
...
PHRAS-2660 #comment add Rabbitmq conf.d/configuration.yml
2019-06-07 14:11:46 +02:00
Nicolas Maillat
e0ccc16fcf
PHRAS-2660 #comment add rabbitmq config
2019-06-07 13:47:04 +02:00
Nicolas Maillat
19ed60b8e4
Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font
2019-06-07 09:35:00 +02:00
Nicolas Maillat
054e420c5b
Merge pull request #3068 from AlexandreBrach/PHRDPL-60_auto-install
...
PHRDPL-60 #comment merge Check the INSTALL_* env vars for auto installation
2019-06-06 22:47:02 +02:00
Alexandre BRACH
abf9b821d9
PHRDPL-60 #comment Check the INSTALL_* env vars for auto installation
2019-06-06 18:32:43 +02:00
Harrys Ravalomanana
300c413848
PHRAS-2419 #comment add icomoon #time 5h
2019-06-06 18:21:57 +04:00
Nicolas Maillat
a81eca2962
Merge pull request #3066 from AlexandreBrach/PHRDPL-32_fix
...
PHRDPL-32 #comment fix max upload
2019-06-06 14:17:57 +02:00
Alexandre BRACH
cb198fb52f
fix max upload
2019-06-06 14:11:54 +02:00
Nicolas Maillat
c9841d9320
Merge pull request #3065 from alchemy-fr/PHRDPL-32_add_gettext
...
PHRDPL-32 #comment merge add gettext
2019-06-06 13:03:43 +02:00
Nicolas Maillat
1363d082e6
PHRDPL-32 #comment add gettext
2019-06-06 12:11:25 +02:00
Nicolas Maillat
70cbee6b76
Merge branch 'master' into PHRAS-2386-Feedback_result_display
2019-06-04 17:26:01 +02:00
Harrys Ravalomanana
cd62c6524b
PHRAS-2617 #comment Port41 of PHRAS-2341 #time 1h
2019-06-04 18:30:27 +04:00
Nicolas Maillat
fbda66f4e7
Merge pull request #3063 from jygaulier/PHRAS-2573_last-query-as-default_4.1
...
PHRAS-2573 #comment When create a new user, the user query is now set to "last query" , at first user connection the query is empty, that's mean all records.
2019-06-04 16:24:10 +02:00
Nicolas Maillat
43feb196c6
Merge branch 'master' into PHRAS-2573_last-query-as-default_4.1
2019-06-04 14:40:42 +02:00
Nicolas Maillat
72da67f961
Merge pull request #3062 from HRavalomanana/PHRAS-2376_Prod_Toolbar_Change_icon
...
PHRAS-2376 #comment Prod toolbar change icon update yarn.lock
2019-06-04 14:32:54 +02:00
Harrys Ravalomanana
b6297d3e22
PHRAS-2616 #comment Port41 of PHRAS-2351 #time 0.25h
2019-06-04 16:30:38 +04:00
Harrys Ravalomanana
ed8164b23d
PHRAS-2386 #comment Port-41 of PHRAS-2278 #time 1.5h
2019-06-04 16:11:21 +04:00
Harrys Ravalomanana
ee221c7296
PHRAS-2386 #comment Port41 of PHRAS-2344 #time 2h
2019-06-04 15:47:34 +04:00
Harrys Ravalomanana
82c19b9e2f
PHRAS-2386 #comment Refacto picto comment #time 1h
2019-06-04 14:53:15 +04:00
Jean-Yves Gaulier
3b120fb020
PHRAS-2573_last-query-as-default_4.1
...
- set default default user settings to "replay last_query on login"
- set a default (empty) query for first login
2019-06-04 12:07:32 +02:00
Harrys Ravalomanana
48bd30ab9a
PHRAS-2376 #comment update yarn.lock
2019-06-04 13:09:45 +04:00
Nicolas Maillat
35b77fd6a0
Merge pull request #3060 from jygaulier/PHRAS-2614_This-query-not-fired_4.1
...
PHRAS-2614_This-query-not-fired_4.1
2019-06-04 10:50:45 +02:00
Nicolas Maillat
4021e8d4b4
Merge branch 'master' into PHRAS-2614_This-query-not-fired_4.1
2019-06-04 10:41:23 +02:00
Nicolas Maillat
ce6a800852
Merge pull request #3058 from HRavalomanana/PHRAS-2376_Prod_Toolbar_Change_ico
...
PHRAS-2376 Prod toolbar change icons
2019-06-04 10:41:06 +02:00
Nicolas Maillat
9d75c28d2c
Merge branch 'master' into PHRAS-2376_Prod_Toolbar_Change_ico
2019-06-04 10:32:09 +02:00
Nicolas Maillat
d1b48d905b
Merge pull request #3061 from HRavalomanana/PHRAS-2579_Video_player_Chapter_presentation_list_Mode
...
PHRAS-2579 #comment merge update embed-bundle version on composer.json, embed-bundle a features for display video chapters in dropdown using videojs plugin video-chapters-thumbnails
2019-06-04 09:15:08 +02:00
Harrys Ravalomanana
6fcf1649d4
PHRAS-2579 #comment update embed-bundle version on composer.json #time 0.5h
2019-06-04 10:11:46 +04:00
Jean-Yves Gaulier
4550257d59
PHRAS-2614_This-query-not-fired_4.1
...
fix : "user settings / configuration / display on startup" = "the query:___" (always run the same query after login) : The query is now fired after login
nb : silly trick to change ft-query to json in twig, so no need to change lib.
2019-06-03 18:51:52 +02:00
Nicolas Maillat
86460906b0
Merge branch 'master' into PHRAS-2376_Prod_Toolbar_Change_ico
2019-06-03 17:06:50 +02:00
Nicolas Maillat
8bcfe7af9a
Merge pull request #3059 from HRavalomanana/PHRAS-2608_Prod_Fix_responsive_custom_link
...
PHRAS-2608 #comment remove empty link when user is not connected
2019-06-03 16:21:47 +02:00
Nicolas Maillat
2ca1afe0ed
Merge branch 'master' into PHRAS-2608_Prod_Fix_responsive_custom_link
2019-06-03 13:15:41 +02:00
Nicolas Maillat
cbd974b261
Merge pull request #3034 from jygaulier/PHRAS-2581_twig-macro-explode_4.1
...
PHRAS-2581 #comment twig-macro-explode 4.1 in 3 files
2019-06-03 12:06:57 +02:00
Nicolas Maillat
aa584c97e8
Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1
2019-06-03 11:54:54 +02:00
Harrys Ravalomanana
45a649245f
PHRAS-2608 #comment remove custom link when user is not connected #time 1h
2019-06-03 13:33:59 +04:00
Harrys Ravalomanana
8daaa1ffdb
PHRAS-2376 #comment toolbar icons changed #time 2h
2019-06-03 11:38:40 +04:00
Nicolas Maillat
2c4ad4565c
Merge pull request #3057 from AlexandreBrach/PHRDPL-32_env-vars
...
PHRDPL-32 #comment fpm/nginx configuration variabilisable
2019-05-31 19:56:00 +02:00
Alexandre BRACH
0c9fef9a4f
PHRDPL-32 #comment fpm/nginx configuration variabilisable
2019-05-31 19:15:26 +02:00
