Skip to content

Commit

Permalink
Merge branch 'develop' into feature/epic_379/base
Browse files Browse the repository at this point in the history
* develop:
  #574 add charset to scss files
  Extra tests
  Other way
  Line length split
  Fix tests
  Switch to one route
  Font fix
  #533 link to printable tree
  #532 printable tree
  #532 wip
  #436 View config for scheme tree (#553)
  • Loading branch information
koenedaele committed Jul 20, 2020
2 parents 8c39962 + 57821db commit 66683c3
Show file tree
Hide file tree
Showing 22 changed files with 485 additions and 400 deletions.
2 changes: 2 additions & 0 deletions atramhasis/routes.py
Expand Up @@ -34,7 +34,9 @@ def includeme(config):
request_method="GET")
config.add_route('search_result', pattern='/conceptschemes/{scheme_id}/c', accept='text/html')
config.add_route('scheme_root', pattern='/conceptschemes/{scheme_id}/c/', accept='text/html')
config.add_route('scheme_tree_html', pattern='/conceptschemes/{scheme_id}/tree', accept='text/html')
config.add_route('scheme_tree', pattern='/conceptschemes/{scheme_id}/tree', accept='application/json')

config.add_route('search_result_export', pattern='/conceptschemes/{scheme_id}/c.csv')
config.add_route('atramhasis.edit_conceptscheme', pattern='/conceptschemes/{scheme_id}',
accept='application/json', request_method='PUT')
Expand Down

0 comments on commit 66683c3

Please sign in to comment.