summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-03-22Merge pull request #242 from LoadToCode/developazul
2017-03-22Merge branch 'upgrade/bundle' into 'master' azul
2017-03-22upgrade: bundleAzul
2017-03-21Merge branch 'bugfix/deliver_now' into 'master' azul
2017-03-21upgrade: rails4.2 deprecated deliver -> deliver nowAzul
2017-03-21Merge branch 'test/admin-user-api' into 'master' azul
2017-03-21test: admin user api always greenAzul
2017-03-21Merge branch 'bugfix/404-for-keys-on-text-request' into 'master' azul
2017-03-21fix: 404 on key request with non html content-typeAzul
2017-03-20Merge branch 'bugfix/404-for-missing-info' into 'master' azul
2017-03-20fix: 404 for missing pages template - fixes #9Azul
2017-03-20Merge branch 'test/404-error-test' into 'master' azul
2017-03-20test: 404 response for missing keyAzul
2017-03-20Merge branch 'bugfix/require-html-for-home-routes' into 'master' azul
2017-03-20bugfix: format: html for home rootsAzul
2017-03-20Merge branch 'debug/rescue-more-specifically' into 'master' azul
2017-03-14Merge branch 'recovery-code' into 'master' azul
2017-03-10Validates recovery code as hexadecimal data.Thais Siqueira
2017-03-10Adds recovery code to user accountThais Siqueira
2017-03-07make the rescue in account creation less broadAzul
2017-03-07Merge branch 'username-with-dot' into 'master' azul
2017-03-02Fix keys route to accept usernames with dotsTulio Casagrande
2017-02-21Merge branch 'gitignore_remote_userfiles' into 'master' azul
2017-02-21Ignore files created by working as user leap-webappvarac
2017-02-20Delete .gitkeep in config/customization azul
2016-11-21Merge branch 'bugfix/handle-missing-ticket-params' into 'master' azul
2016-11-21bugfix: handle missing params for ticket gracefullyAzul
2016-11-17Merge branch 'bugfix/error-dups' into 'master' azul
2016-11-17bugfix: only send login errors onceAzul
2016-11-17Merge branch 'ci/cache-gems' into 'master' azul
2016-11-17ci: share cache for gems between branches and jobsAzul
2016-11-10fixed bugs: production settings were incorrectly set (bearer token + twitter ...thea
2016-11-08increase number of fetched tweets to make sure 3 most recent tweets without R...luca-marie
2016-11-08Doc updated on how to customize avatar picture in twitter feature; update err...luca-marie
2016-11-08deleted unnecessary commentsthea
2016-10-24doc: mention gitlab buildsAzul
2016-10-21docs: tweak install instructionsAzul
2016-10-20Merge remote-tracking branch 'origin/develop'Azul
2016-10-08Merge remote-tracking branch 'pr/241' into developAzul
2016-09-30Merge pull request #19 from LoadToCode/theatheaamanda
2016-09-30changed number 2 to 3 to have three tweets shownthea
2016-09-30Merge pull request #18 from LoadToCode/theatheaamanda
2016-09-30added 'show more tweets'-link when more tweets are existing than displayed, m...thea
2016-09-29Merge branch 'thea' of github.com:LoadToCode/leap_web into theathea
2016-09-26Display provider message next to tweets aswellAzul
2016-09-26Merge remote-tracking branch 'pr/239' into developAzul
2016-09-23Adapted description to use case 'tweets are protected'luca-marie
2016-09-23Fixed typo in helperluca-marie
2016-09-23Merge branch 'marie' into developthea
2016-09-23merging develop and mariethea