summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-09-05deleted twitter part in config/defaults.yml since there is no usage for it. t...thea
2016-09-05resolved bug from PR #236. Included test environment to secrets-file and incl...thea
2016-09-01Changes mainly on CSS 'fine tuning' and shortening the Twitter API credentials,luca-marie
2016-09-01Adding config/config.yml file into .gitignore, cleaning up smaller typosluca-marie
2016-09-01Update on .gitignore to delete an initializers file that doesn't exist any lo...luca-marie
2016-09-01Small updates on method to check if twitter feed enabledluca-marie
2016-09-01Code lives now in twitter_helper.rbluca-marie
2016-09-01Twitter controller now as helper, some more styling in CSS, bug fixluca-marie
2016-09-01Updateluca-marie
2016-09-01One more gif to play withluca-marie
2016-09-01Update in configluca-marie
2016-09-01Update with Twitterluca-marie
2016-08-26Merge branch 'bugfix/load-issue' into 'develop' azul
2016-08-26[load] require login_format_validation in sessionAzul
2016-08-19Merge branch 'bugfix/send-406-on-unsupported-format' into 'develop' azul
2016-08-19respond_to on a per controller basisAzul
2016-08-17bugfix: send 406 if an unexpected format is asked forAzul
2016-08-15Merge branch 'upgrade/rails-4' into 'develop' azul
2016-08-15upgrade: everything but rails (upgraded before)Azul
2016-08-15upgrade: rails to latest 4.2 series versionAzul
2016-08-15Merge branch 'cleanup/ci-files' into 'develop' azul
2016-08-15[ci] gitlab: actually cache bundleAzul
2016-08-15[ci] fix travis by using container buildsAzul
2016-08-15cleanup: remove outdated travis setupAzul
2016-08-15[ci] move configs into config dirAzul
2016-08-15Merge branch 'test/gitlab-ci' into 'develop' azul
2016-08-15[ci] use default db prefix on gitlab and travisAzul
2016-08-12[db] def database on users instead of use_databaseAzul
2016-08-12[ci] checkout submodule on gitlabAzul
2016-08-12[db] remove DatabaseMethod import from TemporaryUserAzul
2016-08-12move temporary_user into lib - fix load issueAzul
2016-08-08[ci] setup couch for gitlabAzul
2016-08-01Add .gitlab-ci.ymlazul
2016-07-14[feature] restrict is_admin in the user api, to only allow queryingNavaL
2016-07-14Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/e...NavaL
2016-07-14Merge remote-tracking branch 'pr/229' into developAzul
2016-07-12Merge branch 'develop' of https://github.com/leapcode/leap_web into bugfix_226thea
2016-07-12Merge remote-tracking branch 'pr/230' into developAzul
2016-07-12bugfix: require local email in user modelAzul
2016-07-12bugfix #226:patch instead of putthea
2016-07-07Merge remote-tracking branch 'pr/228' into developAzul
2016-07-07Added missing wordluca-marie
2016-07-05Merge remote-tracking branch 'pr/225' into developAzul
2016-07-05fix email unit test - need to require nowAzul
2016-07-05[doc] make sure to mention develop branch in dev docsAzul
2016-07-05[doc] update install documentationAzul
2016-07-05Fix db:migrate and similar tasksAzul
2016-07-05Merge remote-tracking branch 'pr/224' into merge-branchAzul
2016-07-05Merge remote-tracking branch 'pr/222' into merge-branchAzul
2016-07-04install: remove thin and thus eventmachine as a dependencyAzul