Commit graph

5498 commits

Author SHA1 Message Date
Jamie.Rees
b0869303af Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2016-10-24 17:18:40 +01:00
Jamie.Rees
877e0fa8fb Fix #612 2016-10-24 17:18:25 +01:00
Jamie
ee515dcd90 Merge pull request #609 from ProtoJazz/s582_admin_improvements_2
s582: admin improvements part 2
2016-10-24 15:40:12 +01:00
Jamie.Rees
42c437905e User management, migration and newsletter 2016-10-24 15:08:30 +01:00
Jamie.Rees
11ecbf04f6 Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2016-10-24 10:33:36 +01:00
Jamie.Rees
3256a743d9 Revert "Sorting out the current state of migrations"
This reverts commit ac8e5320ef.
2016-10-24 10:33:19 +01:00
Jim MacKenzie
56edd81f2d s582: admin improvements part 2
Added new lables to requests, moved some strings into resx files
2016-10-22 21:19:49 -05:00
tidusjar
0188cae927 #602 recently added improvements 2016-10-22 20:59:20 +01:00
tidusjar
6e3339ad3c Added our own custom migrations, a lot easier to migrate DB versions now. 2016-10-22 20:38:05 +01:00
Jamie.Rees
ac8e5320ef Sorting out the current state of migrations 2016-10-21 17:25:16 +01:00
Jamie.Rees
171c64fe8e Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2016-10-20 12:06:46 +01:00
Jamie.Rees
39955f1cad Reverted TMDB package 2016-10-20 12:06:42 +01:00
Jamie
475a75855c Merge pull request #591 from ProtoJazz/s582_admin_improvements
s582 admin improvements
2016-10-20 11:36:13 +01:00
Jamie.Rees
098790dcab Remove DB Option 2016-10-20 11:22:00 +01:00
Jim MacKenzie
71446f0b59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	PlexRequests.Services/Jobs/RecentlyAdded.cs
2016-10-19 21:24:47 -05:00
tidusjar
aa758f3a54 Upgrade the movie DB package and fixed #370
To fix this I had to make another API call... It slows down the search...
2016-10-19 23:36:56 +01:00
tidusjar
bcf1c9cd8e Lots of small fixes including #475 2016-10-19 22:53:56 +01:00
tidusjar
ac51b39636 A better fix for #587 2016-10-19 21:41:55 +01:00
tidusjar
512d2131bd Fixed #553 2016-10-19 21:21:52 +01:00
Jamie.Rees
1a0e7cbe7b #601 2016-10-19 18:05:19 +01:00
Jamie.Rees
ec49ab7389 More rework to use the Plex DB 2016-10-19 13:20:56 +01:00
Jamie.Rees
dc92285cfa More work around using the PlexDatabase 2016-10-18 14:50:35 +01:00
Jim MacKenzie
b8c488ce3d Marked as obsolete 2016-10-17 20:00:03 -05:00
Jim MacKenzie
83050edf68 Merge dev into branch 2016-10-17 19:55:53 -05:00
Jamie.Rees
67b124148c Plex DB 2016-10-17 17:31:38 +01:00
Jamie.Rees
705a4fe653 Allow to process even know we had an error #578 2016-10-17 13:42:49 +01:00
Jamie
5fcbc9c3dd Merge pull request #597 from JimboMonkey1234/datepicker
Fix boostrapper-datetimepicker imports (#586)
2016-10-16 16:06:18 +01:00
David Torosyan
3850e16280 Fix boostrapper-datetimepicker imports (#586)
When the base url is set, resource file imports need a forward slash at
the beginning. Since it's missing from the datepicker.min.css link,
the Landing Page fails to load correctly causing odd behavior.
2016-10-15 17:38:48 -07:00
Jim MacKenzie
bf7ae9595f Merged branch s582_admin_improvements into s582_admin_improvements 2016-10-14 22:17:17 -05:00
Jim MacKenzie
bfea681522 Migration setup 2016-10-14 22:14:27 -05:00
tidusjar
b7c47035dd Potential work around for #587 2016-10-13 21:43:53 +01:00
tidusjar
73b50ee063 Fixed #589 2016-10-13 21:43:36 +01:00
Jim MacKenize
645a02aa1f Merge branch 'master' into s582_admin_improvements 2016-10-12 21:37:00 -05:00
Jim MacKenzie
b06c55c2bf removed extra line breaks 2016-10-12 21:27:28 -05:00
Jim MacKenzie
626decacb1 Moved Newsletter Settings to its own page 2016-10-12 21:26:03 -05:00
Jamie
651398ed7d Merge pull request #580 from tidusjar/tidusjar-patch-2
Update appveyor.yml
2016-10-10 22:04:28 +01:00
Jamie
5288685f97 Update appveyor.yml 2016-10-10 22:01:11 +01:00
Jamie
4a29a0a89d Merge pull request #579 from tidusjar/dev
Dev to master
2016-10-10 22:00:16 +01:00
tidusjar
c1ea2ecc65 Reverted 2016-10-10 21:55:43 +01:00
tidusjar
7597202aac Make sure it's enabled before sending the recently added 2016-10-10 21:40:42 +01:00
tidusjar
087d825665 Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2016-10-10 21:36:42 +01:00
tidusjar
c0e6030ba3 FIXED!!!!! YES BITCH! #550 2016-10-10 21:36:29 +01:00
Jamie.Rees
0b241e0be3 Moved the HR inside the table for TV Shows 2016-10-10 10:15:26 +01:00
Jim MacKenize
41e6d72210 Added Paypalme options, no UI yet (#568)
* Added Paypalme options

* Added Custom Donation UI

* Updated error checking

* Review fixes to donation work
2016-10-10 07:59:39 +01:00
Jamie
6a7ea83f99 Merge pull request #575 from tidusjar/master
master > dev
2016-10-09 22:20:16 +01:00
tidusjar
3e5e188e2c Moved the horizontal rules inside the table row 2016-10-09 22:19:13 +01:00
Jamie
9bb42a78c1 Merge pull request #572 from tidusjar/tidusjar-patch-2
Update appveyor.yml
2016-10-09 18:40:19 +01:00
Jamie
44e304a5c2 Update appveyor.yml 2016-10-09 18:37:51 +01:00
Jamie
6bbd4593c1 Merge pull request #571 from tidusjar/tidusjar-patch-1
Update README.md
2016-10-09 15:20:10 +01:00
Jamie
078732e660 Update README.md 2016-10-09 15:15:44 +01:00