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,368 Commits 268 Branches 107 Tags
6086920c9c6bbadb0040f125b37cbed3317cda17
Commit Graph

12368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Ng
6086920c9c update breakpoint and modify ui of search bar 2018-06-06 11:53:27 +04:00
Nicolas Maillat
109cda896d Merge pull request #2629 from aynsix/PHRAS-1875-advancedsearch-updated-on 
PHRAS-1875 port to 4.1 advanced search sort by updated_on
 2018-06-05 17:21:57 +02: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
Nicolas Maillat
52a753d0cb Merge pull request #2625 from mike-esokia/PHRAS-2083_bump_dialog_admin 
PHRAS-2083 bump dialog admin
 2018-06-01 21:56:13 +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
Nicolas Maillat
dbd179c003 Merge pull request #2622 from aynsix/PHRAS-2065-port-1730 
PHRAS-2065 port PHRAS-1730 to 4.1: dispatch record.edit event
 2018-06-01 09:45:09 +02:00
mike-esokia
3d50c59e89 add download function 
refactored code of personalisation logo section
wip - file upload
 2018-06-01 11:29:09 +04:00
Nicolas Maillat
0f61063684 Merge pull request #2620 from aynsix/PHRAS-2062-port-2061 
PHRAS-2062 port 2061 authorize with providers
 2018-05-31 17:20:34 +02: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
cb8fc19ff6 Translated using Weblate (French) 
Currently translated at 95.1% (2302 of 2419 strings)
 2018-05-31 10:09:28 +02:00
Nicolas Maillat
32740b3c29 Translated using Weblate (English) 
Currently translated at 98.0% (2371 of 2419 strings)
 2018-05-31 10:09:27 +02: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
aina-esokia
3233e66c03 port PHRAS-1730 to 4.1: dispatch record.edit event 2018-05-30 11:53:09 +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
aina-esokia
ff67cd5ac6 port authorize with providers 2018-05-29 17:47:19 +04: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