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,112 Commits 268 Branches 107 Tags
6467d52fd6c605ccd86cc025f5814dd9c9749189
Commit Graph

350 Commits

Author SHA1 Message Date
nmaillat
6467d52fd6 roolback zmq by pecl stop using ondrej 2018-02-16 16:55:42 +01:00
Mike Ng
cee867d662 port PHRAS-1319 to 4.1 2018-02-12 11:31:37 +04:00
Xavier Rousset
c16fcdb90c PHRAS-1805 PHRAS-1839 Add yarn setup and make exiftool executable 2018-02-09 12:31:38 +01:00
Mike Ng
9e45fb6686 fix margin on video preview 2018-02-05 17:38:36 +04:00
Nicolas Maillat
06c432535f Merge pull request #2453 from mike-esokia/PHRAS-1746_migration_bower_to_yarn 
PHRAS-1746 migration bower to yarn
 2018-01-30 15:08:14 +01:00
Mike Ng
fb6cbd20d7 update i18next and qunitjs dependencies 2018-01-25 16:40:36 +04:00
Mike Ng
c3a695b732 remove bower and fixed modernizr dependency 2018-01-24 15:10:33 +04:00
Mike Ng
20c7c800e7 migrate i18next lib to npm 2018-01-19 17:00:51 +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
Jean-Yves Gaulier
1585f829b6 PHRAS-1823_grant-phraseanet_MASTER 
fix : give "grant" privilege to phraseanet user
 2018-01-18 12:10:22 +01:00
jygaulier
ef7d30ef41 PHRAS-1817_java-provisioning_MASTER (#2440) 
change provisioning from oracle to openjdk
 2018-01-17 16:51:26 +01:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +04:00
moctardiouf
81e6ffaac4 fix : remove comments from the playbook 2018-01-12 16:33:31 +01:00
Moctar
48ebfa0541 PHRAS-1800 : add ffmpeg compilation and version as variable 2018-01-12 15:22:28 +01:00
Moctar
36e4b97f93 PHRAS-1794 and PHRAS-1804 : fix pecl-packages and node version 2018-01-12 12:56:53 +01:00
Xavier Rousset
60c43ece93 PHRAS-1790 Export repository url on vars, fix rabbitmq issue 2018-01-10 19:42:33 +01:00
jygaulier
6e89b93c7d PHRAS-1765 (#2398) 
bump es to 2.3.3
 2018-01-10 15:09:30 +01:00
xrousset78800
215e47fb79 PHRDPL-28 Export xdebug IDEKEY and port to an easy setting of debug configuration (#2430) 2018-01-09 18:25:51 +01:00
xrousset78800
9a5f4f3d1b PHRDPL-27 Fix typo on ansible php task (#2428) 2018-01-09 17:54:10 +01: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
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
6235b9051b Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 2018-01-08 17:27:43 +04:00
Mike Ng
9fb7af78f5 redump locales 2018-01-08 17:26:14 +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
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
Nicolas Maillat
aa2a9f5681 Merge pull request #2389 from mike-esokia/PHRAS-1748_fix_help_menu 
PHRAS-1748: fix dropdown on help-menu
 2018-01-08 12:15:31 +01:00
Nicolas Maillat
7b4dcec274 Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593 
PHRAS-1736 port PHRAS-165 and PHRAS-1593
 2018-01-08 12:12:20 +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
Xavier Rousset
49e8efe96b Update php5enmod to phpenmod to enable zmq 2017-12-29 16:47:00 +01:00
Mike Ng
1aa919cc08 porting PHRAS-1589 to 4.1 2017-12-22 16:04:02 +04:00
Mike Ng
53b8ca4087 Porting PHRAS-1586/PHRAS-1602 to 4.1 2017-12-22 11:15:17 +04:00
jygaulier
0d7c2bd52d PHRAS-1760_Provisionning-error_Master (#2396) 
fix mismatch "database" (bad) -> "appbox_db" (good) variable in ansible scripts
 2017-12-14 11:15:07 +01: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
Jennifer
be811e8876 Translated using Weblate (French) 
Currently translated at 98.2% (2319 of 2360 strings)

PHRAS-1749
 2017-11-24 16:55:54 +01:00