hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,516 Commits 268 Branches 107 Tags
ee8b0aef0a8405a9800ddb4c0f944bde9af4cd88
Commit Graph

2316 Commits

Author SHA1 Message Date
Nicolas Maillat
87dc60b440 Merge pull request #2627 from mike-esokia/PHRAS-2079_design_personalisation_logo 
PHRAS-2079 refactor function to upload image file to server
 2018-06-05 12:50:48 +02:00
Mike Ng
233e6f2a6e add breakpoint for small display on custom links and account 
make width of dialog dynamic
 2018-06-05 14:28:17 +04:00
Mike Ng
0a85145ad2 refactor dialog for subdef creation and new user 2018-06-04 17:27:31 +04:00
Mike Ng
acefc8ab19 refactor function to upload image file to server 2018-06-04 10:14:28 +04:00
Nicolas Maillat
cd491aae57 Merge pull request #2626 from mike-esokia/PHRAS-2079_design_personalisation_logo 
PHRAS-2079 design personalisation logo
 2018-06-01 21:56:44 +02:00
mike-esokia
275730c3fb wip file upload 2018-06-01 17:19:05 +04:00
Mike Ng
18d08994b2 refactor dialog for subdef creation and new user 2018-06-01 15:33:06 +04:00
Mike Ng
5fbe76e6e4 refactor dialog of add user template 2018-06-01 13:22:54 +04:00
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
aina-esokia
ff67cd5ac6 port authorize with providers 2018-05-29 17:47:19 +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
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
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
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
mike-esokia
70c12a7086 add validation for special characters in statusbit screen 2018-05-23 11:11:21 +04:00
mike-esokia
1981acf194 show display name in menu bar if exist 2018-05-21 11:28:25 +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
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
mike-esokia
1fa415a252 Fix focus on input field on thesaurus dialog 2018-05-18 13:13:07 +04:00
mike-esokia
a724ac9d8b translate remember me text 2018-05-17 10:45:36 +04:00
mike-esokia
5a4de4750c PORT PHRAS-1681 to 4.1 2018-05-16 16:34:42 +04:00
mike-esokia
ccb3a88fe8 memorizing enable and disable status of facets 2018-05-15 17:41:01 +04:00
mike-esokia
11e4f18127 add scroll for webkit 2018-05-11 13:08:05 +04:00
mike-esokia
d6e53ef104 fix ui and dialog lightbox mobile version 2018-05-11 10:50:43 +04:00
mike-esokia
b07f5aa07f add functionality to navigate between records in mobile version of lightbox 2018-05-10 11:57:08 +04:00
mike-esokia
43e5f89d2e fix jquery-mobile and mobile layout for lightbox 2018-05-08 13:39:22 +04:00
mike-esokia
2c39cf503a refactor suggested values in edit view 2018-05-07 14:14:46 +04:00
xrousset78800
81b3e75d3d PHRAS-2007 Update wording keys (#2566) 2018-05-02 18:40:32 +02:00
mike-esokia
ad201ae1c2 fix preview ratio when zooming in detail screen 2018-04-19 16:16:37 +04:00
mike-esokia
ccd10333b7 fix slideshow functionality in detail screen 2018-04-19 14:58:18 +04:00
Nicolas Maillat
d86aaa4f9e Merge pull request #2547 from mike-esokia/PHRAS-1936_video_editor_chapters 
PHRAS-1936 save overlapChapters in video editor in preferences
 2018-04-13 11:46:09 +02:00
mike-esokia
0b80150f01 save overlapChapters in video editor in preferences 2018-04-13 11:47:00 +04:00
aina-esokia
e8f9e9a883 position technical data to positive negative value 2018-04-12 09:48:09 +04:00