Commit Graph

12135 Commits

Author SHA1 Message Date
aina-esokia
6fd11b630b allow to specify a filename on permalink usage 2018-02-21 11:43:53 +04:00
Nicolas Maillat
66fbf03be6 Merge pull request #2482 from xrousset78800/PHRAS-1882_Add-defeult-value-on-phpvesion
PHRAS-1882 Add default value on phpversion argument
2018-02-20 14:02:47 +01:00
Xavier Rousset
336ef9f0ba PHRAS-1882 Add default value on phpversion argument and force user to pick one of the four Ondrej php version 2018-02-20 13:37:46 +01:00
Nicolas Maillat
a69790ed9e Merge pull request #2414 from xrousset78800/PHRAS-1720/Add-language-selection-on-prod-settings
Port PHRAS-1673 - language selection - to master PHRAS-1720
2018-02-20 13:18:54 +01:00
Nicolas Maillat
4808522150 Merge pull request #2467 from toky-esokia/PHRAS-1752-udpate-facebook-sdk-4.1
udpate facebook SDK to 5.6
2018-02-20 12:50:41 +01:00
KallooaSan
dbaba974ae Add extension to file path on api upload for extension-mapping (#2481) 2018-02-20 11:13:28 +01:00
Nicolas Maillat
e25144e302 Merge pull request #2477 from aynsix/PHRAS-1866-load-metadata-tab-content
PHRAS-1866 load-metadata-tab-content
2018-02-20 11:07:52 +01:00
Nicolas Maillat
815c46ad94 Merge pull request #2480 from mike-esokia/PHRAS-1871_PORT_PHRAS-854
PHRAS-1871 - PORT PHRAS-854 to 4.1
2018-02-19 14:37:50 +01:00
Nicolas Maillat
d730315229 Merge pull request #2479 from mike-esokia/PHRAS-1743_add_PHRAS-1703
PHRAS-1743 add PHRAS-1703 to 4.1
2018-02-19 14:37:35 +01:00
Nicolas Maillat
01b2684f00 Merge pull request #2478 from mike-esokia/PHRAS-1783_update_backend
PHRAS-1783 update backend code for PHRAS-1783
2018-02-19 14:37:19 +01:00
aina-esokia
38d9af6b73 update SubdefsController 2018-02-19 17:19:14 +04:00
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04:00
aina-esokia
d541c22659 Modif subdef 2018-02-19 15:02:44 +04:00
aina-esokia
b36b90a403 Load metadata tab content when tab activate 2018-02-19 14:51:30 +04:00
Mike Ng
04236bdc8a add PHRAS-1703 to 4.1 2018-02-19 11:35:26 +04:00
Mike Ng
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +04:00
Nicolas Maillat
d45c55858f Merge pull request #2476 from xrousset78800/PHRAS-1882_phpversion-passed-in-args-to-vagrant-up
Phpversion is now passed in args to vagrant up function
2018-02-16 19:56:57 +01:00
Xavier Rousset
4b4cecc35d Phpversion is now passed in args to vagrant up function 2018-02-16 19:03:54 +01:00
Nicolas Maillat
b72f145770 Merge pull request #2475 from nmaillat/PHRAS-1880_roolback_setup_zmq_by_pecl
fix yml syntax error
2018-02-16 18:31:05 +01:00
nmaillat
bd415981b7 fix yml syntax error 2018-02-16 18:01:30 +01:00
Nicolas Maillat
66383580bf Merge pull request #2474 from nmaillat/PHRAS-1880_roolback_setup_zmq_by_pecl
roolback zmq by pecl stop using ondrej
2018-02-16 17:14:28 +01:00
nmaillat
6467d52fd6 roolback zmq by pecl stop using ondrej 2018-02-16 16:55:42 +01:00
Nicolas Maillat
696da67286 Merge pull request #2471 from mike-esokia/PHRAS-1854_PORT_PHRAS-1319
PHRAS-1854 port PHRAS-1319
2018-02-15 12:09:50 +01:00
Nicolas Maillat
090c9196d6 Merge pull request #2472 from aynsix/PHRAS-1865-show-binary-bloc-name
PHRAS-1865 show binary bloc name tools/metadata
2018-02-14 23:31:49 +01:00
aina-esokia
79a0bdc31a show binary bloc name 2018-02-14 11:51:27 +04:00
Mike Ng
e28006f6a6 update package-lock.json and yarn.lock 2018-02-14 11:13:06 +04:00
Nicolas Maillat
e38da9852f Merge pull request #2469 from aynsix/PHRAS-1517-tools-metadata
PHRAS-1517-tools-metadata-not-display-binary
2018-02-13 21:03:19 +01:00
aina-esokia
728edf9efb update toolsController 2018-02-12 16:05:18 +04:00
aina-esokia
c1d384976e update ToolsController 2018-02-12 15:18:16 +04:00
aina-esokia
9018254602 don't display binary data 2018-02-12 14:43:36 +04:00
Mike Ng
cee867d662 port PHRAS-1319 to 4.1 2018-02-12 11:31:37 +04:00
Toky Herizo
6c853cf98c udpate facebook SDK to 5.6 2018-02-12 11:24:14 +04:00
Nicolas Maillat
431ae31945 Merge pull request #2464 from aynsix/PHRAS-1722-mysql-restart-autoincrement
PHRAS-1722-mysql-restart-autoincrement
2018-02-09 16:00:20 +01:00
Nicolas Maillat
5d56f54c19 Merge pull request #2465 from xrousset78800/PHRAS-1805_PHRAS-1839_Update-provisionning
PHRAS-1805 PHRAS-1839 Add yarn setup and make exiftool executable
2018-02-09 15:59:43 +01:00
Xavier Rousset
c16fcdb90c PHRAS-1805 PHRAS-1839 Add yarn setup and make exiftool executable 2018-02-09 12:31:38 +01:00
aina-esokia
029da5d9eb Port to 4.1 mysql restart autoincrement 2018-02-09 12:20:30 +04: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