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,545 Commits 268 Branches 107 Tags
5b38565e1ad2cb9a90900e132c142d9ac3d42d69
Commit Graph

2326 Commits

Author SHA1 Message Date
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
Mike Ng
bc103637cd wip - refactor ui of push screen 2018-06-14 17:25:38 +04:00
Mike Ng
684070a3ef rename placeholders for delete buttons 2018-06-13 16:51:04 +04:00
Mike Ng
def58e35ac add action to delete element from basket 2018-06-13 13:53:34 +04:00
Mike Ng
dff837fede refactor basket and story dropdown menu 2018-06-12 15:46:02 +04:00
Mike Ng
30004d996b refactor notification on mobile version 2018-06-07 16:49:31 +04:00
mike-esokia
3f91e725d5 update breakpoint and modify ui of search bar 2018-06-06 16:28:09 +04:00
Mike Ng
6086920c9c update breakpoint and modify ui of search bar 2018-06-06 11:53:27 +04:00
aina-esokia
0bc95e1d0e port to 4.1 advanced search sort by updated_on 2018-06-05 17:07:16 +04:00
Nicolas Maillat
1fea787489 Merge pull request #2628 from mike-esokia/PHRAS-2078_breakpoint_customlink_account 
PHRAS-2078 breakpoint customlink account
 2018-06-05 12:51:06 +02:00
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