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

916 Commits

Author SHA1 Message Date
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
Nicolas Maillat
7b4dcec274 Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593 
PHRAS-1736 port PHRAS-165 and PHRAS-1593
 2018-01-08 12:12:20 +01:00
Nicolas Maillat
bdab445192 Merge pull request #2382 from mike-esokia/PHRAS-1727_PORT_PHRAS-1577 
PHRAS-1727 Port PHRAS-1577
 2018-01-08 12:01:48 +01:00
Nicolas Maillat
dffb227dc1 Merge pull request #2371 from mike-esokia/PHRAS-1712_memorize_truncate_choice 
PHRAS-1712 Porting PHRAS-1542 to 4.1
 2018-01-08 12:00:12 +01:00
Mike Ng
e7d3a5c405 porting PHRAS-179 to 4.1 2018-01-04 12:33:31 +04:00
Mike Ng
82d9ef86a4 porting PHRAS-1616 to 4.1 2018-01-03 17:08:02 +04:00
Xavier Rousset
31e0c43f7f Port PHRAS-1673 - language selection - to master PHRAS-1720 2017-12-22 16:03:46 +01:00
Mike Ng
9c3f65f3f7 load appropriate status based on store collection 2017-12-21 16:50:21 +04:00
Mike Ng
d0a1c4c599 PORT PHRAS-1614 to 4.1 2017-12-14 11:32:08 +04:00
Mike Ng
2811964f01 PORT PHRAS-1301/PHRAS-1676 to 4.1 2017-12-13 12:51:08 +04:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +04:00
Mike Ng
a79b72fbaf Port PHRAS-1593 2017-11-24 16:22:31 +04:00
Mike Ng
e838b6f166 Port PHRAS-1577 to 4.1 2017-11-23 16:40:20 +04:00
Mike Ng
77043c1a9d Port PHRAS-1574 2017-11-23 13:16:55 +04:00
Mike Ng
1e56eef3c6 wip - porting BDC 2017-11-21 10:06:10 +04:00
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Mike Ng
974f1b8a02 Porting PHRAS-1542 to 4.1 2017-11-17 11:32:37 +04:00
Nicolas Maillat
689505928a Merge pull request #2231 from mike-esokia/PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498 
PHRAS-1524 port PHRAS-1475 and PHRAS-1498
 2017-11-16 13:40:51 +01:00
Nicolas Maillat
dfde06a293 Merge pull request #2363 from mike-esokia/PHRAS-1526_fix_event_button_print_export 
PHRAS-1526 fix event listener for button export / download
 2017-11-16 10:11:33 +01:00
Nicolas Maillat
2f722dfc6a Merge pull request #2366 from mike-esokia/PHRAS-1529_PORT_PHRAS-1415 
PHRAS-1529 PORT PHRAS-1415
 2017-11-15 15:48:03 +01:00
Nicolas Maillat
acc674be43 Merge pull request #2362 from mike-esokia/PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457 
PHRAS-1525 port phras 1434 1435 1436 1437 1457
 2017-11-15 13:43:05 +01:00
Mike Ng
e20aef94eb clean up 
add PHRAS-1493
 2017-08-28 13:09:53 +04:00
Mike Ng
2d17177ded hide facets containing single element from preference menu 2017-08-22 17:07:05 +04:00
Mike Ng
be17fd8e0d fix event listener for button export / download 2017-08-22 12:03:26 +04:00