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,162 Commits 268 Branches 107 Tags
70a158b67e1aec0ebe625417d1ad4b114c6746ab
Commit Graph

12162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
70a158b67e Merge pull request #2502 from mike-esokia/PHRAS-1897-read_video_chapters 
PHRAS-1897 read video chapters
 2018-03-06 11:56:47 +01:00
Nicolas Maillat
a0932a29d9 Merge pull request #2503 from aynsix/PHRAS-1903-error-on-multi-record-selection 
PHRAS-1903 error-when-multi-record-selection
 2018-03-06 11:51:28 +01:00
aina-esokia
dd59b6e022 modif on tools when multiple record selection 2018-03-05 18:02:44 +04:00
Mike Ng
1e8c083374 Merge remote-tracking branch 'alchemy/master' into PHRAS-1897-read_video_chapters 2018-03-05 16:41:35 +04:00
Mike Ng
cff7f65253 read video chapters from meta fields in video-editor 2018-03-05 16:41:20 +04:00
Nicolas Maillat
249a4126b4 Merge pull request #2490 from KallooaSan/PHRAS-1856_PORT-PHRAS-1347 
PHRAS-1856_PORT-PHRAS-1347
 2018-03-05 11:31:27 +01:00
Nicolas Maillat
92fdbc785d Merge pull request #2498 from KallooaSan/PHRAS-1873_PORT_PHRAS-1685_dump_esquery 
PHRAS-1873 PORT PHRAS-1685 dump esquery
 2018-03-02 16:54:08 +01:00
Nicolas Maillat
a99534e982 Merge pull request #2499 from mike-esokia/PHRAS-1740_PORT_Refactor_trash 
PHRAS-1740 Porting refactor trash to 4.1
 2018-03-02 16:53:13 +01:00
Mike Ng
5708e8731b Porting refactor trash to 4.1 2018-03-01 15:14:49 +04:00
Sandeep
98911772b7 PHRAS-1873 PORT PHRAS-1685 dump esquery 2018-03-01 09:20:57 +04:00
KallooaSan
00be9e51b0 PHRAS-1895_PORT_PHRAS-1401_include_json_format_return_record (#2494) 
* PHRAS-1895_PORT_PHRAS-1401 include json format return record

* PHRAS-1895_rollback deleted action ref PHRAS-1688
 2018-02-28 17:31:45 +01:00
Nicolas Maillat
71f6e5d964 Merge pull request #2496 from mike-esokia/PHRAS-1844_PORT_PHRAS-1862 
PORT PHRAS-1862 to 4.1
 2018-02-28 11:23:05 +01:00
Mike Ng
169b4026eb PORT PHRAS-1862 to 4.1 2018-02-28 13:42:43 +04:00
Nicolas Maillat
ad71cb1ac0 Merge pull request #2495 from mike-esokia/PHRAS-1894_fix_index_layout 
fix index layout on lightbox
 2018-02-28 10:16:34 +01:00
Mike Ng
3ca5e72d9f fix index layout on lightbox 2018-02-28 12:37:14 +04:00
Nicolas Maillat
333073dc9a Merge pull request #2488 from KallooaSan/PHRAS_1819_Lazaret_Checker_Colorspace_Without_ICC_Profile 
PHRAS-1819: Lazaret checker colorspace add rgba
 2018-02-27 22:12:27 +01:00
Nicolas Maillat
d808f797a6 Merge pull request #2487 from xrousset78800/PHRAS-1885_bump-php-to-70-on-circle 
PHRAS-1884 Bump php to 7.0.24 on circle CI and elastic to 2.3.3.
 2018-02-27 21:18:48 +01:00
Nicolas Maillat
57d2fb2c6c Merge pull request #2486 from xrousset78800/PHRAS-1882_Add-default-php-version-on-vagrant-up 
PHRAS-1882 Update Vagrantfile
 2018-02-27 21:02:15 +01:00
KallooaSan
cb4ef28072 PHRAS-1863 PORT PHRAS-60 Add applicative trash (#2492) 2018-02-27 17:02:24 +01:00
aynsix
1ca68fb9a5 update time limit (#2493) 2018-02-27 16:58:13 +01:00
Nicolas Maillat
8639d35c0e Merge pull request #2466 from xrousset78800/fix/rollback-ignore-platform-reqs-on-makefile 
Rollback PHRAS-1852 - Remove ignore-platform-reqs option on makefile composer setup
 2018-02-27 16:28:09 +01:00
Xavier Rousset
2195988675 PHRAS-1884 Bump php to 7.0.24 on circle CI and elastic to 2.3.3. 2018-02-27 14:48:34 +01:00
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
Sandeep
9db8aff7b8 PHRAS-1819: Lazaret checker colorspace add rga 
Add support for rgba in colorspace checker
Add allow bypass colorspace checker for document type files
Updated Mediavorus version
 2018-02-22 15:31:20 +04:00
Xavier Rousset
f8c95c1169 Update Vagrantfile 2018-02-21 18:05:58 +01:00
Nicolas Maillat
5751213e3e Merge pull request #2485 from aynsix/PHRAS-1858-define-filename-download-permalink 
PHRAS-1858 port-to-4.1-define-filename-at-download
 2018-02-21 10:23:03 +01:00
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