Commit Graph

12356 Commits

Author SHA1 Message Date
Joshua M. Boniface
78a5d999f4 Delete CODEOWNERS from dev branch
This was removed from master but wasn't transitioned with that merge because of GitHub being annoying and treating CODEOWNERS differently in each branch.
2019-01-12 16:10:51 -05:00
Joshua M. Boniface
41343b9220 Merge pull request #563 from jellyfin/master
Update dev from master
2019-01-12 15:23:48 -05:00
Joshua M. Boniface
2421cbd9cb Merge pull request #565 from jellyfin/revert-559-codeowners-master
Revert "Add Master codeowners"
2019-01-12 15:17:14 -05:00
Bond-009
36e09949be Revert "Add Master codeowners" 2019-01-12 20:31:22 +01:00
Joshua M. Boniface
016bad1ea3 Merge pull request #556 from grafixeyehero/dev
Fix "Password Reset by PIN" page
2019-01-12 13:44:09 -05:00
Joshua Boniface
e04f652eff Add Master codeowners
In conjunction with branch protection rules, this will require
approval from the Org owners (myself or @nvllsvm) before a merge
can be accepted.
2019-01-12 13:41:37 -05:00
Joshua M. Boniface
03ec62e478 Add link to our contributing docs as well 2019-01-12 13:41:37 -05:00
Vasily
dadd6e11b1 Add link to writing good messages article
Co-Authored-By: joshuaboniface <joshua@boniface.me>
2019-01-12 13:41:37 -05:00
Vasily
c28283aa7c Be explcit about what the version is
Co-Authored-By: joshuaboniface <joshua@boniface.me>
2019-01-12 13:41:37 -05:00
Joshua M. Boniface
2e53f4c2e9 Add blurb about title 2019-01-12 13:41:37 -05:00
Joshua M. Boniface
f1d6f04572 Consistent formatting for System fields 2019-01-12 13:41:37 -05:00
Joshua M. Boniface
f818053a43 Update bug_report.md
Add section about log files.
2019-01-12 13:41:37 -05:00
Joshua Boniface
874a6bf38b Update pull request template 2019-01-12 13:41:37 -05:00
Joshua M. Boniface
deb9d97d37 Update issue templates
Adds issue templates for Bugs, Features, and Enhancements.
2019-01-12 13:41:37 -05:00
Andrew Rabert
678e0b357b Merge pull request #549 from jellyfin/issue-templates
Update issue templates
2019-01-12 18:32:56 +00:00
Andrew Rabert
c44c4b2eb9 Merge pull request #552 from jellyfin/request-templates
Update pull request template
2019-01-12 18:32:17 +00:00
Vasily
3f273632a0 Merge pull request #559 from joshuaboniface/codeowners-master
Add Master codeowners
2019-01-12 20:30:20 +03:00
Joshua Boniface
2d9cf14a72 Add Master codeowners
In conjunction with branch protection rules, this will require
approval from the Org owners (myself or @nvllsvm) before a merge
can be accepted.
2019-01-11 23:12:28 -05:00
Joshua M. Boniface
53b8aa52e1 Add link to our contributing docs as well 2019-01-11 23:05:38 -05:00
Vasily
7a3b01da1b Add link to writing good messages article
Co-Authored-By: joshuaboniface <joshua@boniface.me>
2019-01-11 23:02:51 -05:00
Vasily
b1406d33f1 Be explcit about what the version is
Co-Authored-By: joshuaboniface <joshua@boniface.me>
2019-01-11 22:05:27 -05:00
grafixeyehero
862fe1a290 add grafixeyehero to CONTRIBUTORS 2019-01-11 19:52:26 +03:00
Joshua M. Boniface
fa4c6ee8b2 Add blurb about title 2019-01-11 10:40:14 -05:00
Joshua M. Boniface
c888879599 Merge pull request #541 from cvium/fix_providermanager_guid
Change ItemId to Guid in ProviderManager
2019-01-11 09:17:25 -05:00
Joshua M. Boniface
2f31f9a382 Consistent formatting for System fields 2019-01-10 23:42:56 -05:00
Joshua M. Boniface
54e2feabba Update bug_report.md
Add section about log files.
2019-01-10 23:41:40 -05:00
Joshua Boniface
2e39a80c63 Update pull request template 2019-01-10 23:25:58 -05:00
Joshua M. Boniface
7cbff8d3f1 Update issue templates
Adds issue templates for Bugs, Features, and Enhancements.
2019-01-10 23:20:58 -05:00
Andrew Rabert
e5c2dbdf23 Merge pull request #540 from joshuaboniface/api-keys
Update Emby API keys to our own
2019-01-10 23:02:29 -05:00
Joshua M. Boniface
15c89d281e Merge pull request #506 from hawken93/linting
Removing tabs and trailing whitespace
2019-01-10 19:54:18 -05:00
grafixeyehero
9659decef0 fix the forgotpasswordpin
fix passwordreset.txt print
2019-01-11 01:15:00 +03:00
Joshua Boniface
fddd72a3bd Update Fanart commented-out API key to our own 2019-01-10 15:17:08 -05:00
Joshua Boniface
8489febcc7 Update Omdb API key to our own 2019-01-10 15:17:07 -05:00
Anthony Lavado
5900ab8c68 Update OpenSubtitles User Agent to our own 2019-01-10 13:26:52 -05:00
cvium
0abe5b6ec3 Change ItemId to Guid like all the others 2019-01-10 15:30:26 +01:00
Andrew Rabert
3d867c2c46 Merge pull request #516 from Bond-009/env
Remove useless properties from IEnvironmentInfo
2019-01-09 22:08:58 -05:00
Andrew Rabert
7a832045d6 Merge pull request #424 from dkanada/submodule
add jellyfin-web as submodule
2019-01-09 22:05:11 -05:00
Joshua Boniface
7603b8d0fe Update TheTVDB API key to our own 2019-01-09 12:44:48 -05:00
Joshua Boniface
04ab1daa02 Update FanArt API key to our own 2019-01-09 12:24:16 -05:00
Joshua Boniface
41da58206f Update TheAudioDB API key to our own 2019-01-09 12:19:10 -05:00
Joshua Boniface
909409bb6d Update TheMovieDB API key to our own 2019-01-09 12:11:42 -05:00
Bond-009
f454b753f2 separate path with comma
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2019-01-10 00:23:44 +09:00
dkanada
9de66e9e87 add jellyfin-web as submodule 2019-01-09 23:35:05 +09:00
Joshua M. Boniface
dbceef97fd Merge pull request #524 from jellyfin/dev
Master 10.0.1
2019-01-09 00:48:32 -05:00
Anthony Lavado
932fcb0a9c Merge pull request #523 from joshuaboniface/master-10.0.1
Bump version for 10.0.1
2019-01-08 20:37:53 -05:00
Joshua Boniface
f822d1c871 Bump version for 10.0.1 2019-01-08 20:09:33 -05:00
Joshua M. Boniface
61aeb0e9a8 Merge pull request #486 from Bond-009/plugins
Add NuGet package info to plugin projects
2019-01-08 18:10:09 -05:00
Joshua M. Boniface
803226acef Merge pull request #519 from Bond-009/image
Fix the DecodeJfif function to get proper image sizes
2019-01-08 18:09:54 -05:00
Joshua M. Boniface
cdefc046e6 Merge pull request #491 from sparky8251/fix-user-profile
Fix userprofile.js crash
2019-01-08 18:04:37 -05:00
Joshua M. Boniface
9156b21714 Merge pull request #493 from Bond-009/values
Remove unused resource
2019-01-08 18:04:12 -05:00