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,330 Commits 268 Branches 107 Tags
9cf012a4a91d8a779ba6487695b393b75d1e0038
Commit Graph

168 Commits

Author SHA1 Message Date
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
Nicolas Maillat
684596106d Merge pull request #2393 from xrousset78800/PHRAS-1719/add-subset-presets-on-4-1 
PHRAS-1719 Add presets selection on subdef admin page | Port to 4.1 PHRAS-1317
 2018-01-08 12:18:14 +01:00
Nicolas Maillat
08dfc7c8ea Merge pull request #2391 from mike-esokia/PHRAS-1743_refactor_icons_type 
PHRAS-1743 Port PHRAS-1646 to 4.1 (PR production-client)
 2018-01-08 12:17:17 +01:00
Mike Ng
071ce25b31 porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1 2018-01-03 15:26:43 +04:00
Mike Ng
53b8ca4087 Porting PHRAS-1586/PHRAS-1602 to 4.1 2017-12-22 11:15:17 +04:00
Mike Ng
d49ef51a9a add images 2017-12-14 11:32:30 +04:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00
Mike Ng
a099ec33f3 modify icons for document types 2017-12-12 15:13:55 +04:00
Mike Ng
55587ca6cf fix infoDialog 
add button to display git log
 2017-12-12 13:31:48 +04:00
Mike Ng
847c302863 add images 2017-12-12 12:06:20 +04:00
Mike Ng
5f2ce74956 fix context-menu help 2017-12-12 11:56:49 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Mike Ng
36b2058add PORT PHRAS-1555/PHRAS-1568 to 4.1 2017-11-22 15:48:36 +04:00
Mike Ng
db306792a6 Merge branch 'master-alchemy' into PHRAS-1512_PORT_PDFJS_TO_4.1 2017-11-17 08:44:45 +04:00
Mike Ng
8f8d9bb706 Merge branch 'master-alchemy' into PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457 2017-11-15 11:23:51 +04:00
Nicolas Maillat
43a629169a Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339 
PHRAS-1516 Port PHRAS-1339
 2017-11-14 14:05:10 +01:00
Mike Ng
9ed6a0210f Porting PHRAS-1434, PHRAS-1435, PHRAS-1436, PHRAS-1437, PHRAS-1457 to 4.1 2017-08-21 14:34:53 +04:00
Mike Ng
a0cad9ec8f Fix localization in datepicker - admin 2017-08-14 10:26:52 +04:00
Mike Ng
87ac6c3e06 Refactor layout of thumbnails in lightbox 2017-08-11 15:23:48 +04:00