summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-26custom: fix stylesheet customizationAzul
fixes #8794 Reported the underlying issue here: https://github.com/rails/sass-rails/issues/406 Basically `@import` works like this: * look for the file relative to the current file * look for the file as an absolute path following the priorities in the * asset load_paths If the file can be imported as a relative path that will take precedence. So in order to pick up the head and tails inside customization rather than in app/assets there are three possibilities: 1) use an absolute path. This is not as easy as it seems. There is no way of indicating a path is meant to be absolute so we would have to ensure it does not resolve to a relative path. 2) have a application.scss file inside the customization folder. Since this is the main file it will be used instead of the app/assets one. In there relative paths will now also default to the customization folder rather than app/assets. Once we are in an app/assets file though it will not go back to picking up customization with relative paths 3) use //= require instead of import. rails-sass advices against this as each required file would be compiled on it's own and variables could not be shared. Going with option 1 here: ```scss // application.scss: @import "custom/head_import"; ``` ```scss // custom/head_import.scss: @import "head"; ``` As long as there is no custom/head.scss in app/assets it will import head as an absolute path and thus prefer config/custom over app/assets. This seems like the best option for now as it does not require changes to the deployments.
2017-07-26Revert "fix: make customization available to sass"Azul
This reverts commit cc95bb27e873dc6140f9a909a57f075a0ef2f387.
2017-07-25fix: make customization available to sassAzul
Somehow sass did not follow the rails assets path order. Therefore the default tail.scss would stay in effect even when there was a different tail.scss in the customization folder. Adding the customization stylesheet folder to the sass load_paths works around this for now. Still need to check if it works in production though.
2017-04-21Merge branch 'test/gitlab-artifacts' into 'master' azul
ci: logs and debug files as artifacts See merge request !38
2017-04-21ci: logs and debug files as artifactsAzul
2017-04-20Merge branch 'bugfix/8784-import-pgp-key' into 'master' azul
fix: set token in forms correctly Closes #8784 See merge request !37
2017-04-20fix: set token in forms correctlyAzul
We now use the hash of the token for comparison and as the id. In order to use it you need the original token though. So forms and thus the session should have token.to_s rather than token.id.
2017-04-03Version 0.9.0 - twitter, rails 4 and deprecations0.9.0Azul
This release features a great contribution from the Rails Girls Summer of Code: The landing page of the webapp can now include a twitter feed to display news from the provider. Other than that this is a maintainance and transition release. * Twitter feed on main page (thanks theaamanda and lilaluca). * upgrade to rails 4.2 * upgrade to bootstrap 3 Upgrading: * We now use rails 4's `secret_key_base`. Please make sure to supply it in config/config.yml for production environments. If you are using the leap platform that will already take care of it. Deprecations: * We have not seen any active use of the **billing** functionality. So we deprecate it and will probably drop it in one of the next releases. * We will replace the user facing **help desk** functionality with a single sign on mechanism to integrate with other help desk systems. We will maintain the endpoint to submit tickets and the ticket management in the admin interface. That way it should also be easy to create your own ticket submission form. * We deprecate the ability to **signup and login** directly through the webapp. We will remove it in the future for security reasons. Signup and Login should only happen through bitmask to prevent password phishing and js injections.
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.