1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Commit graph

168 commits

Author SHA1 Message Date
MrTimscampi
ffc22f629e Resolve suggestions 2020-07-24 13:08:49 +02:00
MrTimscampi
66b107f0c9 Resolve conflicts 2020-07-24 12:25:07 +02:00
MrTimscampi
3713091382 Merge remote-tracking branch 'upstream/master' into es6
With conflicts
2020-07-24 10:23:14 +02:00
Cameron
4592594b04
Merge branch 'es6' into migrate-to-ES6-13 2020-07-23 16:40:45 +01:00
dkanada
7a33e90693
Merge pull request #1583 from Camc314/migrate-to-ES6-28
Migration of touchhelper and taskbuttons to ES6 modules
2020-07-23 11:46:30 +09:00
Cameron
d147184ea9
Merge branch 'es6' into migrate-to-ES6-13 2020-07-22 20:40:56 +01:00
MrTimscampi
293a87902b Add version check for SyncPlay 2020-07-22 19:13:06 +02:00
dkanada
e3b1a4017a
Merge pull request #1616 from Camc314/migrate-to-ES6-27
Removal of Require
2020-07-22 23:37:06 +09:00
Cameron
e2391aabb2
Merge branch 'es6' into migrate-to-ES6-28 2020-07-21 14:47:50 +01:00
Cameron
13e7fb987f
Merge branch 'es6' into migrate-to-ES6-13 2020-07-21 14:45:26 +01:00
Cameron
3a23b6e36c Destruction of Require 2020-07-21 13:25:50 +01:00
Cameron
c08c75d52e
Merge branch 'es6' into migrate-to-ES6-23 2020-07-20 08:41:48 +01:00
dkanada
1aee51e94c
Merge pull request #1572 from Camc314/migrate-to-ES6-11
Migration of dashboard/ to ES6 modules
2020-07-20 09:01:56 +09:00
dkanada
445fce7071
tweak comment indentation 2020-07-20 09:01:50 +09:00
dkanada
bb158284d6
Merge pull request #1592 from Camc314/migrate-to-ES6-38
Migration of scheduledtask and scheduledtasks to ES6 modules
2020-07-20 08:42:37 +09:00
dkanada
9e73fd61da
Merge pull request #1596 from Camc314/migrate-to-ES6-10
Remove require and fix networking on es6
2020-07-20 08:39:57 +09:00
Cameron
cd85a188b9
Merge branch 'es6' into migrate-to-ES6-11 2020-07-19 20:12:57 +01:00
Cameron
75076fd172
Merge branch 'es6' into migrate-to-ES6-23 2020-07-19 20:11:53 +01:00
Cameron
0879908642
Merge branch 'es6' into migrate-to-ES6-38 2020-07-19 20:06:06 +01:00
Cameron
424d324298 remove .default 2020-07-19 10:13:35 +01:00
Cameron
f62f92b7d5 Fix me breaking networking 2020-07-19 10:04:20 +01:00
dkanada
3f7dc3c7c1
Merge branch 'es6' into migrate-to-ES6-15 2020-07-19 15:38:03 +09:00
dkanada
064851835e
Merge branch 'es6' into migrate-to-ES6-14 2020-07-19 15:19:52 +09:00
dkanada
c17dfafbd9
Merge branch 'es6' into es6-migration-5 2020-07-19 15:04:07 +09:00
Cameron
84f2047df3 update variable declerations 2020-07-18 21:51:48 +01:00
Cameron
233f7382ee update scheduledtasks 2020-07-18 21:45:04 +01:00
Cameron
f74f310630 Migration of scheduledtask and scheduledtasks to ES6 modules 2020-07-18 21:42:43 +01:00
Cameron
680b14b783
Merge branch 'es6' into migrate-to-ES6-13 2020-07-18 14:59:15 +01:00
Cameron
7c19f26e87
Merge branch 'es6' into migrate-to-ES6-15 2020-07-18 14:35:41 +01:00
dkanada
57dcda9294
Merge branch 'es6' into migrate-to-ES6-10 2020-07-18 21:35:50 +09:00
Cameron
f296eb3475 Migration of taskbutton and touchHelper to ES6 modules 2020-07-17 11:30:39 +01:00
Cameron
f084f36757
Merge branch 'es6' into migrate-to-ES6-23 2020-07-17 07:45:06 +01:00
Cameron
c27ff4a01c
Merge branch 'es6' into migrate-to-ES6-11 2020-07-16 11:28:34 +01:00
Cameron
dfcf0d5d6b update variable declerations 2020-07-16 11:25:17 +01:00
Cameron
45df6ef764 Migration of alert to ES6 module 2020-07-15 14:46:56 +01:00
Cameron
1200617639 Migration of activitylog and datetime to ES6 modules 2020-07-15 14:34:57 +01:00
Cameron
92ccdb8709
Merge branch 'es6' into migrate-to-ES6-14 2020-07-15 10:07:06 +01:00
Cameron
c813b315a7
Merge branch 'es6' into migrate-to-ES6-13 2020-07-15 10:05:30 +01:00
Cameron
455cca45d2
Merge branch 'es6' into migrate-to-ES6-10 2020-07-15 10:04:52 +01:00
Cameron
8549b7632f
Merge branch 'es6' into migrate-to-es6-12 2020-07-15 09:58:26 +01:00
dkanada
11e675de58 fix two minor issues 2020-07-12 04:24:45 +09:00
Cameron
7b509fdde4 Migration of proflie, profiles and settings (DLNA) to ES6 Modules 2020-07-11 16:54:20 +01:00
Cameron
376f00c059 update variable declerations 2020-07-11 14:04:11 +01:00
Cameron
5545c05089 updates to lint and profile 2020-07-11 13:42:30 +01:00
Cameron
c62ad4ae83 Update variable declerations 2020-07-11 11:56:57 +01:00
Cameron
4e3e2d1428 migration of apikeys, dashboard and encodingsettings to ES6 modules 2020-07-11 11:46:51 +01:00
Cameron
fd21f2198d fix medialibrary.js, lint and convert variable declerations 2020-07-11 11:39:36 +01:00
Cameron
39c1b6fa65 update var declerations 2020-07-11 11:26:24 +01:00
dkanada
f97cb2cbb2
Merge branch 'es6' into es6-directorybrowser 2020-07-11 18:33:25 +09:00
Cameron
107e4c273e fix lint 2020-07-09 22:22:29 +01:00