summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2017-03-02Fix keys route to accept usernames with dotsTulio Casagrande
2017-02-21Merge branch 'gitignore_remote_userfiles' into 'master' azul
Ignore files created by working as user leap-webapp See merge request !13
2017-02-21Ignore files created by working as user leap-webappvarac
2017-02-20Delete .gitkeep in config/customization azul
The Readme file in the folder already ensures that it is kept. The .gitkeep was causing diffs in production
2016-11-21Merge branch 'bugfix/handle-missing-ticket-params' into 'master' azul
bugfix: handle missing params for ticket gracefully This used to trigger a 500. Fixes [#8395](https://leap.se/code/issues/8395) See merge request !11
2016-11-21bugfix: handle missing params for ticket gracefullyAzul
This used to trigger a 500. Fixes #8395
2016-11-17Merge branch 'bugfix/error-dups' into 'master' azul
bugfix: only send login errors once If a login was invalid as a username but also for the identity we used to have duplicate error messages. Let's avoid that. Also added a test to make sure invite_code errors are properly displayed no matter what other fields are set or missing. Pixelated will rely on this to test invite codes See merge request !10
2016-11-17bugfix: only send login errors onceAzul
If a login was invalid as a username but also for the identity we used to have duplicate error messages. Let's avoid that. Also added a test to make sure invite_code errors are properly displayed no matter what other fields are set or missing. Pixelated will rely on this to test invite codes
2016-11-17Merge branch 'ci/cache-gems' into 'master' azul
Ci: cache gems between builds See merge request !9
2016-11-17ci: share cache for gems between branches and jobsAzul
bundler and rubygems should be robust enough to share one dir in different branches. This way gems can be reused. If new versions are required they will just be added to the shared cache.
2016-11-10fixed bugs: production settings were incorrectly set (bearer token + twitter ↵thea
handle) and incorrect root was given for File.open (leap_web was still in it)
2016-11-08increase number of fetched tweets to make sure 3 most recent tweets without ↵luca-marie
RTs and @ are displayed
2016-11-08Doc updated on how to customize avatar picture in twitter feature; update ↵luca-marie
error response messages; added 'config/customization/images' + link in 'config/initializer/customization.rb'
2016-11-08deleted unnecessary commentsthea
2016-10-24doc: mention gitlab buildsAzul
2016-10-21docs: tweak install instructionsAzul
no more develop branch but detail nokogiri requirements a bit
2016-10-20Merge remote-tracking branch 'origin/develop'Azul
We'll only use the master branch for development from now on.