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,353 Commits 268 Branches 107 Tags
233e6f2a6e2a1e1e24b0643d3c39c66fa4375cd2
Commit Graph

12353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jygaulier
c6281ae79e PHRAS-2010_circle-crash_master (#2567) 
display node, npm & gulp versions
bump npm
 2018-05-02 17:44:08 +02:00
Sandeep
c75d94a321 PHRAS-1911 : fix route me/structures 2018-05-02 12:21:18 +04:00
Sandeep
b09e5ef6df PHRAS-1997-PORT-PHRAS-1991 2018-05-02 11:18:26 +04:00
mike-esokia
e454f625e1 add icon for indesign file format 2018-04-30 15:38:02 +04:00
Nicolas Maillat
267fd7a92f Merge pull request #2554 from jygaulier/PHRAS-483_SHA-UID_master 
PHRAS-483_SHA-UID_master
 2018-04-27 14:33:08 +02:00
Jean-Yves Gaulier
3f785e7ba3 PHRAS-483_SHA-UID_master 
add index (not analysed) & search on fields "sha256" and "uuid"
e.g. : uuid:"4d006e01-bc38-4aac-9a5b-2c90ffe3a8a2"
e.g. : sha256:a7f3ec01c4c5efcadc639d494d432006f13b28b9a576afaee4d3b7508c4be074
 2018-04-26 17:35:01 +02:00
Nicolas Maillat
8a8577c59e Merge pull request #2535 from KallooaSan/PHRAS-1911_fix_fields_structure 
PHRAS-1911 fix fields structure
 2018-04-20 16:42:56 +02:00
Nicolas Maillat
2f81390abe Merge pull request #2553 from mike-esokia/PHRAS-1970_fix_preview_ratio_on_zoom 
PHRAS-1970 fix preview ratio when zooming in detail screen
 2018-04-19 15:42:54 +02:00
mike-esokia
ad201ae1c2 fix preview ratio when zooming in detail screen 2018-04-19 16:16:37 +04:00
Nicolas Maillat
2eb453ce6a Merge pull request #2552 from mike-esokia/PHRAS-1959_spacebar_shortcut_video 
PHRAS-1959 fix slideshow functionality in detail screen
 2018-04-19 13:26:51 +02:00
mike-esokia
ccd10333b7 fix slideshow functionality in detail screen 2018-04-19 14:58:18 +04:00
Nicolas Maillat
47c897b420 PHRAS-1809 2018-04-18 20:16:22 +02:00
Nicolas Maillat
ad89026f47 Merge pull request #2550 from jygaulier/PHRAS-1809_Geoinfos-in-index 
PHRAS-1809_Geoinfos-in-index
 2018-04-18 18:23:45 +02:00
Nicolas Maillat
401b64ea00 Merge pull request #2549 from mike-esokia/PHRAS-1946_geoloc_data 
PHRAS-1946 add technicalInfo in record of detail view
 2018-04-18 18:23:30 +02:00
Jean-Yves Gaulier
4164b6dd42 PHRAS-1809_Geoinfos-in-index 
Add a "location" field in records (type="geo_point"), populated with same values as "Longitude" and "Latitude" technical fields.
 2018-04-18 18:06:31 +02:00
mike-esokia
4eaa008aec add technicalInfo in record of detail view 2018-04-18 14:33:39 +04:00
Nicolas Maillat
993f21dd2e Merge pull request #2548 from mike-esokia/PHRAS-1954_manually_add_thumbnail 
PHRAS-1954 add resources for PHRAS-1954
 2018-04-16 15:26:41 +02:00
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
sandeep
9961362d30 PHRAS-1911 fix structure fields 2018-03-26 14:42:17 +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