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
13,767 Commits 268 Branches 107 Tags
ed913bebfcc00a0999333d927d055c18470efd75
Commit Graph

2358 Commits

Author SHA1 Message Date
Harrys Ravalomanana
72000dc03a PHRAS-2933 #comment add Design on Facets sort options #time 2h 2020-02-20 17:07:54 +04:00
Harrys Ravalomanana
b232806b8b PHRAS-2933 2020-02-19 18:38:52 +04:00
Harrys Ravalomanana
b35c1595ed PHRAS-2933 Fix facets order and move to workzone block 2020-02-19 15:20:19 +04:00
Nicolas Maillat
8448e19ba7 Merge branch 'master' into PHRAS-2779_Account_enable-to_delete_application_in_developer-tab 2020-02-18 16:27:19 +01:00
Nicolas Maillat
2fb3da59be Merge branch 'master' into PHRAS-2825_ass_reset_button 2020-02-18 15:39:25 +01:00
Nicolas Maillat
08dfb81007 Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox 2020-02-18 14:27:56 +01:00
Harrys Ravalomanana
b5f1fd18f4 PHRAS-2779 #comment fix delete application on account #time 4h 2020-02-18 16:30:53 +04:00
Nicolas Maillat
8723fc3720 Merge branch 'master' into PHRAS-2879_facet-order_4.1 2020-02-18 10:23:12 +01:00
Nicolas Maillat
771ab538fa Merge branch 'master' into PHRAS-2825_ass_reset_button 2020-02-18 10:15:51 +01:00
Harrys Ravalomanana
f2b2092a12 PHRAS-2825 center the reset button 2020-02-18 11:59:31 +04:00
Jean-Yves Gaulier
722b1e3750 include Harrys's new templates 
fix form restore
fix Version
 2020-02-17 20:17:08 +01:00
Nicolas Maillat
1bf4ecf60d Merge branch 'master' into PHRAS-2906-fix-for-job-and-activity-on-user-update 2020-02-17 16:42:10 +01:00
Nicolas Maillat
5e1082a6eb Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox 2020-02-17 16:10:41 +01:00
Harrys Ravalomanana
3eb2c76086 Merge branch 'master' into PHRAS-2825_Prod_Add_reset_button_to_initialize_search 2020-02-17 17:26:50 +04:00
Harrys Ravalomanana
c5e7b317ba PHRAS-2825 2020-02-14 18:02:18 +04:00
Harrys Ravalomanana
54e9264bdb PHRAS-2915 2020-02-12 17:30:21 +04:00
Harrys Ravalomanana
fa462b368b PHRAS-2915 #comment add Read more btn #time 5h 2020-02-12 17:26:10 +04:00
Harrys Ravalomanana
546d07a559 PHRAS-2915 #comment Fix sort basket orfer on lightbox desktop # time 1h 2020-02-11 12:13:48 +04:00
aynsix
a20962e9ba hide chkbox 2020-02-07 12:35:57 +03:00
Harrys Ravalomanana
8f3b06f37f PHRAS-2216 #comment Refacto Help -About #time 3h 2020-02-06 19:08:17 +04:00
gjacobjn
3c1c6c41f5 Fix in template 2020-02-06 14:17:51 +01:00
aynsix
fc53e158da fix visible ckbox in the right side 2020-02-05 18:06:04 +03:00
aynsix
e20bb42f98 hide cterms ckbox if not relevant 2020-02-05 11:21:45 +03:00
Harrys Ravalomanana
a4a5fac254 PHRAS-2894 #comment Fix Quarantine allow to substitute without selecting target Record #time 2h" 
git commit -m PHRAS-2894
 2020-01-31 14:15:56 +04:00
Nicolas Maillat
729291ba01 Merge branch 'master' into PHRAS-2885-Prod-Add_missing_warning 2020-01-29 16:49:08 +01:00
Harrys Ravalomanana
55f4678c2f PHRAS-2885 Add missing warning when try to edit record from different db 2020-01-29 17:24:50 +04:00
Harrys Ravalomanana
de2f8dc588 merge of master 2020-01-29 10:31:44 +04:00
Harrys Ravalomanana
f29be7f07b PHRAS-2885 2020-01-27 15:06:44 +04:00
Harrys Ravalomanana
2b15159fa2 PHRAS-2719 2020-01-24 10:54:53 +04:00
Harrys Ravalomanana
407c13b8c8 PHRAS-2719 2020-01-23 16:26:11 +04:00
Harrys Ravalomanana
b5248bf62e PHRAS-2719 #comment Fix multivalue fields selection #time 4h 2020-01-23 14:29:37 +04:00
aynsix
e3f596963a add base name in pdf feedback 2020-01-23 12:12:59 +03:00
aynsix
5b38565e1a add format deedback only and fix pdf text 2020-01-23 11:38:17 +03:00
Harrys Ravalomanana
7b9cf8e72d PHRAS-2875 remove sort on twig 2020-01-22 18:28:44 +04:00
Harrys Ravalomanana
e06c4d8eca PHRAS-2875 add Collection on caption tooltip 2020-01-22 16:04:36 +04:00
Harrys Ravalomanana
3306e69a8e Merge branch Master 2020-01-21 18:15:52 +04:00
Harrys Ravalomanana
bcc05fc543 PHRAS-2875 Port of PHRAS-2864 2020-01-21 18:10:28 +04:00
Harrys Ravalomanana
f0063ff257 PHRAS-2875 2020-01-21 12:39:25 +04:00
Harrys Ravalomanana
04c3830c2a PHRAS-2875 Workzone refacto #time 8h 2020-01-20 18:56:42 +04:00
Harrys Ravalomanana
eff9b3e7b9 Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-20 11:08:20 +04:00
Harrys Ravalomanana
bd297b486f PHRAS-2862 Lightbox mobile :video resize #time 4h 2020-01-17 16:56:30 +04:00
Harrys Ravalomanana
0ea9508ce0 PHRAS-2875 upgrade of Phraseanet-production-client 2020-01-16 18:51:25 +04:00
Nicolas Maillat
ee8b0aef0a Merge branch 'master' into PHRAS-2862_Fix_lightbox_mobile_video-resize 2020-01-16 15:06:05 +01:00
Harrys Ravalomanana
8773f4a057 Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-15 15:29:06 +04:00
Harrys Ravalomanana
c43e48a8a6 PHRAS-2861 #comment fix Basket preference #time 3h 2020-01-15 15:24:16 +04:00
Harrys Ravalomanana
937b9b4c59 PHRAS-2862 #comment Fix lightbox mobile : video resize #time 3h 2020-01-14 16:56:40 +04:00
jygaulier
b6fa28276d Merge branch 'master' into PHRAS-2757_print-feedback_4.1 2020-01-09 20:33:11 +01:00
Jean-Yves Gaulier
32fbf049cf PHRAS-2757_print-feedback_4.1 
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
 2020-01-09 20:31:09 +01:00
Nicolas Maillat
3aeb627d43 Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-08 14:03:13 +01:00
Nicolas Maillat
b23ad7456b Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video 2020-01-08 14:02:44 +01:00