Dmitry Lyzo
|
2a30ed6461
|
Merge branch 'master' into es6-subtitlesettings
|
2020-05-27 16:45:26 +03:00 |
|
Dmitry Lyzo
|
e6287429e0
|
Fix ability to change settings of another user
|
2020-05-27 16:30:21 +03:00 |
|
gion
|
385f0a0beb
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
2020-05-27 10:42:29 +02:00 |
|
MrTimscampi
|
bc4c591698
|
Merge remote-tracking branch 'upstream/master' into sonarcloud-3
|
2020-05-26 20:01:49 +02:00 |
|
dkanada
|
328d28beb0
|
Merge pull request #1293 from mark-monteiro/cross-platform-server-restart
Support restarting the server on all platforms
|
2020-05-25 20:08:13 +09:00 |
|
dkanada
|
8cef3817bd
|
fix linting error from missing semicolon
|
2020-05-25 15:06:21 +09:00 |
|
dkanada
|
739473c0fb
|
remove legacy jquery function from source
|
2020-05-25 14:59:57 +09:00 |
|
Mark Monteiro
|
eb6a76f578
|
Support restarting the server on all platforms
|
2020-05-24 23:30:47 -04:00 |
|
dkanada
|
51abc05d53
|
add name back as a parameter
|
2020-05-25 01:38:47 +09:00 |
|
dkanada
|
a9f1157330
|
fix an issue with plugin installation
|
2020-05-25 01:33:24 +09:00 |
|
dkanada
|
3b6fa7e972
|
add display preference for details banner and update some defaults
|
2020-05-24 18:30:35 +09:00 |
|
dkanada
|
16fb0decbc
|
merge branch master into strings
|
2020-05-18 23:18:08 +09:00 |
|
Vasily
|
76b59ef88f
|
Merge pull request #1140 from mark-monteiro/cleanup-network-settings
Clean up network settings page
|
2020-05-18 17:02:14 +03:00 |
|
MrTimscampi
|
f897f7484c
|
Force spacing around operators
|
2020-05-17 18:19:18 +02:00 |
|
dkanada
|
4beac3f7f4
|
update more controller locations
|
2020-05-17 23:19:21 +09:00 |
|
dkanada
|
1aaaffde4c
|
rename more components and update references
|
2020-05-17 17:04:36 +09:00 |
|
dkanada
|
35094da328
|
merge branch master into refactor
|
2020-05-17 02:49:47 +09:00 |
|
Anthony Lavado
|
ac1b008998
|
Merge pull request #1155 from ferferga/vertical-menu
Vertical menu
|
2020-05-16 12:39:36 -04:00 |
|
Anthony Lavado
|
2c706248dd
|
Merge pull request #839 from mijofa/youtube-keybindings
Added extra playback keybindings
|
2020-05-16 12:27:58 -04:00 |
|
ferferga
|
6a596bd497
|
Fix merge conflicts
|
2020-05-16 18:07:32 +02:00 |
|
ferferga
|
dd80697e61
|
Merge remote-tracking branch 'upstream/master' into vertical-menu
|
2020-05-16 18:07:20 +02:00 |
|
dkanada
|
f06291e37b
|
fix casing on a few more files and folders
|
2020-05-17 01:06:28 +09:00 |
|
MrTimscampi
|
d4fbbea991
|
Remove code smells
|
2020-05-14 23:34:23 +02:00 |
|
MrTimscampi
|
d2bd631cbe
|
Fix more sonarqube bugs
|
2020-05-14 23:25:22 +02:00 |
|
dkanada
|
3f7cbd6674
|
update boolean after broken merge
|
2020-05-14 13:28:24 +09:00 |
|
dkanada
|
9a72c22680
|
Merge branch 'master' into master
|
2020-05-14 13:26:52 +09:00 |
|
Mark Monteiro
|
27cbd0e1d8
|
Merge remote-tracking branch 'upstream/master' into cleanup-network-settings
|
2020-05-10 18:53:49 -04:00 |
|
Christoph Potas
|
9469c208e1
|
~ switch all strings to single quotes to match ESLint requirements
Signed-off-by: Christoph Potas <christoph286@googlemail.com>
|
2020-05-09 15:42:37 +02:00 |
|
Christoph Potas
|
1007308add
|
Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings
Signed-off-by: Christoph Potas <christoph286@googlemail.com>
# Conflicts:
# package.json
# src/components/subtitlesettings/subtitleappearancehelper.js
# src/components/subtitlesettings/subtitlesettings.js
# src/controllers/user/subtitles.js
# src/scripts/site.js
|
2020-05-09 15:37:07 +02:00 |
|
Erwin Yükselgil
|
91a26fa7b5
|
Per default a new user has no access to any library. The admin has to check needed libraries.
|
2020-05-09 14:07:25 +02:00 |
|
gion
|
36d097291e
|
Rename Syncplay to SyncPlay
|
2020-05-09 12:38:23 +02:00 |
|
gion
|
a18bca9d8c
|
Implement syncplay permissions for a user
|
2020-05-09 12:00:33 +02:00 |
|
Christoph Potas
|
658710e982
|
+ added settingshelper to site defines
~ convert subtitles controller to es6 module
+ added support for class controller
Signed-off-by: Christoph Potas <christoph286@googlemail.com>
|
2020-05-09 01:20:32 +02:00 |
|
MrTimscampi
|
2d972efa0a
|
Remove useless expressions
|
2020-05-08 10:55:49 +02:00 |
|
MrTimscampi
|
7dc1cf771d
|
Merge remote-tracking branch 'upstream/master' into lazyloader
|
2020-05-07 11:01:14 +02:00 |
|
Dmitry Lyzo
|
e1e42b8557
|
Merge branch 'master' into youtube-keybindings
|
2020-05-05 11:50:31 +03:00 |
|
MrTimscampi
|
adb8f4114b
|
Add missing break in videoOsd
|
2020-05-04 18:13:34 +02:00 |
|
MrTimscampi
|
ea18f97e8b
|
Fix change requests in videoOsd
|
2020-05-04 18:09:10 +02:00 |
|
MrTimscampi
|
9e3ca706c4
|
Force the use of single quotes
|
2020-05-04 12:44:12 +02:00 |
|
Christoph Potas
|
6f0843cc6d
|
~ convert subtitlesettings to class
~ use base import name instead of relative file path
~ fix "new" calling
Signed-off-by: Christoph Potas <christoph286@googlemail.com>
|
2020-05-04 03:20:38 +02:00 |
|
Vasily
|
d5c7078c3f
|
Merge pull request #1131 from dmitrylyzo/fix-icons-webos2
Icons for WebOS 2
|
2020-05-03 23:24:26 +03:00 |
|
Dmitry Lyzo
|
a3bc8c183e
|
Use remove+add pattern for icons
|
2020-05-02 14:02:44 +03:00 |
|
MrTimscampi
|
c07dd26fdc
|
Merge remote-tracking branch 'upstream/master' into lazyloader
|
2020-05-01 14:43:51 +02:00 |
|
MrTimscampi
|
a697f22d13
|
Remove unused function in videoosd
|
2020-04-30 20:19:58 +02:00 |
|
MrTimscampi
|
be54505bf3
|
Remove the small logo in OSD and details page
|
2020-04-30 20:15:39 +02:00 |
|
ferferga
|
8b71ebc35f
|
more_vert in itemdetailpage.js
|
2020-04-30 00:05:44 +02:00 |
|
ferferga
|
6b79bd4921
|
Merge remote-tracking branch 'upstream/master' into vertical-menu
|
2020-04-29 23:55:47 +02:00 |
|
Dmitry Lyzo
|
d98645135b
|
Merge branch 'master' into fix-icons-webos2
|
2020-04-30 00:55:43 +03:00 |
|
ferferga
|
0117bf476a
|
Merge remote-tracking branch 'upstream/master' into global-globalize
|
2020-04-29 23:47:52 +02:00 |
|
Dmitry Lyzo
|
7905a868c8
|
Merge remote-tracking branch 'upstream/master' into fix-icons-webos2
Conflicts:
src/controllers/dashboard/plugins/available.js
src/controllers/dashboard/plugins/installed.js
|
2020-04-28 16:55:33 +03:00 |
|