Commit graph

2717 commits

Author SHA1 Message Date
Jamie
794ce21123 Fixed #2224 2018-05-05 20:02:25 +01:00
Jamie
cd60035bde !wip changelog 2018-04-28 21:11:50 +01:00
Jamie
52f25053d8 !wip changelog 2018-04-28 21:11:04 +01:00
Jamie
4ed18e88bc
Merge pull request #2209 from tidusjar/develop
Develop
2018-04-28 20:49:27 +01:00
Jamie
675ed52c93 !wip changelog 2018-04-28 20:48:48 +01:00
Jamie
1ffa159ddb Merge branch 'develop' of https://github.com/tidusjar/Ombi into develop 2018-04-28 20:48:05 +01:00
Jamie
647a01ebb0 Use the Application URL if we have it to fix #2201 2018-04-28 20:47:42 +01:00
Jamie Rees
8e3ae37cf5 !wip update changelog 2018-04-27 22:25:26 +01:00
Jamie Rees
affbd2ff65 !wip 2018-04-27 22:01:38 +01:00
Jamie Rees
3532c20ea6 Really fixed #2119 this time !wip 2018-04-27 22:00:12 +01:00
Jamie Rees
0bbeeaeb3e Fix build !wip 2018-04-27 21:36:34 +01:00
Jamie Rees
28159cdf53 Potential fix for #2119 2018-04-27 20:49:18 +01:00
Jamie
1cb074586f
Merge pull request #2200 from tidusjar/master
Merge
2018-04-26 23:25:50 +01:00
Jamie
ad297d736e
Update appveyor.yml
Downgrade Nodejs !wip
2018-04-26 07:44:39 +01:00
Jamie
ac597af702 Fix build !wip 2018-04-25 21:10:26 +01:00
Jamie
a7166e8857
Merge pull request #2194 from tidusjar/develop
Develop
2018-04-25 20:51:22 +01:00
Jamie
d443efd8ea Clean up the error code when the OAuth user is not authorized. 2018-04-25 20:50:34 +01:00
Jamie
73340d4fb6 moved the Plex OAuth setting to the Authentication Settings !wip 2018-04-24 21:13:52 +01:00
Jamie Rees
d80c50a40a !wip changelog 2018-04-24 14:50:44 +01:00
Jamie Rees
0b2e488e8f Added paging to the TV Requests page 2018-04-24 14:44:22 +01:00
Jamie Rees
69e324c670 Added Paging to the Movie Requests Page 2018-04-24 14:23:07 +01:00
Jamie Rees
e3adbcb51e Fixed the error from upgrading the hangfire package !wip 2018-04-24 14:05:18 +01:00
Jamie
c244faca7d !wip changelog 2018-04-24 08:34:48 +01:00
Jamie
e12146c986 More improvements to the Plex OAuth, Added the ability to turn it off if needed 2018-04-24 08:32:31 +01:00
Jamie
f62e97bb32 Fixed bug #2188 #2134 2018-04-24 08:09:11 +01:00
Jamie
6806b97c1b Fixed the bug where only showing API User #2187 2018-04-23 21:15:03 +01:00
Jamie Rees
f24b0f20eb Updated Mailkit dependancy 2018-04-23 16:30:02 +01:00
Jamie Rees
b8c64dff2d Update Hangfire, Newtonsoft and Swagger 2018-04-23 16:27:33 +01:00
Jamie Rees
e3f5f032c0 Fixed the PresetTheme stuff !wip 2018-04-23 08:29:09 +01:00
Jamie Rees
bb1795345b Merge branch 'develop' of https://github.com/tidusjar/Ombi into develop 2018-04-23 08:22:59 +01:00
Jamie Rees
5425e4e109 !wip removed the code that should have not been there. 2018-04-23 08:22:40 +01:00
Jamie
ced7cfa80f
Merge pull request #2186 from anojht/baseurl-themefix
detect if baseurl is set and reset the url !wip
2018-04-22 07:59:30 +01:00
Anojh
0c6083dd9a detect if baseurl is already set, and reset the link 2018-04-21 22:26:25 -07:00
Jamie Rees
8927c5fa9c Fixed #2164 2018-04-21 22:51:56 +01:00
Jamie Rees
a0dbd1c442 Fixed #2151 2018-04-21 22:47:01 +01:00
Jamie Rees
0ce9fb2df9 Fixed #2170 2018-04-21 22:25:53 +01:00
Jamie Rees
b80ef04ab7 !wip fixed merge 2018-04-21 22:04:44 +01:00
Jamie
79d7cc9a2d
Merge pull request #2183 from tidusjar/feature/embynewsletterfixes
Feature/embynewsletterfixes
2018-04-21 21:58:57 +01:00
Jamie
76381509e9
Merge branch 'develop' into feature/embynewsletterfixes 2018-04-21 21:58:48 +01:00
Jamie Rees
443c79b0ca Fixed #2179.
Note: This requires you to press the update database again before using the newsletter!
2018-04-21 21:43:33 +01:00
Jamie
703203ed5c !wip 2018-04-21 21:27:42 +01:00
Jamie Rees
04af799efb Fixed the newsletter not sending #2134 2018-04-21 21:22:25 +01:00
Jamie
ad41ea2086
Merge pull request #2180 from anojht/baseurl-themefix
fixing baseurl breaking themes issue #2177
2018-04-21 19:52:01 +01:00
Jamie
2bcbc56721
Merge pull request #2181 from Unimatrix0/patch-1
Sign In rather than Login/Continue
2018-04-21 19:51:42 +01:00
Avi
77280cf4ae
Sign In rather than Login/Continue 2018-04-20 18:25:58 -05:00
Jamie
2c08908c8b Fixed the ombi login button !wip 2018-04-20 23:29:00 +01:00
Anojh
738bdb46d7 Fix baseurl breaking themes 2018-04-20 14:02:19 -07:00
Jamie
4e8daeecd7
Merge pull request #2174 from tidusjar/feature/plexoauth
Added Plex OAuth into Ombi
2018-04-20 10:55:19 +01:00
Jamie Rees
e980ac6fc5 Fixed styling !wip 2018-04-20 10:48:39 +01:00
Jamie Rees
f05a9a5090 Removed no longer needed stuff and fixed linting !wip 2018-04-20 10:41:40 +01:00