summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-09-08Merge remote-tracking branch 'origin/master' into masterAzul
2017-09-08Merge branch 'bugfix/psych' into 'master'azul
2017-08-17bugfix: remove better_errors gemelijah
2017-08-15remove merge cruftelijah
2017-08-15use i18n for login testelijah
2017-08-14pin to the newest psych gem, so as to not hit bugs in older versions (require...elijah
2017-08-07Version 0.9.1 - bugfixes0.9.1Azul
2017-08-07cleanup: Revert accidental favicon changeAzul
2017-08-07Merge branch 'fix/token-conflict' into 'master'azul
2017-08-07prevent token conflictsAzul
2017-07-26Merge branch 'fix/sass-load-path' into 'master'azul
2017-07-26custom: fix stylesheet customizationAzul
2017-07-26Revert "fix: make customization available to sass"Azul
2017-07-25Merge branch 'fix/sass-load-path' into 'master'azul
2017-07-25fix: make customization available to sassAzul
2017-04-21Merge branch 'test/gitlab-artifacts' into 'master' azul
2017-04-21ci: logs and debug files as artifactsAzul
2017-04-20Merge branch 'bugfix/8784-import-pgp-key' into 'master' azul
2017-04-20fix: set token in forms correctlyAzul
2017-04-03Version 0.9.0 - twitter, rails 4 and deprecations0.9.0Azul
2017-04-03:Changes: update changelog to reflect deprecationsAzul
2017-04-03Merge branch 'fix/icons' into 'master' azul
2017-04-03fix: icons that were using the bootstrap 2 syntaxAzul
2017-04-03Merge branch 'feature/clear-user' into 'master' azul
2017-04-03feature: delete user clearing usernameAzul
2017-04-03Merge branch 'fix/error-display' into 'master' azul
2017-04-03fix: error message display in productionAzul
2017-03-29fix: bring back wrapped signup button with cancelAzul
2017-03-27Merge branch 'ui/menu' into 'master' azul
2017-03-27fix: bootstrap 3 style of menusAzul
2017-03-27Merge branch 'fix/bootstrap-3' into 'master' azul
2017-03-27upgrade: simple_form to bootstrap 3Azul
2017-03-24fix: make use of client_side_validations in jsAzul
2017-03-24bugfix: client_side_validation load orderAzul
2017-03-23Merge branch 'fix/display-js-error-responses' into 'master' azul
2017-03-23fix: display error js responses in dev environmentAzul
2017-03-23Merge branch 'cleanup/submodule' into 'master' azul
2017-03-23cleanup: no more submodulesAzul
2017-03-23Merge branch 'install/subrepos' into 'master' azul
2017-03-23git subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srpAzul
2017-03-23remove srp submoduleAzul
2017-03-23Merge branch 'bugfix/ticket-validations' into 'master' azul
2017-03-23fix: keep ticket submit button clickableAzul
2017-03-23Merge branch 'bugfix/handle-couch-conflicts' into 'master' azul
2017-03-23bugfix: handle couch 404sAzul
2017-03-23Merge branch 'upgrade/secret-key-base' into 'master' azul
2017-03-23Merge branch 'test/ruby-2.3' into 'master' azul
2017-03-23upgrade: use rails4s 'secret_key_base'Azul
2017-03-22test: also test ruby 2.3Azul
2017-03-22Merge pull request #242 from LoadToCode/developazul