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,487 Commits 268 Branches 107 Tags
c7a286eb8a6b3eea0f86485954e99725cf276bd4
Commit Graph

186 Commits

Author SHA1 Message Date
Filip Vilic
c7a286eb8a refactoring list manager 2018-07-30 11:16:13 +02:00
Mike Ng
71e15d6b63 update package.json 2018-06-19 14:18:57 +04:00
Mike Ng
83c6dbe1a7 wip - refactor ui of push screen and dialogs 2018-06-15 17:25:46 +04:00
Mike Ng
bc103637cd wip - refactor ui of push screen 2018-06-14 17:25:38 +04:00
Mike Ng
def58e35ac add action to delete element from basket 2018-06-13 13:53:34 +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
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
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
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 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
Mike Ng
57c7f2ac09 refactor notice on mapboxgl map and add title to dialog 2018-05-30 16:11:24 +04:00
mike-esokia
b86eaf7ed3 add notice on mapboxgl 2018-05-29 16:51:14 +04:00
mike-esokia
9cf012a4a9 fix custom links on navigation bar 2018-05-29 10:23:28 +04: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
mike-esokia
ed80ae223a add icons for filter inverse buttons 2018-05-16 13:58:48 +04:00
mike-esokia
7720a57a57 fix responsive ui of login page 2018-05-14 10:49:56 +04:00
mike-esokia
015cb0313a fix css class for button 2018-05-11 13:15:43 +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
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
mike-esokia
43e5f89d2e fix jquery-mobile and mobile layout for lightbox 2018-05-08 13:39:22 +04:00
mike-esokia
e454f625e1 add icon for indesign file format 2018-04-30 15:38:02 +04:00
Mike Ng
6776a28684 add resources for PHRAS-1954 2018-04-16 11:08:41 +04:00
mike-esokia
3b3eb50ae7 update video editor icon in toolbar 2018-04-11 17:14:41 +04:00
Mike Ng
43e09e99b2 add roboto fonts and gulp tasks 
remove unused codes
 2018-04-06 16:38:56 +04:00
Mike Ng
7098165cbe import roboto font via font.googleapis 2018-04-06 11:11:07 +04:00
Mike Ng
f23ac471c4 add js download util function 2018-03-30 16:57:32 +04:00
mike-esokia
329b7b90d5 refactor layout of video tools and dialogs 
resize screenshots
 2018-03-29 14:33:58 +04:00
Mike Ng
3ca5e72d9f fix index layout on lightbox 2018-02-28 12:37:14 +04:00
Mike Ng
04236bdc8a add PHRAS-1703 to 4.1 2018-02-19 11:35:26 +04:00
Mike Ng
9e45fb6686 fix margin on video preview 2018-02-05 17:38:36 +04:00
Mike Ng
374f8eaff4 migrate backbone and underscore to npm and refactored test modules 2018-01-19 15:03:00 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +04:00
Mike Ng
2644962783 Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 2018-01-09 11:01:01 +04:00
Mike Ng
4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss
 2018-01-09 11:00:03 +04:00
Mike Ng
a853ec7d8d Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:28 +04:00
Mike Ng
3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:28 +04:00
Mike Ng
8908a6b23f Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:00 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
095580bc64 Merge pull request #2411 from mike-esokia/PHRAS-1728_update_favicon 
PHRAS-1728 Porting PHRAS-1586/PHRAS-1602 to 4.1
 2018-01-08 12:23:41 +01:00
Nicolas Maillat
f720b3d073 Merge pull request #2395 from mike-esokia/PHRAS-1738_update_menu_basket 
Phras 1738 PORT PHRAS-1614
 2018-01-08 12:20:59 +01:00