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
12,324 Commits 268 Branches 107 Tags
acb7a53e16a99d8597cfd1ddf784d0db68a0bf9d
Commit Graph

12324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mike-esokia
acb7a53e16 refactor code 2018-05-24 16:43:17 +04:00
Mike Ng
9183bdb6c5 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-859_validation_special_characters_status 2018-05-24 15:25:51 +04:00
Nicolas Maillat
50feb78c12 Merge pull request #2606 from mike-esokia/PHRAS-2053_PORT_PHRAS_2051_to_4.1 
PHRAS-2053 port PHRAS-2051 to 4.1
 2018-05-23 20:04:32 +02:00
Nicolas Maillat
5c30bde3d6 Merge pull request #2605 from aynsix/PHRAS-1967-port-1951-import-from-file 
PHRAS-1967 port to 4.1 Admin / Users / Import from file (csv or rtf)
 2018-05-23 20:04:14 +02:00
mike-esokia
04a0f56b4d Add PHRAS-1539 2018-05-23 17:15:56 +04:00
mike-esokia
f8fb8837cb wip restore hightlights and multivalue seperator 2018-05-23 17:00:15 +04:00
aina-esokia
339de4399b port to 4.1 fix user cvs file import error on windows 2018-05-23 15:43:16 +04:00
Nicolas Maillat
58633a2e30 Merge pull request #2604 from aynsix/PHRAS-1562-print-caption 
PHRAS-1562 add Export/ print caption
 2018-05-23 13:41:32 +02:00
Nicolas Maillat
2081e21dba Merge pull request #2601 from mike-esokia/PHRAS-1122_menu_displayname 
PHRAS-1122 Show display name in menu bar if exist
 2018-05-23 13:41:19 +02:00
aina-esokia
b6ed165dd5 add print caption 2018-05-23 15:09:06 +04:00
Nicolas Maillat
53ba8c1361 Merge pull request #2602 from mike-esokia/PHRAS-2053_PORT_PHRAS_2051_to_4.1 
PHRAS-2053 port PHRAS 2051 to 4.1
 2018-05-23 11:11:55 +02:00
mike-esokia
70c12a7086 add validation for special characters in statusbit screen 2018-05-23 11:11:21 +04:00
Nicolas Maillat
d6ff62a095 Merge pull request #2597 from jygaulier/PHRAS-2009_Geo-operator_MASTER 
PHRAS-2009_Geo-operator_MASTER
 2018-05-21 13:26:33 +02:00
mike-esokia
1981acf194 show display name in menu bar if exist 2018-05-21 11:28:25 +04:00
mike-esokia
6a323a3189 add trim before matching value to regex 2018-05-21 11:23:43 +04:00
mike-esokia
816cd4f20b resolve conflict 2018-05-21 11:11:50 +04:00
mike-esokia
12fc9344d4 show hex as icon in technical data 2018-05-18 17:36:19 +04:00
Nicolas Maillat
44b618ac2d Merge pull request #2598 from mike-esokia/PHRAS-1051_fix_delete_icon_status 
PHRAS-1051 fix delete function for status icons
 2018-05-18 12:36:01 +02:00
Nicolas Maillat
f423e2c5ca Merge pull request #2599 from mike-esokia/PHRAS-1565_thesaurus_input_field 
PHRAS-1565 Fix focus on input field on thesaurus dialog
 2018-05-18 12:27:42 +02:00
Nicolas Maillat
49f1cc6bca Merge pull request #2594 from mike-esokia/PHRAS-1707_PORT_PHRAS-1681 
PHRAS-1707 PORT PHRAS-1681 to 4.1
 2018-05-18 12:24:24 +02:00
Nicolas Maillat
f996c03fdc Merge pull request #2595 from mike-esokia/PHRAS-1163_translate_login_page 
PHRAS-1163 fix translation of text on login page
 2018-05-18 12:04:29 +02:00
mike-esokia
1fa415a252 Fix focus on input field on thesaurus dialog 2018-05-18 13:13:07 +04:00
mike-esokia
ecced3d583 fix delete icon function on status 2018-05-18 10:40:10 +04:00
Jean-Yves Gaulier
1e64eb7a42 PHRAS-2009_Geo-operator_MASTER 
add the "geolocation="lat lon distance" query
 2018-05-17 21:13:28 +02:00
mike-esokia
a724ac9d8b translate remember me text 2018-05-17 10:45:36 +04:00
Nicolas Maillat
1dcc579cfe Merge pull request #2593 from mike-esokia/PHRAS-859_edit_status_admin_bug 
PHRAS-859 fix bug with special characters in status label
 2018-05-17 00:27:39 +02:00
mike-esokia
5a4de4750c PORT PHRAS-1681 to 4.1 2018-05-16 16:34:42 +04:00
Nicolas Maillat
0358aa8282 Merge pull request #2592 from mike-esokia/PHRAS-2044_invert_toggle_icon 
PHRAS-2044 add icons for filter inverse buttons
 2018-05-16 13:04:48 +02:00
mike-esokia
8e71c52c7e fix bug with special characters in status label 2018-05-16 15:00:14 +04:00
mike-esokia
ed80ae223a add icons for filter inverse buttons 2018-05-16 13:58:48 +04:00
Nicolas Maillat
dcd986e772 Merge pull request #2591 from mike-esokia/PHRAS-2040_save_facets_preferences 
PHRAS-2040 memorizing enable and disable status of facets
 2018-05-15 21:45:28 +02:00
mike-esokia
ccb3a88fe8 memorizing enable and disable status of facets 2018-05-15 17:41:01 +04:00
Nicolas Maillat
1eba9920b5 Merge pull request #2589 from aynsix/PHRAS-1999-build-preview-indesign-document 
PHRAS-1999 Core / Build Preview for indesign document
 2018-05-14 22:41:21 +02:00
Nicolas Maillat
40f95b7976 Merge pull request #2588 from mike-esokia/PHRAS-2037_mobile_home_phraseanet 
PHRAS-2037 fix responsive ui of login page
 2018-05-14 22:13:39 +02:00
aina-esokia
65d5c15623 build preview and thumbnail for indesign document 2018-05-14 11:47:32 +04:00
mike-esokia
7720a57a57 fix responsive ui of login page 2018-05-14 10:49:56 +04:00
Nicolas Maillat
a3c07056c3 Merge pull request #2587 from mike-esokia/PHRAS-2034_fix_ui_lightbox_mobile 
PHRAS-2034 add scroll for webkit
 2018-05-11 14:47:21 +02:00
mike-esokia
015cb0313a fix css class for button 2018-05-11 13:15:43 +04:00
mike-esokia
11e4f18127 add scroll for webkit 2018-05-11 13:08:05 +04:00
Nicolas Maillat
07da4872f5 Merge pull request #2586 from mike-esokia/PHRAS-2034_fix_ui_lightbox_mobile 
PHRAS-2034 fix ui and dialog lightbox mobile version
 2018-05-11 09:33:15 +02:00
mike-esokia
d6e53ef104 fix ui and dialog lightbox mobile version 2018-05-11 10:50:43 +04:00
Nicolas Maillat
39d86ef260 Merge pull request #2582 from aynsix/PHRAS-2031-porting-Add-xmpmm-documentId 
PHRAS-2031 Port to 4.1 - Add XmpMM:DocumentID source
 2018-05-10 11:01:33 +02:00
Nicolas Maillat
7b4104413f Merge pull request #2583 from aynsix/PHRAS-2032-porting-api-route-me-collections 
PHRAS-2032 port to 4.1 api route me/collections
 2018-05-10 11:01:16 +02:00
Nicolas Maillat
ac2d86c3fc Merge pull request #2584 from mike-esokia/PHRAS-2030_nav_between_records 
PHRAS-2030 add functionality to navigate between records in mobile version of lightbox
 2018-05-10 11:00:32 +02:00
mike-esokia
b07f5aa07f add functionality to navigate between records in mobile version of lightbox 2018-05-10 11:57:08 +04:00
aina-esokia
d86fd39380 port to 4.1 api route me/collections 2018-05-10 10:58:14 +04:00
aina-esokia
cf41426095 add to 4.1 XmpMM:DocumentID source 2018-05-10 10:16:59 +04:00
Nicolas Maillat
36968069c1 Merge pull request #2581 from aynsix/PHRAS-1976-use-composite-datasource 
PHRAS-1976 use composite datasource
 2018-05-09 13:49:06 +02:00
aina-esokia
fe78796db6 update alchemy/mediavorus 2018-05-09 14:59:52 +04:00
Nicolas Maillat
d102f5c59a Merge pull request #2559 from mike-esokia/PHRAS-2005_PORT_PHRAS-1996_to_4.1 
PHRAS-2005 PORT PHRAS-1996 to 4.1
 2018-05-09 12:37:51 +02:00