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

366 Commits

Author SHA1 Message Date
Harrys Ravalomanana
c2f55eb8ba PHRAS-2668 #comment fix twig error #time 1h 2019-07-16 15:12:26 +04:00
Harrys Ravalomanana
4902620347 PHRAS-2544 #comment save skin preference #time 1h 2019-07-03 15:33:23 +04:00
Nicolas Maillat
2ca1afe0ed Merge branch 'master' into PHRAS-2608_Prod_Fix_responsive_custom_link 2019-06-03 13:15:41 +02:00
Nicolas Maillat
aa584c97e8 Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1 2019-06-03 11:54:54 +02:00
Harrys Ravalomanana
45a649245f PHRAS-2608 #comment remove custom link when user is not connected #time 1h 2019-06-03 13:33:59 +04:00
Harrys Ravalomanana
0e4e5782aa PHRAS-2608 #time 2h 2019-05-31 10:21:00 +04:00
Harrys Ravalomanana
1eda490e65 PHRAS-2608 #comment Fix custom-link of nav-bar on responsive, hide the Navigation bar if there is no sub menu #time 2h 2019-05-28 15:30:10 +04:00
Jean-Yves Gaulier
77e262bad0 PHRAS-2581_twig-macro-explode_4.1 
explode commmon/macros.html.twig in 3 files for 3 macros
 2019-05-16 17:27:40 +02:00
aina-esokia
158e3eb2df port fix preview pdf in pdfjs 2019-01-10 18:29:47 +04:00
aina-esokia
c3486f9b8e allow svg logo and change gabari 2018-08-31 16:10:19 +04:00
aina-esokia
5dba9f64dd add personalisation logo 2018-08-29 15:11:04 +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
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-esokia
9cf012a4a9 fix custom links on navigation bar 2018-05-29 10:23:28 +04:00
mike-esokia
252149899f convert navigation menu to dropdown on small screen 2018-05-28 14:20:41 +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
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
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
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
mike-esokia
5a4de4750c PORT PHRAS-1681 to 4.1 2018-05-16 16:34:42 +04:00
mike-esokia
ad201ae1c2 fix preview ratio when zooming in detail screen 2018-04-19 16:16:37 +04:00
Mike Ng
e4689a180b fix conflict with jquery-ui lib 2018-03-27 15:01:47 +04:00
Mike Ng
c988993700 add jquery lib for permalink preview 2018-03-27 11:08:34 +04:00
Mike Ng
ded2b5665a fix geoname autocomplete field and disable chrome autofill 2018-03-23 16:16:48 +04:00
Nicolas Maillat
555975d6f4 Merge pull request #2526 from mike-esokia/PHRAS-1924_download_assets_nok_revert 
PHRAS-1924 fix error with jquery on download assets page
 2018-03-20 10:19:34 +01:00
Mike Ng
3cdaf5400f fix issue with video preview 2018-03-20 12:03:28 +04:00
Mike Ng
2be731fede fix error with jquery on download assets page 2018-03-19 18:05:27 +04:00
mike-esokia
9943daffe9 display record of type video in order list (#2514) 2018-03-15 17:12:29 +01:00
Mike Ng
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
4c11cfebd8 Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 2018-01-09 09:50:57 +04:00
Mike Ng
2c75dc654f Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 
# 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
 2018-01-09 09:50:27 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +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
Mike Ng
1aa919cc08 porting PHRAS-1589 to 4.1 2017-12-22 16:04:02 +04:00
Mike Ng
e6d8169e49 porting PHRAS-1641 to 4.1 2017-12-22 13:21:57 +04:00
Mike Ng
55587ca6cf fix infoDialog 
add button to display git log
 2017-12-12 13:31:48 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Mike Ng
7e2ce67e96 Merge branch 'master-alchemy' into PHRAS-1714_refacto_order_manager 2017-11-21 15:15:47 +04:00
Mike Ng
1e56eef3c6 wip - porting BDC 2017-11-21 10:06:10 +04:00