hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,873 Commits 268 Branches 107 Tags
454613111c86c60cc515a2d421cab403853fb3e3
Commit Graph

2202 Commits

Author SHA1 Message Date
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
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
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
mike-esokia
9943daffe9 display record of type video in order list (#2514) 2018-03-15 17:12:29 +01:00
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04: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
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
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
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04: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
Nicolas Maillat
815c46ad94 Merge pull request #2480 from mike-esokia/PHRAS-1871_PORT_PHRAS-854 
PHRAS-1871 - PORT PHRAS-854 to 4.1
 2018-02-19 14:37:50 +01:00
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04: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
374f8eaff4 migrate backbone and underscore to npm and refactored test modules 2018-01-19 15:03:00 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +04:00
Mike Ng
4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss
 2018-01-09 11:00:03 +04:00
Mike Ng
4c11cfebd8 Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 2018-01-09 09:50:57 +04:00
Mike Ng
2c75dc654f Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
 2018-01-09 09:50:27 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +04:00
Mike Ng
a853ec7d8d Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:28 +04:00
Mike Ng
3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:28 +04:00
Mike Ng
8908a6b23f Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:00 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
c2603da5ad Merge pull request #2373 from falylala/PHRAS-1717-PORT_Install_show_available_documentary 
PHRAS-1717- PORT_1296_Show all available structure for install CLI/Graphic mode
 2018-01-08 12:33:19 +01:00
Nicolas Maillat
a0eccc22e8 Merge pull request #2426 from mike-esokia/PHRAS-1783_PORT_PHRAS-1764 
PHRAS-1783 porting PHRAS-1764 to 4.1
 2018-01-08 12:31:05 +01:00
Nicolas Maillat
079bf402c7 Merge pull request #2423 from mike-esokia/PHRAS-1779_PORT_PHRAS-511 
PHRAS-1779 porting PHRAS-511 to 4.1
 2018-01-08 12:29:40 +01: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
b67df5ee30 Merge pull request #2412 from mike-esokia/PHRAS-1739_port_1641 
PHRAS-1739 porting PHRAS-1641 to 4.1
 2018-01-08 12:25:46 +01:00