707 commits

Author	SHA1	Message	Date
MrTimscampi	5e1b6acffe	Disallow block padding	2020-07-27 08:06:46 +02:00
MrTimscampi	0d1661055b	Fix accidentally reverted var	2020-07-26 18:30:31 +02:00
MrTimscampi	dc5af7d19f	Merge remote-tracking branch 'upstream/master' into dead-code-society	2020-07-26 18:28:32 +02:00
dkanada	a085bb5269	update routes for plugin and session pages	2020-07-26 20:31:16 +09:00
dkanada	c0261ee487	move wizard and user preference routes to nested folders	2020-07-26 20:31:16 +09:00
MrTimscampi	4a80a5ee2c	Fix lint error	2020-07-26 13:27:46 +02:00
MrTimscampi	60ec70b2d8	Fix linting errors	2020-07-26 13:10:32 +02:00
MrTimscampi	950efe0091	Remove old links to Emby docs	2020-07-26 12:35:41 +02:00
Julien Machiels	e7b87c106f	Update src/controllers/livetv/livetvschedule.js ... Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>	2020-07-26 12:33:01 +02:00
MrTimscampi	29759ac884	Kill shaka and fix livetvschedule	2020-07-26 12:32:59 +02:00
MrTimscampi	dfbb7dfc16	Remove dead code	2020-07-26 12:30:50 +02:00
Anthony Lavado	feaabb6de9	Merge pull request #1634 from MrTimscampi/es6 ... Merge the ES6 feature branch back into master	2020-07-25 21:42:06 -07:00
MrTimscampi	b7d2561dae	Address more feedback	2020-07-25 13:42:03 +02:00
MrTimscampi	443ce5a747	Fix more suggestions	2020-07-24 17:18:28 +02:00
dkanada	621db2ecc9	Merge pull request #1630 from grafixeyehero/fix-SpecialFeatures ... remove unused morebutton and editimage	2020-07-25 00:01:52 +09:00
dkanada	04b2763447	Merge pull request #1542 from dmitrylyzo/fix-osd-lock ... Fix OSD lock	2020-07-25 00:01:15 +09:00
MrTimscampi	ffc22f629e	Resolve suggestions	2020-07-24 13:08:49 +02:00
Julien Machiels	23c1f59bb3	Update src/controllers/shows/tvrecommended.js ... Co-authored-by: Cameron <Influence365@gmail.com>	2020-07-24 12:54:17 +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
dkanada	03a9e73b3b	Merge pull request #1625 from MrTimscampi/syncplay-version-check ... Add version check for SyncPlay	2020-07-24 09:57:47 +09:00
grafixeyehero	2277eec388	apply SonarCloud suggestion	2020-07-24 01:33:44 +03:00
grafixeyehero	ca81ce8f1f	make shape dynamic	2020-07-24 01:20:35 +03:00
grafixeyehero	4b31bcd390	remove unused morebutton and editimage	2020-07-24 00:16:17 +03:00
Dmitry Lyzo	2f1e792900	Merge branch 'master' into fix-osd-lock	2020-07-23 23:53:24 +03:00
Cameron	4592594b04	Merge branch 'es6' into migrate-to-ES6-13	2020-07-23 16:40:45 +01:00
dkanada	03ef599a89	Merge pull request #1584 from Camc314/migrate-to-ES6-29 ... Migration of nowplaying and videoosd to ES6 modules	2020-07-23 12:58:54 +09:00
dkanada	3eada38dd2	Merge branch 'es6' into migrate-to-ES6-33	2020-07-23 11:59:30 +09:00
dkanada	20324144af	Merge branch 'es6' into migrate-to-ES6-36	2020-07-23 11:54:21 +09: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
dkanada	0beaf415a2	Merge pull request #1591 from Camc314/migrate-to-ES6-37 ... Migration of user/menu and user/profile to ES6 modules	2020-07-23 11:44:07 +09:00
Cameron	d147184ea9	Merge branch 'es6' into migrate-to-ES6-13	2020-07-22 20:40:56 +01:00
rom4nik	43497b9593	Fix required track count for subtitle selector to appear	2020-07-22 21:13:55 +02: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
dkanada	0cb56127c7	Merge pull request #1587 from Camc314/migrate-to-ES6-31 ... Migration of playerstats to ES6 module	2020-07-22 23:32:37 +09:00
Cameron	f5ce196e07	Merge branch 'es6' into migrate-to-ES6-36	2020-07-21 14:53:09 +01:00
Cameron	1ad24542ba	Merge branch 'es6' into migrate-to-ES6-32	2020-07-21 14:48:16 +01: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	0fee8a1f77	Merge branch 'es6' into migrate-to-ES6-33	2020-07-21 14:42:31 +01:00
Julien Machiels	e94c625778	Merge pull request #1566 from Camc314/migrate-to-ES6-19 ... Migration of TV to ES6 modules	2020-07-21 15:08:17 +02:00
Julien Machiels	649fca3c3a	Merge pull request #1570 from Camc314/migrate-to-ES6-23 ... Migration of datetime, alert and activitylog to ES6 modules	2020-07-21 15:07:58 +02:00
Cameron	3a23b6e36c	Destruction of Require	2020-07-21 13:25:50 +01:00
Cameron	a12f1be841	Merge branch 'es6' into migrate-to-ES6-19	2020-07-21 12:31:37 +01:00
Cameron	c08c75d52e	Merge branch 'es6' into migrate-to-ES6-23	2020-07-20 08:41:48 +01:00
dkanada	f1d224f087	Merge branch 'es6' into migrate-to-ES6-25	2020-07-20 09:07:27 +09:00
dkanada	08aadfe935	Merge pull request #1569 from Camc314/migrate-to-ES6-16 ... Migration of Auth to ES6 modules	2020-07-20 09:06:31 +09: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