Commit Graph

12223 Commits

Author SHA1 Message Date
Mike Ng
ae2839f441 update yarn.lock 2018-04-06 16:39:35 +04:00
Mike Ng
43e09e99b2 add roboto fonts and gulp tasks
remove unused codes
2018-04-06 16:38:56 +04:00
Mike Ng
7098165cbe import roboto font via font.googleapis 2018-04-06 11:11:07 +04:00
Mike Ng
f7e8e698fb dump locales 2018-04-05 14:00:45 +04:00
Mike Ng
c31b3d7589 refactored layout of video range extractor 2018-04-05 13:52:38 +04:00
Mike Ng
f23ac471c4 add js download util function 2018-03-30 16:57:32 +04:00
Mike Ng
f8ca786164 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1935_refacto_prod_video_editor 2018-03-30 13:19:02 +04:00
Mike Ng
838d996d60 wip implementation of grid view on video tools layout 2018-03-30 13:17:38 +04:00
Nicolas Maillat
482cacbd20 Merge pull request #2538 from mike-esokia/PHRAS-1937_fix_preview_permalink_new
PHRAS-1937 - fix preview permalink new
2018-03-30 09:43:32 +02:00
mike-esokia
329b7b90d5 refactor layout of video tools and dialogs
resize screenshots
2018-03-29 14:33:58 +04:00
Mike Ng
e4689a180b fix conflict with jquery-ui lib 2018-03-27 15:01:47 +04:00
Nicolas Maillat
236a0c95c7 Merge pull request #2530 from aynsix/PHRAS-1387-update-translation
PHRAS-1387 update translation
2018-03-27 10:41:41 +02:00
Mike Ng
c988993700 add jquery lib for permalink preview 2018-03-27 11:08:34 +04:00
Nicolas Maillat
b58de2b29c Merge pull request #2533 from mike-esokia/PHRAS-1934-fix_geoname_autocomplete_field
PHRAS-1934 fix geoname autocomplete field and disable chrome autofill
2018-03-23 17:22:46 +01:00
Mike Ng
ded2b5665a fix geoname autocomplete field and disable chrome autofill 2018-03-23 16:16:48 +04:00
Nicolas Maillat
992e1c0d72 Merge pull request #2532 from KallooaSan/PHRAS_1375_config_xsendfile_ne_fonctionne_plus
PHRAS-1375 config xsendfile ne fonctionne plus
2018-03-23 09:55:15 +01:00
sandeep
913a4035d8 PHRAS-1375 config xsendfile ne fonctionne plus 2018-03-22 17:09:33 +04:00
aina-esokia
a136ecf58d update user filter translation 2018-03-22 14:57:05 +04:00
aina-esokia
eb455c7581 update translation 2018-03-21 17:55:19 +04:00
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
Nicolas Maillat
b2dae8a90a Merge pull request #2529 from aynsix/PHRAS-398-log-tache-archivage
PHRAS-398 log-tache-d-archivage
2018-03-21 10:59:27 +01:00
aina-esokia
e638766f13 update ArchiveJob info log 2018-03-21 11:50:28 +04:00
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