Nicolas Maillat
4f8c850fc5
Merge branch 'master' into PHRAS-3057-worker-in-core-4-1
2020-05-12 21:15:11 +02:00
Nicolas Maillat
ac38b5d68a
PHRAS-3057 dockerfile cmd for worker
2020-05-12 21:14:37 +02:00
Nicolas Maillat
14ce0e3940
Merge pull request #3479 from alchemy-fr/PHRAS-3063_prod_basket_reorder_documents
...
PHRAS-3063 #comment Prod - Reorder documents in basket: Design issues
2020-05-12 20:47:43 +02:00
Nicolas Maillat
e46c3071c7
Merge branch 'master' into PHRAS-3063_prod_basket_reorder_documents
2020-05-12 19:55:46 +02:00
aynsix
65552dcbfe
fix
2020-05-12 19:42:43 +03:00
aynsix
c9970fcc24
fix provider
2020-05-12 18:16:45 +03:00
aynsix
bb2123df5a
include plugin worker in phraseanet core
2020-05-12 18:06:45 +03:00
Harrys Ravalomanana
16477a2a53
PHRAS-2157 #comment Prod share fix iframe size #time 2h
2020-05-12 18:40:23 +04:00
Harrys Ravalomanana
9d23503c44
PHRAS-3063 #comment Fix onf prod basket reorder doc
2020-05-12 12:44:52 +04:00
Nicolas Maillat
e4a872dfeb
Merge pull request #3477 from alchemy-fr/PHRAS-3062_Prod_push_feedback_add_created_user
...
PHRAS-3062 #comment merge Prod - Push feedback - The created user is not add to the current push or feedback
2020-05-12 10:34:51 +02:00
Nicolas Maillat
c174cd5e83
Merge branch 'master' into PHRAS-3062_Prod_push_feedback_add_created_user
2020-05-12 10:05:44 +02:00
Nicolas Maillat
ca66dfc11b
Merge pull request #3478 from alchemy-fr/PHRAS-3066_Prod_tools_500_error
...
PHRAS-3066 #comment merge Prod - Tools - 500 error when record selection contains more than one record
2020-05-12 10:05:29 +02:00
Harrys Ravalomanana
7022c382b8
PHRAS-3066 #commetn fix 500 error on tools #time 2h
2020-05-12 11:15:07 +04:00
Harrys Ravalomanana
e4e2bf4984
PHRAS-3062 #comment Fix add created user on push or feedback
2020-05-11 19:13:53 +04:00
Nicolas Maillat
e9b3a83c59
Merge pull request #3473 from alchemy-fr/PHRAS-3059_fix_on_string
...
PHRAS-3059 #comment merge String is missing in weblate - Prod - Actions button
2020-05-08 17:25:39 +02:00
Harrys Ravalomanana
f2d68c1d3e
PHRAs-3059
2020-05-08 19:10:45 +04:00
Harrys Ravalomanana
42cd99da5f
Merge branch 'PHRAS-3059_fix_on_string' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3059_fix_on_string
2020-05-08 19:10:08 +04:00
Harrys Ravalomanana
1b4ed3205a
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3059_fix_on_string
2020-05-08 19:07:34 +04:00
Nicolas Maillat
6075d4530a
Merge branch 'master' into PHRAS-3059_fix_on_string
2020-05-08 16:47:38 +02:00
Nicolas Maillat
9d93c27b79
Merge pull request #3457 from alchemy-fr/PHRAS-2524-worker-log
...
PHRAS-2524 #comment Put worker logs, tasks log and app error log into an ELK
2020-05-08 16:47:22 +02:00
Harrys Ravalomanana
de62071cfa
PHRAS-3059 Fix on string error
2020-05-08 18:26:03 +04:00
Nicolas Maillat
9503bb3410
Merge branch 'master' into PHRAS-2524-worker-log
2020-05-08 16:20:27 +02:00
Nicolas Maillat
ba9a8da62d
Merge pull request #3472 from alchemy-fr/PHRAS-3051_Prod-vide_tools_define_thumbnail
...
PHRAS-3051 #comment merge Prod - video tools - define a thumbnail for video don't update other static image like poster
2020-05-08 16:20:10 +02:00
Harrys Ravalomanana
2a55ef6880
PHRAS-3051 #comment Fix : Prod video tools define thumbnail size #time 4h
2020-05-08 17:01:48 +04:00
Jennifer
01ddf69483
Translated using Weblate (German)
...
Currently translated at 99.9% (2498 of 2500 strings)
2020-05-08 12:16:04 +00:00
Jennifer
36a0e213df
Translated using Weblate (French)
...
Currently translated at 99.9% (2499 of 2500 strings)
2020-05-08 12:16:04 +00:00
Jennifer
287f227edc
Translated using Weblate (English)
...
Currently translated at 100.0% (2500 of 2500 strings)
2020-05-08 12:16:04 +00:00
Nicolas Maillat
a762fd55a3
Translated using Weblate (English)
...
Currently translated at 98.9% (2473 of 2500 strings)
2020-05-08 12:16:04 +00:00
Nicolas Maillat
55f0b9ee2a
Merge pull request #3471 from alchemy-fr/PHRAS-3056_Prod_Push_feed_back_search_user
...
PHRAS-3056 #comment merge Prod - Push and Feedback - searching user is NOK , javascript error du to null value in email user field
2020-05-08 13:34:22 +02:00
Harrys Ravalomanana
ddfea9e4ce
PHRAS-3056
2020-05-08 12:34:11 +04:00
Harrys Ravalomanana
afa8447804
PHRAS-3056 #comment fix on search user #time 2h
2020-05-08 12:30:54 +04:00
Nicolas Maillat
030d01b037
Merge pull request #3469 from alchemy-fr/PHRAS-3030_Strings_missing
...
PHRAS-3030 #comment merge Strings are Missing - translations are not possible in weblate - v4.1
2020-05-06 19:30:09 +02:00
Nicolas Maillat
802f4e2a48
Merge branch 'master' into PHRAS-3030_Strings_missing
2020-05-06 18:55:45 +02:00
Harrys Ravalomanana
9bb1d1b533
PHRAS-3030 #comment PHRAS-3055 fix on Report download
2020-05-06 09:57:26 +04:00
Nicolas Maillat
f167636204
Merge pull request #3468 from alchemy-fr/PHRAS-3054-search-user-push-feedback
...
PHRAS-3054 : #comment Prod - Push feedback - Search for users in Pusch and Feedback is made on user's first name, last name and Login only, now this is expand search to fields email, company and country
2020-05-06 01:23:50 +02:00
Nicolas Maillat
c9210bbc82
Merge branch 'master' into PHRAS-3054-search-user-push-feedback
2020-05-06 00:59:36 +02:00
Nicolas Maillat
106caee876
Merge branch 'master' into PHRAS-3030_Strings_missing
2020-05-05 16:55:41 +02:00
Nicolas Maillat
e45b9c84b1
Merge pull request #3467 from alchemy-fr/PHRAS-3052_Prod_tools_enable_disable_permalink
...
PHRAS-3052 #comment merge Prod - tools - Enable- Disable permalink Is NOK
2020-05-05 16:49:26 +02:00
Harrys Ravalomanana
b8b0abc617
PHRAS-3030 #comment add missing string #time 3h
2020-05-05 18:39:43 +04:00
aynsix
632bed7f06
add email and company in push search
2020-05-05 17:14:36 +03:00
Nicolas Maillat
8bb664a4ae
Merge branch 'master' into PHRAS-3052_Prod_tools_enable_disable_permalink
2020-05-05 14:17:18 +02:00
Nicolas Maillat
5053c0b7ee
Merge pull request #3464 from alchemy-fr/PHRAS-3047_front_of_tools_metadatas_tab
...
PHRAS-3047 #comment merge front of - tools- metadatas tab - Add dropdown , fix design and refresh data.
2020-05-05 14:15:38 +02:00
Harrys Ravalomanana
985cd6e226
PHRAS-3052 #comment Fix on Prod > Tools > Permalinks sharing #time 2h
2020-05-05 14:41:02 +04:00
Harrys Ravalomanana
88402ccddb
PHRAS-3047
2020-05-05 14:23:28 +04:00
Harrys Ravalomanana
218d5c8b68
PHRAS-3047 re-generate translation
2020-05-05 11:52:33 +04:00
Harrys Ravalomanana
72c84a23a7
PHRAS-3047
2020-05-05 11:11:33 +04:00
Harrys Ravalomanana
40cfb606cc
Merge branch master
2020-05-05 11:02:47 +04:00
Harrys Ravalomanana
f8b0555149
PHRAS-3047 add transaltion
2020-05-05 11:00:18 +04:00
Harrys Ravalomanana
692ee284f1
Merge branch 'master' into PHRAS-3047_front_of_tools_metadatas_tab
2020-05-05 10:26:10 +04:00
Harrys Ravalomanana
fff7aa833f
PHRAS-3047
2020-05-05 10:25:10 +04:00
