hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,622 Commits 268 Branches 107 Tags
418b8e7ee8dd2acdd179657b4f605c1548a6c9e8
Commit Graph

14622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
418b8e7ee8 Translated using Weblate (French) 
Currently translated at 99.3% (2580 of 2598 strings)
 2020-06-29 15:59:42 +00:00
Nicolas Maillat
e754e49943 Translated using Weblate (English) 
Currently translated at 99.2% (2579 of 2598 strings)
 2020-06-29 15:59:41 +00:00
Nicolas Maillat
ed037b4874 Merge pull request #3541 from alchemy-fr/PHRAS-3148_thesaurus_guy 
PHRAS-3148 Merge Thesaurus GUI - redirect all popup in modal on main windows
 2020-06-29 17:10:57 +02:00
Harrys Ravalomanana
ad7c7b145d PHRAS-3148 Add string translation 2020-06-29 11:57:00 +04:00
Harrys Ravalomanana
18d925b532 PHRAS-3148 fix n drag and drop from stock 2020-06-29 11:48:21 +04:00
Harrys Ravalomanana
b3f402a69f PHRAS-3148 2020-06-25 17:32:18 +04:00
Harrys Ravalomanana
b0ff7e228b Merge branch 'PHRAS-3148_thesaurus_guy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3148_thesaurus_guy 2020-06-25 17:28:04 +04:00
Harrys Ravalomanana
752e255f86 PHRAS-3148 : styling 2020-06-25 17:27:36 +04:00
Nicolas Maillat
cbe50ee973 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-25 12:57:48 +02:00
Nicolas Maillat
564546654e Adding notes about elasticsearch container 2020-06-25 12:19:43 +02:00
Harrys Ravalomanana
19c7b27ad4 Merge branch 'PHRAS-3148_thesaurus_guy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3148_thesaurus_guy 2020-06-25 13:55:16 +04:00
Harrys Ravalomanana
b2774d8bb6 PHRAS-3148 Add accept term modal 2020-06-25 13:54:43 +04:00
Nicolas Maillat
3573939d9b Merge pull request #3539 from alchemy-fr/PHRAS-3144-install-plugin 
PHRAS-3144 merge change www and plugins directory owner on install , add volumes www/plugins to gateway
 2020-06-24 22:29:35 +02:00
Nicolas Maillat
9bcdbce1f9 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-24 17:52:23 +02:00
Nicolas Maillat
76d0cef9b5 Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-24 17:52:05 +02:00
Nicolas Maillat
27b424f712 Merge pull request #3544 from alchemy-fr/change-plugins-delimiter 
PHRAS-3144 merge change plugin delimiter
 2020-06-24 17:51:39 +02:00
Arthur de Moulins
2a37909341 change plugin delimiter 2020-06-24 17:20:34 +02:00
Harrys Ravalomanana
10eb3638e9 PHRAS-3148 2020-06-24 18:37:59 +04:00
Harrys Ravalomanana
6a5b96be6a PHRAS-3148 2020-06-24 18:29:33 +04:00
Harrys Ravalomanana
1f0c54bfc3 PHRAS-3148 :Fix drag and drop terms 2020-06-24 15:17:50 +04:00
Nicolas Maillat
ca349333c8 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-23 17:46:42 +02:00
jygaulier
aaa6653bcd Merge pull request #3543 from alchemy-fr/PHRAS-3092_api-setmetadats-v3_master 
PHRAS-3092 API V3 rename endpoint
 2020-06-23 17:42:23 +02:00
Harrys Ravalomanana
492bb9b7af Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-23 19:22:27 +04:00
Harrys Ravalomanana
a83988e45f add populate button 2020-06-23 19:20:56 +04:00
jygaulier
b0259d4953 Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master 2020-06-23 17:02:54 +02:00
Nicolas Maillat
defb9049e9 Merge pull request #3542 from alchemy-fr/PHRAS-3147-thesaurus-populate 
PHRAS-3147 Merge Thesaurus GUI - launch a populate directly from GUI
 2020-06-23 16:55:28 +02:00
Harrys Ravalomanana
e96510b220 PHRAS-3148 : Thesaurus guy : change window to modal 2020-06-23 17:49:32 +04:00
Nicolas Maillat
a2acdf4185 Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-23 14:42:24 +02:00
Nicolas Maillat
956ba2be15 Merge branch 'master' into PHRAS-3147-thesaurus-populate 2020-06-23 14:42:07 +02:00
Jennifer
49c12ffa6d Translated using Weblate (German) 
Currently translated at 98.9% (2563 of 2591 strings)
 2020-06-23 09:46:10 +00:00
Nicolas Maillat
00922d3390 Translated using Weblate (French) 
Currently translated at 99.3% (2574 of 2591 strings)
 2020-06-23 09:46:09 +00:00
Jennifer
6488ff7df8 Translated using Weblate (English) 
Currently translated at 99.3% (2574 of 2591 strings)
 2020-06-23 09:46:09 +00:00
Nicolas Maillat
b73053b523 Translated using Weblate (English) 
Currently translated at 99.3% (2574 of 2591 strings)
 2020-06-23 09:45:34 +00:00
aynsix
df22b24b19 add populate controller in thesaurus 2020-06-23 11:06:51 +03:00
Harrys Ravalomanana
1190c7c424 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-23 11:34:44 +04:00
Harrys Ravalomanana
7cc8817447 PHRAS-3148 Thesaurus : change new window to modals 2020-06-22 19:57:19 +04:00
Nicolas Maillat
16464eb962 Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-22 16:51:53 +02:00
Nicolas Maillat
1d13486e88 Merge pull request #3540 from alchemy-fr/PHRAS-3116_prod_video_tools_subtitle_ 
PHRAS-3116  merge fix  Prod - video-tools - Front for ask and edit subtitle or transcript generation
 2020-06-22 16:51:32 +02:00
Nicolas Maillat
5f4243105a PHRAS-3144 add volume for plugins 2020-06-22 15:25:44 +02:00
Nicolas Maillat
444ce3673f Add volumes for plugins 2020-06-22 15:20:31 +02:00
jygaulier
18f7a658ed change : removed "/setmetadatas" from route, the http verb "PATCH" on "record" entity is ok 
fix : unknown field now throws exception (no more erase all...)
add : set "base_id":x to change collection
cleanup : removed unused parm to recordadapter::move_to_collection()
 2020-06-22 14:40:27 +02:00
Harrys Ravalomanana
44764eaac9 PHRAS-3116 Video editor Fix on video request tab 2020-06-22 14:52:57 +04:00
Nicolas Maillat
0c2ec2f8e9 Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-22 10:11:26 +02:00
aynsix
602ce2e25f change directory owner 2020-06-22 10:10:56 +03:00
Jennifer
013c0c8dac Translated using Weblate (German) 
Currently translated at 98.9% (2563 of 2591 strings)
 2020-06-19 17:21:36 +00:00
Jennifer
1716583d54 Translated using Weblate (English) 
Currently translated at 99.0% (2566 of 2591 strings)
 2020-06-19 17:21:36 +00:00
Jennifer
23e651d8df Translated using Weblate (French) 
Currently translated at 99.2% (2571 of 2591 strings)
 2020-06-19 17:19:16 +00:00
Nicolas Maillat
ac1c17ddb8 Translated using Weblate (French) 
Currently translated at 99.2% (2571 of 2591 strings)
 2020-06-19 17:16:01 +00:00
Nicolas Maillat
03ebd46fd8 Translated using Weblate (English) 
Currently translated at 99.0% (2566 of 2591 strings)
 2020-06-19 17:10:37 +00:00
Nicolas Maillat
391f0c26c2 Merge pull request #3533 from alchemy-fr/PHRAS-3116_prod_video-tools-add_subtitle_generation 
PHRAS-3116 merge  Prod - video-tools - Front for ask and edit subtitle or transcript generation
 2020-06-19 15:00:23 +02:00