hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,091 Commits 268 Branches 107 Tags
b64f677c47f43e88c5a70fc6cb8fe27256b27b05
Commit Graph

4953 Commits

Author SHA1 Message Date
Nicolas Maillat
f729ec6c5f Merge pull request #2528 from mike-esokia/PHRAS-1926_move_video_editor_location 
PHRAS-1926 move video editor location
 2018-03-21 14:09:41 +01:00
aina-esokia
e638766f13 update ArchiveJob info log 2018-03-21 11:50:28 +04:00
Mike Ng
696fc34642 wip extract video editor functionality to import into edit tools 2018-03-20 16:43:57 +04:00
Nicolas Maillat
4821145206 Merge pull request #2524 from KallooaSan/PHRAS-1911-add_route_return_list_documentary_fields 
PHRAS-1911-add route return list documentary fields
 2018-03-20 10:19:56 +01:00
Mike Ng
4a6bac8546 wip write video chapters 2018-03-19 17:52:57 +04:00
Sandeep
3c9e875ea9 PHRAS-1911 refactor technical fields list 2018-03-19 15:00:21 +04:00
Sandeep
5de988299d PHRAS-1911-add route return list documentary fields 2018-03-16 15:01:20 +04:00
xrousset78800
4b0292619b PHRAS-1317 Update DPI default value on presets (#2519) 2018-03-15 17:22:24 +01:00
mike-esokia
75db45ee87 PORT PHRAS-1879 to 4.1 (#2515) 2018-03-15 17:09:45 +01:00
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04:29 +01:00
Mike Ng
f95e40f0b8 Port PHRAS-1381 to 4.1 2018-03-08 13:02:07 +04:00
Mike Ng
d9687385e6 Port PHRAS-1697 to 4.1 2018-03-07 17:01:15 +04:00
Mike Ng
93cc71ffce sort facets value alphabetically or by hits 2018-03-07 11:24:24 +04:00
Nicolas Maillat
b1fb69cac3 Merge pull request #2489 from aynsix/PHRAS-569-ajout-info-/api/v1/quarantine 
PHRAS-569 Add "reasons" in api/v1/quarantine
 2018-03-06 15:11:47 +01:00
Nicolas Maillat
1f78adf645 Merge pull request #2500 from aynsix/PHRAS-1832-port-1776-to-master 
PHRAS-1832 port 1776 to master - databox create
 2018-03-06 15:11:20 +01:00
Nicolas Maillat
5a3a40ee81 Merge pull request #2504 from mike-esokia/PHRAS-1904_sort_facets_alpha 
PHRAS-1904 sort facets via preferences
 2018-03-06 11:56:59 +01:00
Mike Ng
a517b1d6a3 sort facets via preferences 2018-03-06 13:59:53 +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
aina-esokia
7ebcd8ae9b add info to api/quarantine 2018-03-02 18:06:01 +04:00
aina-esokia
b1c7e87799 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1832-port-1776-to-master 2018-03-01 17:41:45 +04:00
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04: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
Mike Ng
169b4026eb PORT PHRAS-1862 to 4.1 2018-02-28 13:42:43 +04:00
aina-esokia
27fd458f30 fetched conflicting recordids each time on called 2018-02-28 10:59:45 +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
KallooaSan
cb4ef28072 PHRAS-1863 PORT PHRAS-60 Add applicative trash (#2492) 2018-02-27 17:02:24 +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
aina-esokia
d6ac9d6c6e update migration 2018-02-23 12:44:57 +04:00
aina-esokia
bea0f98d19 Update LazaretFile 2018-02-23 11:44:23 +04:00
aina-esokia
aac1bbb34e add record_ids to api/v1/quarantine 2018-02-23 11:22:44 +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
aina-esokia
6fd11b630b allow to specify a filename on permalink usage 2018-02-21 11:43:53 +04: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
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
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +04:00
aina-esokia
79a0bdc31a show binary bloc name 2018-02-14 11:51:27 +04:00