Commit Graph

746 Commits

Author SHA1 Message Date
Harrys Ravalomanana
86752ad714 PHRAS-2848 Fix lightbox mobile 2019-12-12 15:04:58 +04:00
Harrys Ravalomanana
7d33c60184 Merge branch 'master' into PHRAS-2848_Lightbox_mobile_design_refacto 2019-12-06 17:09:34 +04:00
Nicolas Maillat
1371c607a6 Merge branch 'master' into PHRAS-2850_Fix_icomoon_error 2019-12-05 17:56:10 +01:00
Jean-Yves Gaulier
0967f3c810 PHRAS-2631_feedback-icon
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
2019-12-05 14:52:46 +01:00
Harrys Ravalomanana
1313d8ff82 PHRAS-2850 #comment fix error icomoon #time 2h 2019-12-05 14:13:23 +04:00
Harrys Ravalomanana
4fd9f49ec2 PHRAS-2848 #comment some 2019-12-05 13:25:19 +04:00
Harrys Ravalomanana
3b8edf8e67 PHRAS-2848 2019-12-04 17:24:12 +04:00
Harrys Ravalomanana
c691be541c PHRAS-2848 #comment Lightbox mobile design refacto #time 8h 2019-12-03 18:05:01 +04:00
Harrys Ravalomanana
2cbaaa4fc1 PHRAS-2829 #comment Lightbox mobile filter sort of basket list + add user info #time 4h 2019-11-28 10:50:27 +04:00
Harrys Ravalomanana
861c13b07a PHRAS-2829 set height of image 2019-11-26 17:57:02 +04:00
Harrys Ravalomanana
194d8e243a PHRAS-2829 #comment fix lightbox mobile 2019-11-26 16:33:09 +04:00
Harrys Ravalomanana
c9907449a3 merge branch from master 2019-11-25 18:39:07 +04:00
Harrys Ravalomanana
7a88ece5fe PHRAS-2829 2019-11-25 17:45:29 +04:00
Nicolas Maillat
a9ed349f86 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 2019-11-22 15:21:00 +01:00
Harrys Ravalomanana
fb708cb131 PHRAS-2829 #comment fix lightbox mobile #time 8h 2019-11-22 17:50:55 +04:00
Harrys Ravalomanana
443fce14da PHRAS-2829 lightbox-mobile nw design 2019-11-21 17:30:07 +04:00
Harrys Ravalomanana
b98d51397d PHRAS-2829 #comment lightbox: fix basket display on mobile #time 1h 2019-11-20 16:37:53 +04:00
Nicolas Maillat
de589ad4bd Merge branch 'master' into PHRAS-2824_admin_add_string_translation 2019-11-19 18:27:31 +01:00
Harrys Ravalomanana
f025745170 PHRAS-2829 #comment add translation and upgrade phraseanet-production-client 2019-11-19 11:52:40 +04:00
Harrys Ravalomanana
b69ff691fa PHRAS-2829 #comment Pord41 of Lightbox mobile: user choice and validation report #time 5h 2019-11-19 11:38:02 +04:00
Harrys Ravalomanana
d73d5c26ee PHRAS-2823 #comment fix fontawesome on admin page #time 1h 2019-11-18 11:28:31 +04:00
Harrys Ravalomanana
f9d3075559 PHRAS-2824 #comment add translation 2019-11-15 11:15:32 +04:00
Harrys Ravalomanana
d2209412a9 PHRAS-2824 #comment generate translation #time 1h 2019-11-14 12:33:03 +04:00
Harrys Ravalomanana
6c590f6859 PHRAS-2760 #comment fix help menu in view #time 2h 2019-11-06 11:59:42 +04:00
Nicolas Maillat
ec2f0697d6 Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 17:13:52 +01:00
Harrys Ravalomanana
27e100bdbd PHRAS-2792 #comment add new icon 2019-11-05 17:20:24 +04:00
Harrys Ravalomanana
9d31265574 PHRAS-2792 #time 4h 2019-11-04 11:20:49 +04:00
Harrys Ravalomanana
df86aac2ba PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h 2019-10-29 16:48:14 +04:00
Nicolas Maillat
db453645fa Merge branch 'master' into PHRAS-2661_help_menu 2019-09-20 09:53:01 +02:00
Harrys Ravalomanana
20e918175c PHRAS-2661 2019-09-17 16:17:23 +04:00
Harrys Ravalomanana
a66c813835 PHRAS-2282 change icon 2019-09-17 14:15:27 +04:00
Harrys Ravalomanana
a1ce905c73 PHRAS-2282 #comment Add fix #time 3h 2019-09-12 17:31:01 +04:00
jygaulier
9335bb2517 restore mailcatcher 2019-07-29 13:39:06 +02:00
jygaulier
2180332414 fix mailcatcher version
current version of mailcatcher wants ruby 2, downgrade to a version ok with ruby 1.9
2019-07-29 13:37:53 +02:00
jygaulier
714918f148 Restore xdebug provisioning
restore roles xdebug & nginx
2019-07-23 16:58:50 +02:00
Xavier Rousset
8c0f939339 Update provisioning workflow, check if a box name is defined. A playbook for box usage is created 2019-07-17 20:39:47 +02:00
Nicolas Maillat
ec057989d2 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-27 10:41:04 +02:00
Harrys Ravalomanana
8837363126 PHRAS-2620 Add new font #time 2h 2019-06-25 17:46:33 +04:00
Harrys Ravalomanana
419ffd4aab PRHAS-2544 #comment Fix colorpicker display #time 2h 2019-06-24 17:24:09 +04:00
Harrys Ravalomanana
3dc4feade8 PHRAS-2620 #comment add new icomoon font # time 2h 2019-06-24 14:21:02 +04:00
Harrys Ravalomanana
55fe0a9722 PHRAS-2619 #comment Fix icon size #time 0.5h 2019-06-14 14:50:56 +04:00
Harrys Ravalomanana
985ee2220a PHRAS-2618 #comment fix title and description display #time 2h 2019-06-13 15:20:46 +04:00
Nicolas Maillat
23a9e1385d Merge branch 'master' into PHRAS-2565/prompt-for-provisioning 2019-06-12 16:22:14 +02:00
Harrys Ravalomanana
771bac7825 PHRAS-2376 #comment fix icomoon regression on admin page #time 10mn 2019-06-12 13:50:46 +04:00
Harrys Ravalomanana
76509781eb PHRAS-2386 #adding fix of feedback block #time 2h 2019-06-12 11:06:19 +04:00
Xavier Rousset
b8efa93e39 PHRAS-2565 Update vars for PHP7-2 build, check of another builds in progress 2019-06-11 16:49:26 +02:00
Nicolas Maillat
2f6eb6b02e Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font 2019-06-07 15:29:51 +02:00
Nicolas Maillat
c06acf21ee Update main.scss 2019-06-07 15:28:14 +02:00
Harrys Ravalomanana
300c413848 PHRAS-2419 #comment add icomoon #time 5h 2019-06-06 18:21:57 +04:00
Harrys Ravalomanana
cd62c6524b PHRAS-2617 #comment Port41 of PHRAS-2341 #time 1h 2019-06-04 18:30:27 +04:00