Skip to content
Snippets Groups Projects
Commit c17e4a06 authored by iaibrys's avatar iaibrys
Browse files

Merge branch 'develop'

* develop: (540 commits)
  Dummy change to pick up new feedbackjs
  Fix issues with pdf rendering and admin index.
  Fix issue with edit button in admin page not working.
  Fix issue with edit icons.
  Small updates
  Build feedback.js in Dockerfile
  Update project depedencies
  Resolve "The feedback widget is very slow"
  Fix DB.
  Fix test issues.
  Feature/remove coffeescript
  Move coffeescript to ES6; add webpack
  Tweak url
  Add button for filemanager. resolves #231
  $CI_COMMIT_REF_SLUG -> $CI_COMMIT_REF_NAME
  Add production deploy to CI
  Add user to logging.
  Resolve "Filesystem restructure after git removal"
  fix test script
  Fix typo.
  ...

# Conflicts:
#	.gitlab-ci.yml
parents 18eaca65 e276db20
No related branches found
No related tags found
No related merge requests found
Checking pipeline status
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment