Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix (webapi): CORS problems #307

Merged
merged 4 commits into from
Nov 7, 2016
Merged

fix (webapi): CORS problems #307

merged 4 commits into from
Nov 7, 2016

Conversation

tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Nov 3, 2016

@tobiasschweizer tobiasschweizer changed the title fix (akka CORS): add missing method DELETE to config fix (webapi): CORS problems Nov 4, 2016
@tobiasschweizer tobiasschweizer added this to the Beta Release milestone Nov 4, 2016
@tobiasschweizer tobiasschweizer added the bug something isn't working label Nov 4, 2016
@subotic
Copy link
Collaborator

subotic commented Nov 4, 2016

@github: Github has also some bugs. The last four changes where made by me (@subotic) and not @tobiasschweizer

@subotic
Copy link
Collaborator

subotic commented Nov 4, 2016

This should work now. @tobiasschweizer could you please test it again with Salsah?

@subotic subotic assigned tobiasschweizer and unassigned subotic Nov 4, 2016
@tobiasschweizer
Copy link
Contributor Author

I have a look at it right now.

implicit def corsRejection = corsRejectionHandler

/**
* Bring the Knora exception handler into scope, which is responsible for converting our exceptions to HttpResponses
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brings

@tobiasschweizer
Copy link
Contributor Author

Nice job! Now I can delete resources and I get proper error messages on failed attempts to manipulate values.

@subotic
Copy link
Collaborator

subotic commented Nov 7, 2016

Thanks :-) Can I merge?

@tobiasschweizer
Copy link
Contributor Author

Yes, I think so. There is a small typo I found in the documentation you could fix before merging.

@subotic
Copy link
Collaborator

subotic commented Nov 7, 2016

There is a small typo I found in the documentation you could fix before merging.

The typo is in code that was deleted ;-)

@tobiasschweizer
Copy link
Contributor Author

Still I want to fix it!

joking, sorry, my fault

@subotic subotic merged commit d82ee89 into develop Nov 7, 2016
@subotic subotic deleted the wip/fix_akka branch November 7, 2016 08:39
SepidehAlassi added a commit that referenced this pull request Dec 13, 2016
* develop:
  Improve configuration for more concurrent requests (#338)
  Upgrade to Scala 2.12 (#343)
  Fix various inconsistencies in knora-base.ttl and docs. (#330)
  Fix language switching and login/logout in SALSAH (#331)
  Graph data API operation (#267)
  Allow connections over HTTPS (#332)
  Update README.md
  Add link to GraphDB.
  fix (salsah): Add missing JavaScript “var”.
  fix (webapi): Fix RouteUtilV1 so it returns HTML instead of JSON when requested (#326)
  Ontology and documentation fixes. (#325)
  fix (salsah): Create multiple links in a resource, and other bug fixes (#315)
  feature (webapi): Make TransformData fix “test” labels on regions. (#311)
  Fixes for subclasses and subproperties (#303)
  Add script to update docs on knora.org (#300)
  docs: Make trivial change for testing purposes.
  fix (webapi): CORS problems (#307)
  Use inference to optimise searches on GraphDB (#301)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants