Commit Graph

324 Commits

Author SHA1 Message Date
4c6c3d3caa Merge pull request #44 from TomPallister/feature/set-up-admin-api
Feature/set up admin api
2017-02-25 19:17:56 +00:00
d33e0c6f3b merged develop and stolen binarymash dont publish unstable build script code 2017-02-25 18:27:20 +00:00
c2f98f0d69 final changes to readme and added postman scripts 2017-02-25 18:06:38 +00:00
a983af35a1 change to catch not modified response and get config working correctly 2017-02-25 17:47:24 +00:00
be24f9a9ca Added base url finder for when nothing set in Program.cs 2017-02-25 17:02:36 +00:00
07c334cc98 moved stuff around so a bit less crap 2017-02-25 16:09:00 +00:00
112a9c303e hacky auth working 2017-02-24 19:52:48 +00:00
bd07af6926 more work towards getting identity server and admin area set up 2017-02-22 22:13:35 +00:00
f8804f5d9d started adding some kind of auth config 2017-02-22 20:04:51 +00:00
aa0d8fe59a all tests passing, now to do authentication config provider 2017-02-22 07:48:49 +00:00
040f2daae0 Merge pull request #54 from binarymash/feature/FixPackagePublish
Fix package publishing
2017-02-21 17:47:55 +00:00
bf90b12f2c acceptance tests passing after fixing registrations 2017-02-21 07:39:09 +00:00
2dfdf0bb86 after much hacking unit tests passing 2017-02-21 07:34:47 +00:00
f1a403ae29 Fix package publishing 2017-02-19 20:56:05 +00:00
832e1d777e Merge pull request #53 from TomPallister/feature/remove-test-configuration-nonsense
removed test configuration nonsense
2017-02-19 15:47:58 +00:00
eb5dfc6975 removed test configuration nonsense 2017-02-19 15:43:58 +00:00
b0333a0e82 Merge pull request #49 from binarymash/feature/MacOSBuild
Fix #41 - get cake scripts running on Mac
2017-02-19 15:32:14 +00:00
d548a86327 Added integration test project as acceptance style doesnt work when running the new admin area because identityserver needs to use proper networking 2017-02-19 15:29:32 +00:00
3c9ad87b73 Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue. 2017-02-19 15:03:11 +00:00
d236ed3018 trying to get identity server authing 2017-02-19 13:59:17 +00:00
fa47663259 changed file config stuff to just use app base directory 2017-02-19 12:58:22 +00:00
816221c7a6 morehaking about 2017-02-19 12:33:09 +00:00
9d8d99ef4e Merge pull request #47 from TomPallister/feature/nuget-package-details
updated nuget info
2017-02-17 20:22:40 +00:00
ed3a629827 updated nuget info 2017-02-17 20:17:23 +00:00
b98310c80d working ssl example 2017-02-17 18:24:32 +00:00
4dac8cb4fb still hacking around 2017-02-17 07:27:49 +00:00
6b94c83451 Merge pull request #45 from binarymash/develop
Add syntax highlighting to readme
2017-02-16 13:51:31 +00:00
4ad8accbc0 grr! I always miss something... 2017-02-15 20:30:35 +00:00
45341df237 Remove extra level of indentation. Fixed a typo in one of tje json examples 2017-02-15 20:18:15 +00:00
0b4aee7b96 Add syntax highlighting to readme.md 2017-02-15 20:12:47 +00:00
bc5010837e removed using 2017-02-15 13:24:06 +00:00
219b45e7d0 updated acceptance test assertion 2017-02-15 07:51:19 +00:00
8ae8e2d834 added acceptance test for calling reroutes controller 2017-02-15 07:48:49 +00:00
1e88062ce2 moved create admin area call 2017-02-15 07:43:50 +00:00
9203e7f465 Merge pull request #37 from geffzhang/RateLimit
Rate limit
2017-02-15 07:08:37 +00:00
f302ee77bf remove bak file 2017-02-15 08:54:20 +08:00
ab6ae8a062 merge newest code for develop 2017-02-15 08:50:22 +08:00
0aad1f8fa0 Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit
# Conflicts:
#	src/Ocelot/Configuration/Builder/ReRouteBuilder.cs
#	src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
#	src/Ocelot/Configuration/QoSOptions.cs
#	src/Ocelot/Configuration/ReRoute.cs
#	test/Ocelot.AcceptanceTests/configuration.json
2017-02-15 08:49:40 +08:00
c966227ea9 Merge pull request #9 from TomPallister/develop
Merge Newest code
2017-02-15 07:13:21 +08:00
ef3deec8da more hacking 2017-02-13 19:14:49 +00:00
159969483b hacking away 2017-02-13 18:51:47 +00:00
95fc687e93 started messing around with admin area 2017-02-13 12:13:53 +00:00
0b830d9891 mapped admin path works for manual test 2017-02-13 07:42:31 +00:00
2fa6e66dd4 refactor code 2017-02-13 08:29:29 +08:00
659d124780 reset sdk version 2017-02-12 15:50:21 +08:00
e1f16c2be1 add ratelimit acceptance test 2017-02-12 15:49:21 +08:00
dc8106c904 Merge pull request #39 from TomPallister/feature/qos-documentation
Feature/qos documentation
2017-02-11 19:01:52 +00:00
286c7f8488 Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service. 2017-02-11 18:56:36 +00:00
820673dda8 added docs but qos acceptance test not working seems circuit never opens but not sure if it is meant to with timeouts..investigating 2017-02-11 15:11:10 +00:00
ce8da4c92d removed qos by accident, added back in 2017-02-11 13:14:25 +00:00