Commit graph

1227 commits

Author SHA1 Message Date
Jamie
ec751d421d Merge branch 'master' into EAP 2017-01-09 08:03:56 +00:00
Jamie
7a034f5a07 Merge pull request #889 from tidusjar/dev
Dev
2017-01-04 08:25:33 +00:00
Jamie.Rees
98a91faf52 Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2017-01-04 08:24:59 +00:00
Jamie.Rees
add4e86d49 More work on watcher, should all be good now. #878 2017-01-04 08:24:50 +00:00
Jamie
92eacb9cc6 Merge pull request #883 from tidusjar/dev
Dev
2017-01-02 20:54:37 +00:00
TidusJar
939de50a02 fixed #878 2017-01-02 20:54:22 +00:00
TidusJar
f074f28db7 * userManagementController.js: fixed #881
* UserManagementModule.cs:
2017-01-02 20:23:53 +00:00
Jamie
34e00e15c2 Delete PlexRequests.sln.DotSettings 2016-12-30 09:09:57 +00:00
Jamie
25cae4623f Merge pull request #863 from tidusjar/dev
Fixed #862
2016-12-30 08:47:30 +00:00
Jamie.Rees
d032cdfa54 Fixed #862 2016-12-30 08:47:05 +00:00
Jamie
10780b001e Merge pull request #860 from tidusjar/dev
Dev
2016-12-29 15:32:18 +00:00
Jamie.Rees
7081eac5bb #399 and #398 finished 2016-12-29 15:27:21 +00:00
Jamie.Rees
8a288db2b0 More work on #399 2016-12-29 13:40:12 +00:00
Jamie
8f9366b860 Merge pull request #854 from tidusjar/dev
Watcher Integration
2016-12-29 11:50:48 +00:00
Jamie.Rees
ba80dfe3aa Finished #884 2016-12-29 11:49:14 +00:00
Jamie.Rees
ad2169ca17 More for #844 2016-12-29 10:02:52 +00:00
Jamie.Rees
262a90e05c another #844 2016-12-29 09:45:41 +00:00
Jamie.Rees
b2e53c05af Fixed a dependancy issue with #844 2016-12-29 09:44:16 +00:00
Jamie.Rees
0811a89c86 Finished the main part of #844 just need testing 2016-12-29 09:37:00 +00:00
Jamie
2b16266f3e Merge pull request #853 from tidusjar/dev
Dev into EAP
2016-12-29 09:30:34 +00:00
Jamie.Rees
b3c7d83529 Fixed #832 2016-12-29 08:20:27 +00:00
Jamie.Rees
841c9cdf54 Fixed build 2016-12-28 16:31:03 +00:00
Jamie.Rees
0a75267f09 Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git 2016-12-28 16:27:42 +00:00
Jamie.Rees
64119f57c7 Fixed #850 also started #844 (Wrote the API interaction) 2016-12-28 16:27:21 +00:00
Jamie
79d72cb801 Merge pull request #848 from tidusjar/dev
Dev
2016-12-28 12:41:16 +00:00
Jamie
9c0aa44a87 Merge pull request #846 from mhann/rename-travis-solution
Change solution name in travis
2016-12-28 12:39:43 +00:00
Jamie
dba4443ccb Merge pull request #847 from mhann/fix-small-md-typo
Fix tiny readme typo
2016-12-28 12:32:04 +00:00
Jamie.Rees
e17bd94990 #801 #292 done 2016-12-28 12:31:43 +00:00
Jamie.Rees
698356d55e Should fix #841 #835 #810 2016-12-28 11:18:37 +00:00
mhann
a0379bc86c Fix tiny readme typo 2016-12-27 23:21:00 +00:00
mhann
8bb9c89182 Change solution name in travis 2016-12-27 23:18:40 +00:00
Jamie
2d7ded325f Merge pull request #843 from mhann/dev
Fix small typo in ticket overview page
2016-12-27 20:21:42 +00:00
mhann
0773aafb89 Fix small typo in ticket overview page 2016-12-27 19:23:54 +00:00
SuperPotatoMen
b9337c9b24 Merge pull request #834 from tidusjar/SuperPotatoMen-patch-1
Update ISSUE_TEMPLATE.md
2016-12-23 11:25:18 +01:00
SuperPotatoMen
57bde3032b Update ISSUE_TEMPLATE.md 2016-12-23 11:14:13 +01:00
SuperPotatoMen
2ef5615ccd Update ISSUE_TEMPLATE.md 2016-12-23 11:13:44 +01:00
SuperPotatoMen
bbf06a3e14 Update ISSUE_TEMPLATE.md 2016-12-23 11:11:19 +01:00
Jamie.Rees
964c120798 More work on the combined login 2016-12-21 12:32:52 +00:00
Jamie.Rees
5822505189 Fixed db issue 2016-12-21 08:18:08 +00:00
SuperPotatoMen
51094997c0 Merge pull request #822 from tidusjar/SuperPotatoMen-patch-2
Update README.md
2016-12-20 15:36:03 +01:00
SuperPotatoMen
e517f34a43 Update README.md 2016-12-20 15:30:56 +01:00
SuperPotatoMen
e73caf0697 Update README.md 2016-12-20 15:25:43 +01:00
Jamie
4d82d0c99f Merge pull request #821 from tidusjar/SuperPotatoMen-patch-1
Update ISSUE_TEMPLATE.md
2016-12-20 13:35:35 +00:00
SuperPotatoMen
eb444e85a9 Update ISSUE_TEMPLATE.md 2016-12-20 13:36:14 +01:00
Jamie.Rees
6300c98bb7 name changes 2016-12-20 10:22:18 +00:00
tidusjar
796f0fc188 All Sln changes 2016-12-19 20:14:31 +00:00
tidusjar
b5855f2644 Moved API Sln dir 2016-12-19 20:10:09 +00:00
tidusjar
0d6cdebfa8 Fixed build 2016-12-19 20:08:43 +00:00
tidusjar
9c517aa2e0 moved namespaces 2016-12-19 20:05:04 +00:00
tidusjar
b90fd59e5e Renamed zip 2016-12-19 19:59:33 +00:00