Mike Ng
|
238e1cb560
|
dump locales
|
2018-03-21 11:15:00 +04:00 |
|
Mike Ng
|
a560d93e34
|
clean up code
|
2018-03-21 10:53:22 +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
|
978bad61a3
|
Merge pull request #2516 from mike-esokia/PHRAS-1916_refactor_user_settings
PHRAS-1916 refactor layout of facet preferences
|
2018-03-20 10:21:53 +01: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 |
|
Nicolas Maillat
|
555975d6f4
|
Merge pull request #2526 from mike-esokia/PHRAS-1924_download_assets_nok_revert
PHRAS-1924 fix error with jquery on download assets page
|
2018-03-20 10:19:34 +01:00 |
|
Nicolas Maillat
|
ef205f88a4
|
Merge pull request #2527 from mike-esokia/PHRAS-1898_fix_write_video
PHRAS-1898 save video chapters to meta field
|
2018-03-20 10:18:58 +01:00 |
|
Mike Ng
|
3cdaf5400f
|
fix issue with video preview
|
2018-03-20 12:03:28 +04:00 |
|
Mike Ng
|
2be731fede
|
fix error with jquery on download assets page
|
2018-03-19 18:05:27 +04:00 |
|
Mike Ng
|
4a6bac8546
|
wip write video chapters
|
2018-03-19 17:52:57 +04:00 |
|
Nicolas Maillat
|
22a1eb5b84
|
Merge pull request #2523 from aynsix/PHRAS-1316-port-1205-double-extension
PHRAS-1316 port-1205-double-extension-issue
|
2018-03-19 14:27:43 +01: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 |
|
aina-esokia
|
a61eacf182
|
double extension port 1205 to master
|
2018-03-16 12:24:12 +04:00 |
|
xrousset78800
|
4b0292619b
|
PHRAS-1317 Update DPI default value on presets (#2519)
|
2018-03-15 17:22:24 +01:00 |
|
mike-esokia
|
9943daffe9
|
display record of type video in order list (#2514)
|
2018-03-15 17:12:29 +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 |
|
xrousset78800
|
314473b169
|
PHRAS-1920 Add alias on deprecated function used on webgallery plugin (#2513)
|
2018-03-13 12:01:21 +01:00 |
|
Mike Ng
|
abc0fc392b
|
refactor layout of facet preferences
|
2018-03-13 10:33:53 +04:00 |
|
Nicolas Maillat
|
a57fe2744e
|
Merge pull request #2509 from mike-esokia/PHRAS-1899_PORT_PHRAS-1381
PHRAS_1899 Port PHRAS-1381 to 4.1
|
2018-03-08 14:16:15 +01:00 |
|
Mike Ng
|
f95e40f0b8
|
Port PHRAS-1381 to 4.1
|
2018-03-08 13:02:07 +04:00 |
|
Nicolas Maillat
|
64d669bc5f
|
Merge pull request #2508 from mike-esokia/PHRAS-1781_PORT_PHRAS_1697
PHRAS-1781 Port PHRAS-1697 to 4.1
|
2018-03-07 14:30:02 +01:00 |
|
Mike Ng
|
d9687385e6
|
Port PHRAS-1697 to 4.1
|
2018-03-07 17:01:15 +04:00 |
|
Nicolas Maillat
|
a61db0e41b
|
Merge pull request #2507 from mike-esokia/PHRAS-1905_sort_facet_values
PHRAS-1905 sort facets value alphabetically or by hits
|
2018-03-07 08:59:29 +01: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 |
|
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 |
|
Mike Ng
|
89f8b9d6fe
|
dump locale
|
2018-03-06 14:04:49 +04:00 |
|
Mike Ng
|
a517b1d6a3
|
sort facets via preferences
|
2018-03-06 13:59:53 +04: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 |
|
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 |
|
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 |
|
aina-esokia
|
27fd458f30
|
fetched conflicting recordids each time on called
|
2018-02-28 10:59:45 +04:00 |
|