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,322 Commits 268 Branches 107 Tags
eab0bd22e5d367d932136786de5387cc9844b368
Commit Graph

939 Commits

Author SHA1 Message Date
aina-esokia
eab0bd22e5 port to 4.1 admin/ordre des collections 2018-05-24 16:06:15 +04:00
Nicolas Maillat
50feb78c12 Merge pull request #2606 from mike-esokia/PHRAS-2053_PORT_PHRAS_2051_to_4.1 
PHRAS-2053 port PHRAS-2051 to 4.1
 2018-05-23 20:04:32 +02:00
mike-esokia
04a0f56b4d Add PHRAS-1539 2018-05-23 17:15:56 +04:00
mike-esokia
f8fb8837cb wip restore hightlights and multivalue seperator 2018-05-23 17:00:15 +04:00
aina-esokia
b6ed165dd5 add print caption 2018-05-23 15:09:06 +04:00
mike-esokia
5a4de4750c PORT PHRAS-1681 to 4.1 2018-05-16 16:34:42 +04:00
mike-esokia
ccb3a88fe8 memorizing enable and disable status of facets 2018-05-15 17:41:01 +04:00
mike-esokia
2c39cf503a refactor suggested values in edit view 2018-05-07 14:14:46 +04:00
mike-esokia
ccd10333b7 fix slideshow functionality in detail screen 2018-04-19 14:58:18 +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
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
mike-esokia
3b3eb50ae7 update video editor icon in toolbar 2018-04-11 17:14:41 +04:00
Mike Ng
43e09e99b2 add roboto fonts and gulp tasks 
remove unused codes
 2018-04-06 16:38:56 +04:00
Mike Ng
c31b3d7589 refactored layout of video range extractor 2018-04-05 13:52:38 +04:00
Mike Ng
838d996d60 wip implementation of grid view on video tools layout 2018-03-30 13:17:38 +04:00
mike-esokia
329b7b90d5 refactor layout of video tools and dialogs 
resize screenshots
 2018-03-29 14:33:58 +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
Mike Ng
3cdaf5400f fix issue with video preview 2018-03-20 12:03:28 +04:00
Mike Ng
4a6bac8546 wip write video chapters 2018-03-19 17:52:57 +04:00
mike-esokia
9943daffe9 display record of type video in order list (#2514) 2018-03-15 17:12:29 +01:00
Mike Ng
abc0fc392b refactor layout of facet preferences 2018-03-13 10:33:53 +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
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
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
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
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
Nicolas Maillat
a69790ed9e Merge pull request #2414 from xrousset78800/PHRAS-1720/Add-language-selection-on-prod-settings 
Port PHRAS-1673 - language selection - to master PHRAS-1720
 2018-02-20 13:18:54 +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
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
Nicolas Maillat
696da67286 Merge pull request #2471 from mike-esokia/PHRAS-1854_PORT_PHRAS-1319 
PHRAS-1854 port PHRAS-1319
 2018-02-15 12:09:50 +01:00
aina-esokia
9018254602 don't display binary data 2018-02-12 14:43:36 +04:00
Mike Ng
cee867d662 port PHRAS-1319 to 4.1 2018-02-12 11:31:37 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Nicolas Maillat
caa1957f47 Merge pull request #2422 from mike-esokia/PHRAS-1778_PORT_PHRAS-179 
PHRAS-1778 porting PHRAS-179 to 4.1
 2018-01-08 12:29:05 +01:00
Nicolas Maillat
62c7443333 Merge pull request #2420 from mike-esokia/PHRAS-1741_PORT_PHRAS-1616 
PHRAS-1741 porting PHRAS-1616 to 4.1
 2018-01-08 12:28:18 +01:00
Nicolas Maillat
738eaec13c Merge pull request #2410 from mike-esokia/PHRAS-1747_PORT_PHRAS-1301 
PHRAS-1747 port phras 1301
 2018-01-08 12:22:34 +01:00
Nicolas Maillat
f720b3d073 Merge pull request #2395 from mike-esokia/PHRAS-1738_update_menu_basket 
Phras 1738 PORT PHRAS-1614
 2018-01-08 12:20:59 +01:00
Nicolas Maillat
3d84736b4a Merge pull request #2394 from mike-esokia/PHRAS-1726_PORT_PHRAS-1559_1560 
PORT PHRAS-1559 and PHRAS-1560 to 4.1
 2018-01-08 12:19:22 +01:00