Xavier Rousset
|
edfbce97e3
|
Remove ignore-platform-reqs option on makefile composer setup
|
2018-02-09 15:56:43 +01:00 |
|
aynsix
|
30755e9c46
|
PHRAS-1840-FIX-searchengine:index -p (#2456)
* FIX searchengine:index -p populate
* delete character nul of the metadata value
|
2018-02-06 14:21:25 +01:00 |
|
Nicolas Maillat
|
9832871327
|
Merge pull request #2460 from mike-esokia/PHRAS-1846_fix_video_preview
PHRAS-1846 fix video preview (pr in production-client and phraseanet-common)
|
2018-02-06 14:20:52 +01:00 |
|
Mike Ng
|
704f406a2b
|
fix package-lock.json
|
2018-02-06 11:56:48 +04:00 |
|
Mike Ng
|
79412cfba2
|
add missing package
|
2018-02-06 11:22:17 +04:00 |
|
xrousset78800
|
e86a4ede6c
|
PHRAS-1852 Add ignore-platform-reqs option on composer install to allow php7 env to run makefile (#2459)
|
2018-02-05 17:25:44 +01:00 |
|
Mike Ng
|
9e45fb6686
|
fix margin on video preview
|
2018-02-05 17:38:36 +04:00 |
|
Nicolas Maillat
|
7ee2b919ac
|
Merge pull request #2457 from mike-esokia/PHRAS-1847_backbone_error
PHRAS-1847 - refactored code for backbone.js and underscore.js
|
2018-02-05 14:19:53 +01:00 |
|
Mike Ng
|
1337a6994f
|
refactored code to use newer version of backbone.js and underscore.js
|
2018-02-05 16:14:13 +04:00 |
|
aynsix
|
df85aa8827
|
PHRAS-1797 porting searchengine:index to 4.1 (#2454)
* portage commande searchengine:index vers 4.1
* FIX Indexer
* Update DataboxFetcherFactory.php
|
2018-01-30 18:50:57 +01: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
|
60f734df6e
|
update dependencies and add yarn
|
2018-01-26 17:35:58 +04:00 |
|
Mike Ng
|
fb6cbd20d7
|
update i18next and qunitjs dependencies
|
2018-01-25 16:40:36 +04:00 |
|
Mike Ng
|
9b39865ede
|
fix zxcvbn lib and reverted jquery
|
2018-01-25 15:29:49 +04:00 |
|
Mike Ng
|
c3a695b732
|
remove bower and fixed modernizr dependency
|
2018-01-24 15:10:33 +04:00 |
|
Mike Ng
|
9cfd8349ce
|
revert production-client
|
2018-01-19 17:01:45 +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 |
|
Nicolas Maillat
|
10e1c4c023
|
Merge pull request #2442 from jygaulier/PHRAS-1823_grant-phraseanet_MASTER
PHRAS-1823_grant-phraseanet_MASTER
|
2018-01-18 17:45:38 +01: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 |
|
Nicolas Maillat
|
f52a7eb96d
|
Merge pull request #2439 from xrousset78800/fix/PHRAS-1816-fix-typo-on-exception-message
PHRAS-1816 Fix exception message
|
2018-01-17 17:38:17 +01:00 |
|
jygaulier
|
ef7d30ef41
|
PHRAS-1817_java-provisioning_MASTER (#2440)
change provisioning from oracle to openjdk
|
2018-01-17 16:51:26 +01:00 |
|
Xavier Rousset
|
30e4fa767c
|
PHRAS-1816 Fix exception message
|
2018-01-17 14:08:13 +01:00 |
|
Mike Ng
|
431d9dc46a
|
migrating dependencies from bower to npm
|
2018-01-16 09:42:29 +04:00 |
|
Nicolas Maillat
|
3de379b8a6
|
Merge pull request #2436 from alchemy-fr/fix-composer-dependencies
PHRAS-1805 PHRAS-1718 fix composer dependencies
|
2018-01-12 18:33:10 +01:00 |
|
Moctar
|
2369394c8c
|
PHRAS-1805 PHRAS-1268 fix composer dependencies
|
2018-01-12 17:57:31 +01:00 |
|
moctardiouf
|
81e6ffaac4
|
fix : remove comments from the playbook
|
2018-01-12 16:33:31 +01:00 |
|
Nicolas Maillat
|
dad484fa5b
|
Merge pull request #2435 from alchemy-fr/fix-provisionning-master
PHRAS-1794 PHRAS-1800 and PHRAS-1804 : fix pecl-packages and node version
|
2018-01-12 16:16:15 +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 |
|
Nicolas Maillat
|
06413e9f9c
|
Merge pull request #2432 from xrousset78800/fix/PHRAS-1790-update-provisionning
PHRAS-1790 Export repository url on vars, fix rabbitmq issue
|
2018-01-10 23:31:31 +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 |
|
Nicolas Maillat
|
8b26abdd77
|
Merge pull request #2419 from mike-esokia/PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336
PHRAS-1744 porting PHRAS-1578 PHRAS-1579 PHRAS-1621 PHRAS-1675 PHRAS-1404 PHRAS-…
|
2018-01-09 11:15:14 +01:00 |
|
Nicolas Maillat
|
1c7b14802c
|
Merge pull request #2413 from mike-esokia/PHRAS-1734_PORT_PHRAS-1589
PHRAS-1734 porting PHRAS-1589 to 4.1
|
2018-01-09 11:13:23 +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
|
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 |
|
Nicolas Maillat
|
655352e199
|
Merge pull request #2390 from mike-esokia/PHRAS-1735_add_git_log
PHRAS-1735 Porting PHRAS-1591 to 4.1
|
2018-01-08 14:48:58 +01:00 |
|
Nicolas Maillat
|
a1b48997a8
|
Merge pull request #2386 from mike-esokia/PHRAS-1745_PORT_custom_links
Porting custom-links to 4.1
|
2018-01-08 14:48:31 +01: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 |
|