summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-03:Changes: update changelog to reflect deprecationsAzul
2017-04-03Merge branch 'fix/icons' into 'master' azul
fix: icons that were using the bootstrap 2 syntax Closes #27 See merge request !35
2017-04-03fix: icons that were using the bootstrap 2 syntaxAzul
2017-04-03Merge branch 'feature/clear-user' into 'master' azul
feature: delete user clearing username Closes #26 See merge request !34
2017-04-03feature: delete user clearing usernameAzul
2017-04-03Merge branch 'fix/error-display' into 'master' azul
Fix error display See merge request !33
2017-04-03fix: error message display in productionAzul
only use the <pre> tag if the response was a text message i.e. during dev errors. Use the alert-danger class of bootstrap 3 rather than alert-error.
2017-03-29fix: bring back wrapped signup button with cancelAzul
2017-03-27Merge branch 'ui/menu' into 'master' azul
fix: bootstrap 3 style of menus Closes #24 See merge request !32
2017-03-27fix: bootstrap 3 style of menusAzul
span10 now is .col-??-10. ul.unstyled now is ul.list-unstyled also leave out unnecessary li if billing is disabled.
2017-03-27Merge branch 'fix/bootstrap-3' into 'master' azul
Fix/bootstrap 3 See merge request !31
2017-03-27upgrade: simple_form to bootstrap 3Azul
* reran the simple form initializer. * wrapped submit buttons are now broken and need a fix. * disabled confirmation validation in client side validations as the error message always is attached to the wrong field.
2017-03-24fix: make use of client_side_validations in jsAzul
2017-03-24bugfix: client_side_validation load orderAzul
The Active::Model modules of client side validations only get included in CouchRest::Model::Base if the gems are loaded in the right order: * activemodel is required first so the modules to extend are present * client_side_validations is required next so its modules get included * couchrest_model is required last so it includes the enhanced modules. \
2017-03-23Merge branch 'fix/display-js-error-responses' into 'master' azul
fix: display error js responses in dev environment See merge request !30 github issue #231
2017-03-23fix: display error js responses in dev environmentAzul
Sometimes the dev environment will send back a plain text response. This causes the json parser to raise an exception and used to cause the browser not to display any error message. Now we dumpt the whole server response - which happes to also include the backtrace. A lot more useful than doing nothing. In production this should never happen as 500s get handled by the ExceptionApplication / our ErrorsController there.
2017-03-23Merge branch 'cleanup/submodule' into 'master' azul
cleanup: no more submodules See merge request !29
2017-03-23cleanup: no more submodulesAzul
2017-03-23Merge branch 'install/subrepos' into 'master' azul
Install/subrepos See merge request !28 Fixes github issue #238
2017-03-23git subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srpAzul
subrepo: subdir: "app/assets/javascripts/srp" merged: "9e1a417" upstream: origin: "https://leap.se/git/srp_js" branch: "master" commit: "9e1a417" git-subrepo: version: "0.3.1" origin: "https://github.com/ingydotnet/git-subrepo" commit: "a7ee886"
2017-03-23remove srp submoduleAzul
2017-03-23Merge branch 'bugfix/ticket-validations' into 'master' azul
fix: keep ticket submit button clickable See merge request !27
2017-03-23fix: keep ticket submit button clickableAzul
It was marked as submitted even when client side validations interfered. fixes github issue #227
2017-03-23Merge branch 'bugfix/handle-couch-conflicts' into 'master' azul
bugfix: handle couch 404s See merge request !26
2017-03-23bugfix: handle couch 404sAzul
our special error handler for json requests would turn all exceptions into 500s - removed it. now the rescue_responses can do their thing again.
2017-03-23Merge branch 'upgrade/secret-key-base' into 'master' azul
upgrade: use rails4s 'secret_key_base' Closes #23 See merge request !24
2017-03-23Merge branch 'test/ruby-2.3' into 'master' azul
test: also test ruby 2.3 Closes #21 See merge request !25
2017-03-23upgrade: use rails4s 'secret_key_base'Azul
This will get us encrypted cookies but also requires changes to the platform. fixes #23
2017-03-22test: also test ruby 2.3Azul
2017-03-22Merge pull request #242 from LoadToCode/developazul
bugfixing for generating token script
2017-03-22Merge branch 'upgrade/bundle' into 'master' azul
upgrade: bundle Closes #13 See merge request !23
2017-03-22upgrade: bundleAzul
update all the dependencies. minitest now wants assert_nil instead of assert_equal nil, ... braintree now uses update_attributes rather than save.
2017-03-21Merge branch 'bugfix/deliver_now' into 'master' azul
upgrade: rails4.2 deprecated deliver -> deliver now Closes #16 See merge request !22
2017-03-21upgrade: rails4.2 deprecated deliver -> deliver nowAzul
fixes #16
2017-03-21Merge branch 'test/admin-user-api' into 'master' azul
test: admin user api always green Closes #17 See merge request !21
2017-03-21test: admin user api always greenAzul
Used to fail because the record already existed in the database fixes #17
2017-03-21Merge branch 'bugfix/404-for-keys-on-text-request' into 'master' azul
fix: 404 on key request with non html content-type Closes #8 See merge request !20
2017-03-21fix: 404 on key request with non html content-typeAzul
2017-03-20Merge branch 'bugfix/404-for-missing-info' into 'master' azul
fix: 404 for missing pages template - fixes #9 Closes #9 See merge request !19
2017-03-20fix: 404 for missing pages template - fixes #9Azul
2017-03-20Merge branch 'test/404-error-test' into 'master' azul
test: 404 response for missing key See merge request !18
2017-03-20test: 404 response for missing keyAzul
enable testing error responses on the full rack stack.
2017-03-20Merge branch 'bugfix/require-html-for-home-routes' into 'master' azul
bugfix: format: html for home roots See merge request !17
2017-03-20bugfix: format: html for home rootsAzul
That's the only thing the controller handles meaningful. Before the route would also catch anything that started with a . interpreting it as a format string. This lead to lots of false positives in our security scanner.
2017-03-20Merge branch 'debug/rescue-more-specifically' into 'master' azul
make the rescue in account creation less broad See merge request !15
2017-03-14Merge branch 'recovery-code' into 'master' azul
Update recovery code See merge request !16
2017-03-10Validates recovery code as hexadecimal data.Thais Siqueira
Related with https://github.com/pixelated/pixelated-user-agent/issues/924 With @aarni
2017-03-10Adds recovery code to user accountThais Siqueira
Related with https://github.com/pixelated/pixelated-user-agent/issues/924 With @aarni
2017-03-07make the rescue in account creation less broadAzul
It was catching errors that should have led to 500s
2017-03-07Merge branch 'username-with-dot' into 'master' azul
Fix keys route to accept usernames with dots See merge request !14