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,349 Commits 268 Branches 107 Tags
3d50c59e89dfe0420d95f7615c9ece12863696d9
Commit Graph

12349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mike-esokia
3d50c59e89 add download function 
refactored code of personalisation logo section
wip - file upload
 2018-06-01 11:29:09 +04:00
mike-esokia
4d96feaf28 create form for uploading logo 
refactor admin setup layout for adding logo personalisation section
 2018-05-31 16:04:10 +04:00
Nicolas Maillat
e7c4034caa Merge pull request #2624 from mike-esokia/PHRAS-2008_add_notice 
PHRAS-2008 refactor notice on mapboxgl map and add title to dialog
 2018-05-30 14:25:18 +02:00
Mike Ng
57c7f2ac09 refactor notice on mapboxgl map and add title to dialog 2018-05-30 16:11:24 +04:00
Nicolas Maillat
9e29c2a75e Merge pull request #2619 from mike-esokia/PHRAS-2008_add_notice 
PHRAS-2008 add notice on mapboxgl
 2018-05-29 16:23:22 +02:00
Nicolas Maillat
4e747f23e5 Merge branch 'master' into PHRAS-2008_add_notice 2018-05-29 15:56:12 +02:00
Nicolas Maillat
31c2d7f408 Translated using Weblate (English) 
Currently translated at 98.2% (2373 of 2416 strings)
 2018-05-29 15:30:20 +02:00
mike-esokia
b86eaf7ed3 add notice on mapboxgl 2018-05-29 16:51:14 +04:00
Nicolas Maillat
cbcf1f2d02 Translated using Weblate (English) 
Currently translated at 98.0% (2368 of 2416 strings)
 2018-05-29 14:47:48 +02:00
Nicolas Maillat
cce12398dd Merge pull request #2618 from aynsix/PHRAS-2041-port-1657 
PHRAS-2041 port to 4.1 session.cookie_secure message
 2018-05-29 14:47:44 +02:00
Nicolas Maillat
3792bd2a3d Merge pull request #2617 from aynsix/PHRAS-1902-port-1774 
PHRAS-1902 port 1774 better agregate to 4.1
 2018-05-29 14:47:32 +02:00
aina-esokia
1cf9bcd6b4 port to 4.1 session.cookie_secure message 2018-05-29 16:07:42 +04:00
aina-esokia
93ad45dd91 port better agregate to 4.1 2018-05-29 15:25:42 +04:00
Nicolas Maillat
a01f778e03 Merge pull request #2616 from mike-esokia/PHRAS-2055_breakpoint_navigation_bar 
PHRAS-2055 fix custom links on navigation bar
 2018-05-29 11:39:50 +02:00
mike-esokia
9cf012a4a9 fix custom links on navigation bar 2018-05-29 10:23:28 +04:00
Nicolas Maillat
1a860b4978 Merge pull request #2614 from mike-esokia/PHRAS-2055_breakpoint_navigation_bar 
PHRAS-2055 convert navigation menu to dropdown on small screen
 2018-05-28 15:53:56 +02:00
Nicolas Maillat
547210e905 Merge pull request #2613 from xrousset78800/fix/update-wording-key 
PHRAS-2007 Update wordings key
 2018-05-28 15:53:37 +02:00
mike-esokia
c45fed3fd0 remove checkbox style 2018-05-28 14:23:49 +04:00
mike-esokia
252149899f convert navigation menu to dropdown on small screen 2018-05-28 14:20:41 +04:00
Xavier Rousset
2f21a850e4 PHRAS-2007 Update wordings key 2018-05-28 12:02:16 +02:00
Nicolas Maillat
cc9d3df550 Merge pull request #2612 from mike-esokia/PHRAS-2064_fix_collection_order 
PHRAS-2064 fix reordering of collections from admin interface
 2018-05-28 10:21:26 +02:00
mike-esokia
c313c5316a fix reordering of collections from admin interface 2018-05-28 11:03:10 +04:00
Nicolas Maillat
6527c8c9f7 Merge pull request #2609 from mike-esokia/PHRAS-859_validation_special_characters_status 
PHRAS-859 validation on special characters in status
 2018-05-24 18:23:44 +02:00
Nicolas Maillat
35f1639acb Merge pull request #2608 from aynsix/PHRAS-2057-porting-ordre-collection 
PHRAS-2057 port to 4.1 admin/ordre des collections
 2018-05-24 18:23:01 +02:00
mike-esokia
acb7a53e16 refactor code 2018-05-24 16:43:17 +04:00
aina-esokia
eab0bd22e5 port to 4.1 admin/ordre des collections 2018-05-24 16:06:15 +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