hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,299 Commits 268 Branches 107 Tags
80497e85f6f2b94a39b474cb91e79f1e6a35dd3a
Commit Graph

14299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
80497e85f6 PHRAS-3072 fix on publication 2020-05-15 16:06:26 +04:00
Harrys Ravalomanana
5bed9f486f PHRAS-3072 add translation + more fix on design 2020-05-15 14:05:01 +04:00
Harrys Ravalomanana
f21d126295 PHRAS-3072 2020-05-15 13:05:51 +04:00
Harrys Ravalomanana
fe6b01aaae Merge branch 'master' into PHRAS-3072_Several_design_fix 2020-05-15 11:57:35 +04:00
Harrys Ravalomanana
a535268ae8 PHRAS-3072 #comment Design fix #time 6h 2020-05-14 18:39:24 +04:00
Nicolas Maillat
7a2410401d Merge pull request #3485 from alchemy-fr/PHRAS-3070_Prod_publication_fix_on_display 
PHRAS-3070 #comment Prod publication - gif are played and check behavior in 4.0
 2020-05-14 10:25:18 +02:00
Harrys Ravalomanana
5cb7e728b4 Merge branch 'master' into PHRAS-3070_Prod_publication_fix_on_display 2020-05-13 18:48:27 +04:00
Harrys Ravalomanana
6b34c149e3 PHRAS-3070 #comment Fix on publication display #time 2h 2020-05-13 18:46:14 +04:00
Nicolas Maillat
bfdba6cd7f Merge pull request #3484 from alchemy-fr/PHRAS-3068_Prod_publication_editing 
PHRAS-3068 #comment merge Prod - publication -editing - title and subtile is not update after modification
 2020-05-13 16:04:16 +02:00
Harrys Ravalomanana
4d48b3669b Merge branch 'master' into PHRAS-3068_Prod_publication_editing 2020-05-13 16:21:40 +04:00
Nicolas Maillat
543ff8c1fb Merge pull request #3483 from alchemy-fr/PHRAS-3067_Prod_video_tools_change_default_option_No_chapter_overlaps 
PHRAS-3067 #comment merge Prod - video tools - by default option "No Chapters Overlaps" need to be true
 2020-05-13 14:10:36 +02:00
Harrys Ravalomanana
5f8ca21c8a Merge branch 'master' into PHRAS-3068_Prod_publication_editing 2020-05-13 16:02:45 +04:00
Harrys Ravalomanana
80023b5fe5 PHRAS-3068 upgrade phraseanet-production-client 2020-05-13 16:01:42 +04:00
Nicolas Maillat
ec1212e322 Merge branch 'master' into PHRAS-3067_Prod_video_tools_change_default_option_No_chapter_overlaps 2020-05-13 13:49:43 +02:00
Nicolas Maillat
ac8b04d72c Merge pull request #3480 from alchemy-fr/PHRAS-2157_Prod_share_iframe_size 
PHRAS-2157 #comment merge  Prod / Share : Iframe sizes are set to 0 for audio documents
 2020-05-13 13:44:52 +02:00
Harrys Ravalomanana
fd2f9f75d9 PHRAS-3068 #comment Fix update value of title and subtitle after modification #time 2h 2020-05-13 14:42:44 +04:00
Harrys Ravalomanana
a237007195 PHRAS-3067 change default value of chapter overlaps 2020-05-13 12:55:42 +04:00
Nicolas Maillat
cfb71fb4d7 Merge branch 'master' into PHRAS-2157_Prod_share_iframe_size 2020-05-13 10:28:13 +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
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