Commit Graph

2424 Commits

Author SHA1 Message Date
Nicolas Maillat
65979354c9 Merge branch 'master' into PHRAS-3108_prod_user_pref_add_icon 2020-05-29 20:09:23 +02:00
Nicolas Maillat
2f8eaaf11f Merge branch 'master' into PHRAS-3108_prod_user_pref_add_icon 2020-05-29 19:38:12 +02:00
Nicolas Maillat
6025fc74a9 Merge branch 'master' into PHRAS-3086_refresh_table_on_filter_changing 2020-05-29 19:23:56 +02:00
Nicolas Maillat
afc41b8214 Merge branch 'master' into PHRAS-3086_refresh_table_on_filter_changing 2020-05-29 19:19:37 +02:00
Harrys Ravalomanana
892b12bf14 PHRAS-3108 2020-05-29 18:56:52 +04:00
Harrys Ravalomanana
9995c96a86 Merge branch 'master' into PHRAS-3105-Prod_tools_ask_for_re_building_subdef_quick_fix 2020-05-29 17:46:41 +04:00
Harrys Ravalomanana
732d9f7154 PHRAS-3086 2020-05-29 17:40:16 +04:00
Harrys Ravalomanana
2c81c404ab PHRAS-3086 #comment Add : refresh list on changing filters #time 1h 2020-05-29 17:31:48 +04:00
Harrys Ravalomanana
74c898dc05 PHRAS-3101
remove text written in error
2020-05-29 16:54:18 +04:00
Harrys Ravalomanana
7a033158fa PHRAS-3105 Prod tools quick fix 2020-05-29 16:29:16 +04:00
Harrys Ravalomanana
e55e170eff Merge branch 'master' into PHRAS-3101_string_missing_admin_worker 2020-05-29 15:40:22 +04:00
Harrys Ravalomanana
0d38f4ff93 PHRAS-3101 String missing 2020-05-29 14:45:08 +04:00
aynsix
92502d8caa search user on like %...% 2020-05-29 11:25:37 +03:00
Nicolas Maillat
84d6792436 Merge branch 'master' into PHRAS-3096_prod-uploa-remove-flash-uploader 2020-05-27 17:20:59 +02:00
Harrys Ravalomanana
14869907db PHRAS-3069 remove flash uploader switcher 2020-05-27 15:50:57 +04:00
aynsix
ba4d3677aa reverse column in admin 2020-05-27 09:48:48 +03:00
aynsix
d25da3ee0c remove sqllite db , add finished colomn 2020-05-26 19:35:33 +03:00
Harrys Ravalomanana
756528d18f PHRAS-2685 2020-05-26 14:13:23 +04: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
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
Harrys Ravalomanana
98f0e602b1 PHRAS-3082 2020-05-21 14:26:31 +04:00
Harrys Ravalomanana
857f5af114 PHRAS-3082 2020-05-21 14:13:34 +04:00
Harrys Ravalomanana
fdfb4122d5 PHRAS-3073 #comment add basket preference + display doc type #comment 3h 2020-05-20 19:20:59 +04:00
aynsix
77311ed7f6 fix refresh working tab 2020-05-19 17:45:16 +03:00
aynsix
bfb2b7723a refresh working info 2020-05-18 17:38:04 +03:00
aynsix
11b8ca7953 change display work column 2020-05-18 11:42:06 +03:00
aynsix
6a7ca08000 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3057-worker-in-core-4-1 2020-05-15 21:01:55 +03:00
Harrys Ravalomanana
80497e85f6 PHRAS-3072 fix on publication 2020-05-15 16:06:26 +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
aynsix
0b45ae377c add time to message, ad status info in worker table, fix subdef elastic flush 2020-05-14 18:48:00 +03:00
Harrys Ravalomanana
a535268ae8 PHRAS-3072 #comment Design fix #time 6h 2020-05-14 18:39:24 +04: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
aynsix
daf059d03f make delayed queue connfigurable 2020-05-13 17:29:45 +03: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
Harrys Ravalomanana
a237007195 PHRAS-3067 change default value of chapter overlaps 2020-05-13 12:55:42 +04: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
7022c382b8 PHRAS-3066 #commetn fix 500 error on tools #time 2h 2020-05-12 11:15:07 +04:00
Harrys Ravalomanana
f2d68c1d3e PHRAs-3059 2020-05-08 19:10:45 +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
Harrys Ravalomanana
de62071cfa PHRAS-3059 Fix on string error 2020-05-08 18:26:03 +04:00
Harrys Ravalomanana
2a55ef6880 PHRAS-3051 #comment Fix : Prod video tools define thumbnail size #time 4h 2020-05-08 17:01:48 +04: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