Commit Graph

14755 Commits

Author SHA1 Message Date
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
Nicolas Maillat
7696dfb610 Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet 2020-05-27 10:25:11 +02: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
Harrys Ravalomanana
331a45dca1 PHRAS-3090 #comment Prod Videotools dont autostart video with chapter #time 3h 2020-05-26 17:21:40 +04:00
Harrys Ravalomanana
dea8dfea56 PHRAS-2685 add string 2020-05-26 15:24:34 +04:00
Harrys Ravalomanana
d79cb392f9 PHRAS-2685 Add dropdown filter 2020-05-26 14:14:55 +04:00
Harrys Ravalomanana
756528d18f PHRAS-2685 2020-05-26 14:13:23 +04:00
Nicolas Maillat
57958c7efe Merge pull request #3495 from alchemy-fr/PHRAS-2393-archive-task-improvement
PHRAS-2393 #comment merge Port to 4.1 Archive task Improvement Nov 2018 PHRAS-2231 PHRAS-2233
2020-05-25 19:32:27 +02:00
Nicolas Maillat
c3883d6b6b Merge branch 'master' into PHRAS-2393-archive-task-improvement 2020-05-25 18:53:58 +02:00
Nicolas Maillat
e82073a016 Merge pull request #3498 from alchemy-fr/PHRAS-2404-check-phpexiftool-4-1
PHRAS-2404 #comment merge  removed phpexiftool/exiftool unused in composer.lock
2020-05-25 18:53:10 +02:00
Nicolas Maillat
bf38bab0ae Merge branch 'master' into PHRAS-2404-check-phpexiftool-4-1 2020-05-25 18:14:00 +02:00
Nicolas Maillat
e6c613220c Merge pull request #3496 from alchemy-fr/PHRAS-3084_admin_user-edit_Add_button_to_select_all
PHRAS-3084 #comment merge Admin - User - users edit  all read right and all admin right in one click
2020-05-25 18:13:36 +02:00
Harrys Ravalomanana
ee1961cd93 PHRAS-3084 Fix on users edit right 2020-05-25 18:53:13 +04:00
Harrys Ravalomanana
b133b08b25 PHRAS-3084 Add string translation 2020-05-25 16:47:36 +04:00
Harrys Ravalomanana
0acc2575b1 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3084_admin_user-edit_Add_button_to_select_all 2020-05-25 16:33:01 +04:00
Harrys Ravalomanana
bfe82f1cd2 PHRAS-3084 2020-05-25 16:32:30 +04:00
Nicolas Maillat
c9b67f9954 Merge branch 'master' into PHRAS-2404-check-phpexiftool-4-1 2020-05-25 13:59:37 +02:00
Nicolas Maillat
1b7c1f2385 Merge pull request #3497 from alchemy-fr/PHRAS-3082_Admin_design_improvement
PHRAS-3082 #comment merge add more strings for worker setup in admin
2020-05-25 12:53:25 +02:00
aynsix
ee3581c925 removed phpexiftool/exiftool unused in composer.lock 2020-05-25 12:35:28 +03:00
Nicolas Maillat
7f61740701 Merge branch 'master' into PHRAS-2393-archive-task-improvement 2020-05-25 10:25:06 +02:00
Harrys Ravalomanana
c851dd9d75 PHRAS-3082 String translation 2020-05-25 11:57:03 +04:00
Harrys Ravalomanana
c9e448d8fa PHRAS-3082 Add string translation 2020-05-25 11:51:11 +04:00
Nicolas Maillat
0faf212e30 Translated using Weblate (French)
Currently translated at 97.7% (2500 of 2557 strings)
2020-05-22 22:06:23 +00:00
Nicolas Maillat
0a079d77af Translated using Weblate (English)
Currently translated at 97.8% (2501 of 2557 strings)
2020-05-22 22:06:20 +00:00
Nicolas Maillat
56d65f6d9f Translated using Weblate (French)
Currently translated at 97.7% (2500 of 2557 strings)
2020-05-22 21:44:30 +00:00
Nicolas Maillat
8dbf5e1c58 Translated using Weblate (English)
Currently translated at 97.8% (2501 of 2557 strings)
2020-05-22 21:43:44 +00:00
Nicolas Maillat
21346768e9 Merge pull request #3494 from alchemy-fr/PHRAS-3082_Admin_design_improvement
PHRAS-3082 # comment merge Admin  design improvement - Invert sort on table "running job" , add icon to worker and search engine
2020-05-22 19:55:21 +02:00
Harrys Ravalomanana
d382b718e4 PHRAS-3084 2020-05-22 19:48:13 +04:00
Harrys Ravalomanana
7ca0d9dd66 PHRAS-3082 add string translation 2020-05-22 16:15:50 +04:00
aynsix
a0521c59fc port to 4.1 archive task improvement 2020-05-22 12:24:19 +03:00
Harrys Ravalomanana
98f0e602b1 PHRAS-3082 2020-05-21 14:26:31 +04:00
Harrys Ravalomanana
15a9a55c7f PHRAS-3082 add string for translation 2020-05-21 14:17:19 +04:00
Harrys Ravalomanana
857f5af114 PHRAS-3082 2020-05-21 14:13:34 +04:00
Nicolas Maillat
9e17f22683 Merge branch 'master' into PHRAS-3034-geoloc-video-timeout-patch 2020-05-21 01:05:43 +02:00
Nicolas Maillat
0b2f630817 Merge pull request #3493 from alchemy-fr/PHRAS-3073-Prod_basket_feedback_add_type
PHRAS-3073 #comment merge Prod - Basket Feedback - add type (image, video...) on each basket items
2020-05-21 01:02:30 +02:00
Harrys Ravalomanana
fdfb4122d5 PHRAS-3073 #comment add basket preference + display doc type #comment 3h 2020-05-20 19:20:59 +04:00
aynsix
7a3f74d256 fix conf timeout and patch geoloc binaries video editor 2020-05-20 17:06:29 +03:00