Commit Graph

2305 Commits

Author SHA1 Message Date
Paulchen Panther
561fabeba6 Merge branch components into mediafoundation 2021-05-04 21:30:29 +02:00
Lord-Grey
8459fa143b Align Grabber.js with new utility functions 2021-05-03 21:32:12 +02:00
LordGrey
07dd671e0c Database migration aligning with updated grabber model 2021-05-03 10:20:22 +02:00
LordGrey
c646b0b49c Fix Merge-issues 2021-05-02 22:03:46 +02:00
LordGrey
9ea40a873e Merge branch 'master' into mediafoundation
# Conflicts:
#	assets/webconfig/content/dashboard.html
#	assets/webconfig/i18n/en.json
#	assets/webconfig/js/content_dashboard.js
#	assets/webconfig/js/content_logging.js
#	assets/webconfig/js/hyperion.js
#	assets/webconfig/js/ui_utils.js
2021-05-02 21:12:00 +02:00
Paulchen Panther
1514d8442d Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation 2021-05-02 20:12:52 +02:00
Paulchen Panther
3fb0ece3a2 refactor 2021-05-02 19:04:58 +02:00
Paulchen Panther
b06126ee28 Components divided on the dashboard 2021-05-02 15:47:14 +02:00
Paulchen Panther
781862775e Merge branch 'master' of https://github.com/hyperion-project/hyperion.ng into components 2021-05-02 15:45:42 +02:00
Hyperion-Bot
03afc0db8f Update vi.json (POEditor.com) 2021-05-02 15:23:11 +02:00
Hyperion-Bot
43159a9373 Update tr.json (POEditor.com) 2021-05-02 15:23:10 +02:00
Hyperion-Bot
cbe309f5b8 Update sv.json (POEditor.com) 2021-05-02 15:23:08 +02:00
Hyperion-Bot
0b27e8c963 Update es.json (POEditor.com) 2021-05-02 15:23:07 +02:00
Hyperion-Bot
a60e18d12b Update ro.json (POEditor.com) 2021-05-02 15:23:06 +02:00
Hyperion-Bot
4c5b506ace Update pt-br.json (POEditor.com) 2021-05-02 15:23:05 +02:00
Hyperion-Bot
eb09d680b6 Update pt.json (POEditor.com) 2021-05-02 15:23:04 +02:00
Hyperion-Bot
a34d5d609f Update pl.json (POEditor.com) 2021-05-02 15:23:03 +02:00
Hyperion-Bot
bf4b951f55 Update nb.json (POEditor.com) 2021-05-02 15:23:02 +02:00
Hyperion-Bot
dafd168b6a Update it.json (POEditor.com) 2021-05-02 15:23:00 +02:00
Hyperion-Bot
53fa0a6d63 Update de.json (POEditor.com) 2021-05-02 15:22:59 +02:00
Hyperion-Bot
91d52ca8ba Update fr.json (POEditor.com) 2021-05-02 15:22:58 +02:00
Hyperion-Bot
a3b3e50eb9 Update en.json (POEditor.com) 2021-05-02 15:22:57 +02:00
Hyperion-Bot
802dc56382 Update nl.json (POEditor.com) 2021-05-02 15:22:56 +02:00
Hyperion-Bot
f662da589e Update cs.json (POEditor.com) 2021-05-02 15:22:55 +02:00
Hyperion-Bot
6e3179ae90 Update vi.json (POEditor.com) 2021-05-02 13:34:35 +02:00
Hyperion-Bot
adb11437e1 Update tr.json (POEditor.com) 2021-05-02 13:34:34 +02:00
Hyperion-Bot
247f1c4505 Update sv.json (POEditor.com) 2021-05-02 13:34:33 +02:00
Hyperion-Bot
dc8629251a Update es.json (POEditor.com) 2021-05-02 13:34:32 +02:00
Hyperion-Bot
07cc9bc74f Update ro.json (POEditor.com) 2021-05-02 13:34:30 +02:00
Hyperion-Bot
9ed12929d2 Update pt-br.json (POEditor.com) 2021-05-02 13:34:29 +02:00
Hyperion-Bot
7e71dc93b0 Update pt.json (POEditor.com) 2021-05-02 13:34:28 +02:00
Hyperion-Bot
dc7bef79b0 Update pl.json (POEditor.com) 2021-05-02 13:34:27 +02:00
Hyperion-Bot
ffa072ae3a Update nb.json (POEditor.com) 2021-05-02 13:34:26 +02:00
Hyperion-Bot
cc98def67e Update it.json (POEditor.com) 2021-05-02 13:34:25 +02:00
Hyperion-Bot
8705936707 Update de.json (POEditor.com) 2021-05-02 13:34:24 +02:00
Hyperion-Bot
2c5c3db42b Update fr.json (POEditor.com) 2021-05-02 13:34:22 +02:00
Hyperion-Bot
05ebac1d47 Update en.json (POEditor.com) 2021-05-02 13:34:21 +02:00
Hyperion-Bot
2286c009da Update nl.json (POEditor.com) 2021-05-02 13:34:20 +02:00
Hyperion-Bot
c8eb44f28e Update cs.json (POEditor.com) 2021-05-02 13:34:19 +02:00
Paulchen Panther
53bf08c9f8 Merge branch 'master' of https://github.com/hyperion-project/hyperion.ng into components 2021-05-02 10:48:38 +02:00
Hyperion-Bot
5b9ec04d32 Update pt-br.json (POEditor.com) 2021-05-01 20:05:01 +02:00
Hyperion-Bot
fc4ac645f0 Update pt.json (POEditor.com) 2021-05-01 20:05:00 +02:00
Hyperion-Bot
eb451cd0c2 Update nb.json (POEditor.com) 2021-05-01 20:04:59 +02:00
Hyperion-Bot
831cc39bbc Update de.json (POEditor.com) 2021-05-01 18:58:05 +02:00
Hyperion-Bot
99bab35e34 Update vi.json (POEditor.com) 2021-05-01 18:47:13 +02:00
Hyperion-Bot
739052f03d Update tr.json (POEditor.com) 2021-05-01 18:47:11 +02:00
Hyperion-Bot
0ad77f2d5b Update sv.json (POEditor.com) 2021-05-01 18:47:10 +02:00
Hyperion-Bot
cd2b8a596f Update es.json (POEditor.com) 2021-05-01 18:47:09 +02:00
Hyperion-Bot
6ec0208fb7 Update ro.json (POEditor.com) 2021-05-01 18:47:08 +02:00
Hyperion-Bot
21931cbf13 Update pl.json (POEditor.com) 2021-05-01 18:47:07 +02:00