Commit Graph

14552 Commits

Author SHA1 Message Date
Nicolas Maillat
65979354c9 Merge branch 'master' into PHRAS-3108_prod_user_pref_add_icon 2020-05-29 20:09:23 +02:00
Nicolas Maillat
557788b80d Merge pull request #3511 from alchemy-fr/PHRAS-3086_refresh_table_on_filter_changing
PHRAS-3086 #comment  workers : Jobs tab Refresh list on changing filters
2020-05-29 20:00:30 +02:00
Nicolas Maillat
2f8eaaf11f Merge branch 'master' into PHRAS-3108_prod_user_pref_add_icon 2020-05-29 19:38:12 +02:00
Nicolas Maillat
6025fc74a9 Merge branch 'master' into PHRAS-3086_refresh_table_on_filter_changing 2020-05-29 19:23:56 +02:00
Nicolas Maillat
414038f65d Merge pull request #3510 from alchemy-fr/PHRAS-3105-Prod_tools_ask_for_re_building_subdef_quick_fix
PHRAS-3105 #comment merge Prod - tools - ask for re building subdef - Optim or Quick fix
2020-05-29 19:21:26 +02:00
Nicolas Maillat
afc41b8214 Merge branch 'master' into PHRAS-3086_refresh_table_on_filter_changing 2020-05-29 19:19:37 +02:00
Harrys Ravalomanana
892b12bf14 PHRAS-3108 2020-05-29 18:56:52 +04:00
Harrys Ravalomanana
8da91b208a PHRAS-3105 add string for translation 2020-05-29 18:02:03 +04:00
Nicolas Maillat
b1511db777 Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet 2020-05-29 15:49:46 +02:00
Harrys Ravalomanana
9995c96a86 Merge branch 'master' into PHRAS-3105-Prod_tools_ask_for_re_building_subdef_quick_fix 2020-05-29 17:46:41 +04:00
Nicolas Maillat
1436648aa1 Merge pull request #3509 from alchemy-fr/PHRAS-3101_string_missing_admin_worker
PHRAS-3101 #comment Strings are missing in weblate - Admin - Worker
2020-05-29 15:43:42 +02:00
Harrys Ravalomanana
732d9f7154 PHRAS-3086 2020-05-29 17:40:16 +04:00
Harrys Ravalomanana
2c81c404ab PHRAS-3086 #comment Add : refresh list on changing filters #time 1h 2020-05-29 17:31:48 +04:00
Harrys Ravalomanana
74c898dc05 PHRAS-3101
remove text written in error
2020-05-29 16:54:18 +04:00
Harrys Ravalomanana
7a033158fa PHRAS-3105 Prod tools quick fix 2020-05-29 16:29:16 +04:00
Harrys Ravalomanana
e55e170eff Merge branch 'master' into PHRAS-3101_string_missing_admin_worker 2020-05-29 15:40:22 +04:00
Nicolas Maillat
e1fed3367e Merge pull request #3508 from alchemy-fr/PHRAS-3091-search-on-contains-operator
PHRAS-3091 #comment merge for  Back dev for add "content" operator when search users
2020-05-29 13:01:49 +02:00
Harrys Ravalomanana
0d38f4ff93 PHRAS-3101 String missing 2020-05-29 14:45:08 +04:00
Nicolas Maillat
bd7635b781 Merge branch 'master' into PHRAS-3091-search-on-contains-operator 2020-05-29 12:17:44 +02:00
Nicolas Maillat
110e78a89b Merge pull request #3506 from alchemy-fr/PHRAS-3088-mysql-gone-away
PHRAS-3088 #comment merge  fix mysql server gone away and dead lock on table worker
2020-05-29 12:16:47 +02:00
Nicolas Maillat
3ea40f113c Merge branch 'master' into PHRAS-3088-mysql-gone-away 2020-05-29 11:55:29 +02:00
Nicolas Maillat
e913e267bd Merge pull request #3507 from alchemy-fr/PHRAS-3049_more_setup_in_dc
PHRAS-3049 #comment merge More setup in docker-compose
2020-05-29 11:55:03 +02:00
nmaillat
dddc950103 add cache volumes to worker 2020-05-29 10:58:17 +02:00
aynsix
92502d8caa search user on like %...% 2020-05-29 11:25:37 +03:00
nmaillat
1b3fedee60 create private and public collection 2020-05-29 01:46:59 +02:00
nmaillat
bdd0032ed5 PHRAS-3009 #comment add audio preview in dublincore model 2020-05-29 01:35:30 +02:00
Nicolas Maillat
501811db37 Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose 2020-05-29 00:46:01 +02:00
aynsix
24261483d7 catch exception on the worker 2020-05-28 20:29:15 +03:00
Nicolas Maillat
c05a862e84 Merge branch 'master' into PHRAS-3088-mysql-gone-away 2020-05-28 19:11:20 +02:00
Jennifer
0764cb4990 Translated using Weblate (German)
Currently translated at 97.5% (2502 of 2564 strings)
2020-05-28 16:02:41 +00:00
Jennifer
497ad3b12c Translated using Weblate (English)
Currently translated at 97.9% (2511 of 2564 strings)
2020-05-28 16:02:41 +00:00
Jennifer
667236d9e8 Translated using Weblate (French)
Currently translated at 97.6% (2505 of 2564 strings)
2020-05-28 16:02:41 +00:00
Nicolas Maillat
0405d47062 Merge pull request #3504 from alchemy-fr/PHRAS-3097_prod-editing-preview-video
PHRAS-3097 #comment Prod - Editing - preview in video case - call embed-bundle player not the video editor
2020-05-28 13:00:06 +02:00
Harrys Ravalomanana
0f35db37d9 PHRAS-3097 2020-05-28 14:16:36 +04:00
Nicolas Maillat
993b6e1cc6 Merge branch 'master' into PHRAS-3088-mysql-gone-away 2020-05-27 22:55:01 +02:00
Nicolas Maillat
78c5e953e1 Merge branch 'master' into PHRAS-3097_prod-editing-preview-video 2020-05-27 22:41:06 +02:00
Jennifer
6450aaa986 Translated using Weblate (German)
Currently translated at 97.5% (2501 of 2564 strings)
2020-05-27 20:39:58 +00:00
Nicolas Maillat
fe0b2c298c Translated using Weblate (English)
Currently translated at 97.9% (2511 of 2564 strings)
2020-05-27 20:39:58 +00:00
Nicolas Maillat
bc8cace1f3 Translated using Weblate (French)
Currently translated at 97.6% (2503 of 2564 strings)
2020-05-27 20:39:58 +00:00
Jennifer
dd025d0223 Translated using Weblate (English)
Currently translated at 97.6% (2505 of 2564 strings)
2020-05-27 20:39:58 +00:00
Jennifer
12a68bfb13 Translated using Weblate (French)
Currently translated at 97.6% (2503 of 2564 strings)
2020-05-27 20:39:58 +00:00
Nicolas Maillat
7740edc018 Translated using Weblate (French)
Currently translated at 97.5% (2500 of 2564 strings)
2020-05-27 20:39:58 +00:00
Nicolas Maillat
c892773f03 Merge pull request #3503 from alchemy-fr/PHRAS-3096_prod-uploa-remove-flash-uploader
PHRAS-3096 #comment merge prod - uploader remove flash uploader
2020-05-27 22:38:26 +02:00
aynsix
50f016ebb5 fix mysql server gone away and dead lock on table 2020-05-27 19:55:45 +03:00
Harrys Ravalomanana
d7318696ff PHRAS-3097 2020-05-27 19:31:14 +04:00
Nicolas Maillat
84d6792436 Merge branch 'master' into PHRAS-3096_prod-uploa-remove-flash-uploader 2020-05-27 17:20:59 +02:00
Nicolas Maillat
c5f90e930e Merge pull request #3505 from alchemy-fr/PHRAS-3087_Login_page_fix_design
PHRAS-3087 #comment merge Login page - Design - Button is cut when login error occurs
2020-05-27 17:19:22 +02:00
Harrys Ravalomanana
c547e9d1bb PHRAS-3087 #comment Fix Login page : icon design #comment 1h 2020-05-27 18:59:07 +04:00
Harrys Ravalomanana
677c1e1b4b PHRAS-3097 #comment fix prod edit video : use videojs + resize #time 3h 2020-05-27 18:21:10 +04:00
Nicolas Maillat
13305ba8d0 Merge pull request #3502 from alchemy-fr/PHRAS-3081-sqllite-db-to-appbox
PHRAS-3081 :
#comment merge  Worker - add sqlite db lib/..../Db/worker.db into the applicationbox WorkerRunningJob scheme update
2020-05-27 15:20:25 +02:00