Harrys Ravalomanana
|
3dc4feade8
|
PHRAS-2620 #comment add new icomoon font # time 2h
|
2019-06-24 14:21:02 +04:00 |
|
Harrys Ravalomanana
|
53d8615c59
|
PHRAS-2623 #comment update composer.json and package.lock on phraseanet
|
2019-06-20 17:52:42 +04:00 |
|
Nicolas Maillat
|
7d66dd4f17
|
Merge pull request #3081 from alchemy-fr/PHRAS-2434_update_changelog
PHRAS-2434 #comment merge update changelog.md
|
2019-06-17 12:05:48 +02:00 |
|
Nicolas Maillat
|
713e41fac7
|
PHRAS-2434 #comment update changelog.md
PHRAS-2434 #comment update changelog.md #time 2h reread add to changelog.md
|
2019-06-17 11:19:54 +02:00 |
|
Nicolas Maillat
|
f2ebef2dd0
|
Merge pull request #3078 from HRavalomanana/PHRAS-2619_Admin_Publication_fix_icon_size
PHRAS-2619 Admin Publication : Fix icon size
|
2019-06-14 14:23:16 +02:00 |
|
Nicolas Maillat
|
d2b2dd712b
|
Merge branch 'master' into PHRAS-2619_Admin_Publication_fix_icon_size
|
2019-06-14 13:47:29 +02:00 |
|
Nicolas Maillat
|
f146fbda9f
|
Merge pull request #3077 from HRavalomanana/PHRAS-2530_Port41_Admin_Fix_user_search_with_field
PHRAS-2530 #comment merge Admin: user search by country and company fields
|
2019-06-14 13:47:15 +02:00 |
|
Harrys Ravalomanana
|
55fe0a9722
|
PHRAS-2619 #comment Fix icon size #time 0.5h
|
2019-06-14 14:50:56 +04:00 |
|
Harrys Ravalomanana
|
e6b22cb34c
|
PHRAS-2530 #comment Fix Admin: user search by country and company fields #time 1h
|
2019-06-14 14:38:24 +04:00 |
|
Nicolas Maillat
|
a41b5a0c67
|
Merge pull request #3076 from HRavalomanana/PHRAS-2622_Prod_search_Result_sort
PHRAS-2622 #comment merge update on version phraseanet-production-client@0.34.31-d
|
2019-06-14 12:34:03 +02:00 |
|
Harrys Ravalomanana
|
76cbee1bd4
|
PHRAS-2622 #comment update on stable version phraseanet-production-client@0.34.31-d
|
2019-06-14 14:07:58 +04:00 |
|
Nicolas Maillat
|
7d1a9dc865
|
Merge pull request #3073 from jygaulier/PHRAS-2628_toolbar-plugin_4.1
PHRAS-2628 #comment merge toolbar-plugin_4.1
|
2019-06-13 17:10:04 +02:00 |
|
Nicolas Maillat
|
b84dad40e2
|
Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1
|
2019-06-13 16:32:30 +02:00 |
|
Nicolas Maillat
|
3166e36556
|
Merge pull request #3075 from HRavalomanana/PHRAS-2618_Records_title_on_overview
PHRAS-2618 #comment merge Records: fix title and description display on overview
|
2019-06-13 13:36:50 +02:00 |
|
Harrys Ravalomanana
|
985ee2220a
|
PHRAS-2618 #comment fix title and description display #time 2h
|
2019-06-13 15:20:46 +04:00 |
|
Nicolas Maillat
|
ffc1370cdd
|
PHRDPL-61 #comment update readme
|
2019-06-13 11:47:28 +02:00 |
|
Nicolas Maillat
|
0f1b073e55
|
Merge pull request #3074 from AlexandreBrach/PHRDPL-61_thumbnails_not_shown
PHRDPL-61 #comment worker use the app user to run jobs
|
2019-06-13 11:34:33 +02:00 |
|
Alexandre BRACH
|
7fe9739625
|
PHRDPL-61 #comment worker use the app user to run jobs
|
2019-06-13 11:22:10 +02:00 |
|
Nicolas Maillat
|
6339bd3781
|
Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1
|
2019-06-12 16:34:35 +02:00 |
|
Nicolas Maillat
|
b3893261bd
|
Merge pull request #3071 from xrousset78800/PHRAS-2565/prompt-for-provisioning
PHRAS-2565 #comment merge Add prompt for selecting prebuilt box from vagrant hub or build a new box and for build local form Xenial and PHP 7
|
2019-06-12 16:34:18 +02:00 |
|
Nicolas Maillat
|
23a9e1385d
|
Merge branch 'master' into PHRAS-2565/prompt-for-provisioning
|
2019-06-12 16:22:14 +02:00 |
|
Xavier Rousset
|
dc44ddb59b
|
Add colors on prompt
|
2019-06-12 15:47:37 +02:00 |
|
Nicolas Maillat
|
9f0ef049ad
|
Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1
|
2019-06-12 15:34:05 +02:00 |
|
Nicolas Maillat
|
5a466f6bd1
|
Merge pull request #3072 from HRavalomanana/PHRAS-2386-Feedback_display
PHRAS-2386 #comment merge fix of feedback display block
|
2019-06-12 15:33:22 +02:00 |
|
Jean-Yves Gaulier
|
ce25275c03
|
PHRAS-2628_toolbar-plugin_4.1
allow a plugin to his own js (at the end of the toolbar)
|
2019-06-12 15:20:10 +02:00 |
|
Xavier Rousset
|
b58f09de8d
|
Update wording and switch questions
|
2019-06-12 15:10:27 +02:00 |
|
Harrys Ravalomanana
|
771bac7825
|
PHRAS-2376 #comment fix icomoon regression on admin page #time 10mn
|
2019-06-12 13:50:46 +04:00 |
|
Harrys Ravalomanana
|
76509781eb
|
PHRAS-2386 #adding fix of feedback block #time 2h
|
2019-06-12 11:06:19 +04: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 |
|