Commit Graph

12235 Commits

Author SHA1 Message Date
Mike Ng
6776a28684 add resources for PHRAS-1954 2018-04-16 11:08:41 +04:00
Nicolas Maillat
d86aaa4f9e Merge pull request #2547 from mike-esokia/PHRAS-1936_video_editor_chapters
PHRAS-1936 save overlapChapters in video editor in preferences
2018-04-13 11:46:09 +02:00
Nicolas Maillat
eb8514904a Merge pull request #2546 from aynsix/PHRAS-1946-geoloc-technical-field
PHRAS-1946 : geoloc technical data to positive negative value
2018-04-13 11:45:56 +02:00
mike-esokia
0b80150f01 save overlapChapters in video editor in preferences 2018-04-13 11:47:00 +04:00
aina-esokia
e8f9e9a883 position technical data to positive negative value 2018-04-12 09:48:09 +04:00
Nicolas Maillat
ab42397196 Merge pull request #2545 from mike-esokia/PHRAS-1935_update_icon_toolbar
PHRAS-1935 update video editor icon in toolbar
2018-04-11 18:24:28 +02:00
mike-esokia
3b3eb50ae7 update video editor icon in toolbar 2018-04-11 17:14:41 +04:00
Nicolas Maillat
fd54f938ef Merge pull request #2543 from mike-esokia/PHRAS-1935_refacto_prod_video_editor
PHRAS-1935 import roboto fonts via font.googleapis
2018-04-06 16:03:53 +02:00
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
Nicolas Maillat
195ebe4219 Merge pull request #2542 from mike-esokia/PHRAS-1935_refacto_prod_video_editor
PHRAS-1935 refacto prod video editor - video range editor
2018-04-05 18:14:17 +02: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
Nicolas Maillat
f2f0e89077 Merge pull request #2536 from aynsix/PHRAS-1938-package-json-remove-npm-to-yarn
PHRAS-1938 package.json-scripts-section-remove-npm-use-yarn
2018-04-03 21:16:40 +02:00
Nicolas Maillat
1f5f37aff7 Merge pull request #2540 from mike-esokia/PHRAS-1935_refacto_prod_video_editor
PHRAS-1935 refacto prod video tools section
2018-03-30 18:09:03 +02: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
aina-esokia
dab28e44eb use yarn in package.json scripts section 2018-03-26 15:56:53 +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