Commit Graph

9 Commits (4a46bc315471a5ed55341ddf4984bfe3d329898e)

Author SHA1 Message Date
eric 29df43156b Merge remote-tracking branch 'Gluejar/master' 2017-09-14 12:42:42 -04:00
eric fc23d6bbab fixed issue with no ebook on ebf 2017-09-06 18:02:40 -04:00
eric 5bbeb45053 improve merge_works
work_relations were not being updated
2017-09-04 16:10:24 -04:00
eric 84da8bde94 Merge remote-tracking branch 'Gluejar/master'
# Conflicts:
#	frontend/views/__init__.py
#	questionnaire/admin.py
#	questionnaire/urls.py
#	questionnaire/utils.py
#	questionnaire/views.py
2017-08-21 12:02:48 -04:00
eric db97a98ae8 https 2017-07-27 10:33:13 -04:00
eric 52127faec9 put id creation at start of new edition form
this reworks the identifier creation UI
2017-07-26 17:33:38 -04:00
eric 85c4c3601c small refactor 2017-07-25 08:21:26 -04:00
eric 5c46c70fb1 delint and fix 2017-07-25 08:14:05 -04:00
eric d3eaf43228 start views reorg 2017-07-25 07:29:23 -04:00