Harrys Ravalomanana
|
892b12bf14
|
PHRAS-3108
|
2020-05-29 18:56:52 +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
|
74c898dc05
|
PHRAS-3101
remove text written in error
|
2020-05-29 16:54:18 +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 |
|
Nicolas Maillat
|
2f1b90ad00
|
Merge branch 'master' into PHRAS-3081-sqllite-db-to-appbox
|
2020-05-27 14:51:42 +02:00 |
|
Nicolas Maillat
|
4d6cc11d96
|
Merge pull request #3492 from alchemy-fr/PHRAS-3034-geoloc-video-timeout-patch
PHRAS-3034 #comment merge Configuration.yml Migration patch for geoloc section, video editor and binaries timeout section
|
2020-05-27 14:39:30 +02:00 |
|
Harrys Ravalomanana
|
14869907db
|
PHRAS-3069 remove flash uploader switcher
|
2020-05-27 15:50:57 +04:00 |
|
aynsix
|
71cc21bb43
|
custom link section
|
2020-05-27 11:27:18 +03:00 |
|
aynsix
|
1f1a2e9aa1
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3034-geoloc-video-timeout-patch
|
2020-05-27 09:55:13 +03:00 |
|
aynsix
|
ba4d3677aa
|
reverse column in admin
|
2020-05-27 09:48:48 +03:00 |
|
aynsix
|
0aa4864b9a
|
fix
|
2020-05-26 20:10:42 +03:00 |
|
aynsix
|
7e88bb236e
|
delete unused config class
|
2020-05-26 19:38:27 +03:00 |
|
aynsix
|
d25da3ee0c
|
remove sqllite db , add finished colomn
|
2020-05-26 19:35:33 +03:00 |
|
Nicolas Maillat
|
c8d70838f9
|
Merge pull request #3501 from alchemy-fr/PHRAS-3090_Prod_videotools_Dont_autostart_video
PHRAS-3090 #comment merge Don't auto start video when openning video tool
|
2020-05-26 17:36:22 +02:00 |
|
Nicolas Maillat
|
8be8448260
|
Merge branch 'master' into PHRAS-3090_Prod_videotools_Dont_autostart_video
|
2020-05-26 16:39:36 +02:00 |
|
Nicolas Maillat
|
794e607ae2
|
Merge pull request #3500 from alchemy-fr/PHRAS-2685_admin_user_add_dropdown
PHRAS-2685 #comment merge Admin - User - Add drop down menu
|
2020-05-26 16:39:11 +02:00 |
|