milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13334 commits 1 branch 0 tags 134 MiB
Commit graph

1149 commits

Author SHA1 Message Date
ferferga
2a0f971e76 Merge remote-tracking branch 'upstream/master' into blurhash 2020-05-30 14:26:11 +02:00
MrTimscampi
9535d94ab7 Add Path field to List query 
Fixes the lack of play button on books
 2020-05-30 13:15:49 +02:00
Matt Montgomery
b889dfb3c6 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 19:28:55 -05:00
Dmitry Lyzo
15f0b12747 Merge remote-tracking branch 'upstream/master' into fix-another-usersettings 
Conflicts:
	src/scripts/settings/userSettings.js
 2020-05-28 20:08:37 +03:00
DesertCookie
4a6c95cfa7 Renamed to fix merge-issue 2020-05-27 21:40:13 +02:00
dkanada
3667a9f06f
revert self restart check 2020-05-28 03:35:45 +09:00
dkanada
e140381a02
Merge pull request #1288 from jellyfin/banner 
Add display preference for details banner and update some defaults
 2020-05-28 03:08:35 +09:00
Vasily
5d617d8102 Adapt to server-side API change, fix People cards 2020-05-27 19:19:33 +03:00
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
DesertCookie
1e1419b45b Restart with fresh file 
Readded sorting logic into a fresh copy of `itemdetailpage.js`.
 2020-05-20 14:47:18 +02:00
DesertCookie
6f1cf4a98a Replaced double-quotes with single-quotes 2020-05-19 17:07:46 +02:00
DesertCookie
cadef5393e Add logic to sort resolutions and versions separately 
Movie versions like "2160p" and "UHD" are now sorted separately; the first in descending order, the second in ascending order.
 2020-05-19 13:15:46 +02: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
DesertCookie
96aedcd945 Removed tabs 
Accidentally added in by Notepad++ autocomplete
 2020-05-16 16:15:44 +02:00
DesertCookie
c2563c5675 Fixed tabs and spacing 2020-05-16 16:11:39 +02:00
DesertCookie
5ad1c57b52 Sort playback media sources alphabetically 
Sorts the map of media sources received by the server alphabetically ignoring capitilisation.
 2020-05-16 14:22:25 +02: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
ConfusedPolarBear
6d4478e8f2
Merge branch 'master' into quickconnect 2020-05-05 20:42:15 -05:00