summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-09Merge pull request #4 from LoadToCode/temp_1_marietheaamanda
Mainly changes in view
2016-09-09Added changes in css, view and main view file, as well as default avatar is ↵luca-marie
now set as twitter official logo (added 2 official twitter logo images; changed footer text.
2016-09-08Merge pull request #2 from LoadToCode/theaMarie
Bearer Token + Documentation
2016-09-07Added documentation to README about twitter authentification and usage of ↵thea
secrets-file
2016-09-07changed naming for tweets-method in _index and included time-checking and a ↵thea
twitter call will only be made every 15 minutes
2016-09-07error message and exit from script when wrong directory or no secrets-file. ↵thea
automatic secrets-file creation was deleted/put as comment
2016-09-06included twitter handle also for test development in secrets-filethea
2016-09-06bearer token script includes creating token, creating secrets-file or just ↵thea
have the missing information filled like token or twitter handle
2016-09-06deleted script/generate_bearer_token.rb, it will be replaced by ↵thea
script/generate_bearer_token
2016-09-06included extra methods to have the twitter call for twitter name only have ↵thea
happening at one place
2016-09-06Merge branch 'develop' into theathea
2016-09-06Merge pull request #1 from LoadToCode/marietheaamanda
Updating the view and CSS, no pic and twitter handle in each tweet;
2016-09-05deleted twitter part in config/defaults.yml since there is no usage for it. ↵thea
to use twitter secrets-file has to be created
2016-09-05resolved bug from PR #236. Included test environment to secrets-file and ↵thea
included checking wheather secrets-file exists before running code in twitter_helper
2016-09-02moved bearer token scriptthea
included passing bearer token into secrets-file
2016-09-02ruby script to generate twitter bearer tokenthea
2016-09-01Updating the view and CSS, no pic and twitter handle in each tweet;luca-marie
Displaying only 3 most tweets
2016-09-01Changes mainly on CSS 'fine tuning' and shortening the Twitter API credentials,luca-marie
- only bearer token is needed to access Twitter API
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 ↵luca-marie
longer
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
[load] require login_format_validation in session We moved it into the lib folder so it's not in an autoload path anymore. So now it needs to be required before being used. This fixes a load order issue that would cause non-deterministic failures in CI See merge request !6
2016-08-26[load] require login_format_validation in sessionAzul
We moved it into the lib folder so it's not in an autoload path anymore. So now it needs to be required before being used. This fixes a load order issue that would cause non-deterministic failures in CI
2016-08-19Merge branch 'bugfix/send-406-on-unsupported-format' into 'develop' azul
Bugfix/send 406 on unsupported format See merge request !5
2016-08-19respond_to on a per controller basisAzul
If you inherit respond to and call it again in your controller it will not overwrite the previous but add to it. Since we always have some exceptions from the rules it's probably easiest to be explicit in the controllers that require it themselves.
2016-08-17bugfix: send 406 if an unexpected format is asked forAzul
It used to run the action and then trigger a 500 because the template was not found. fixes !3 .
2016-08-15Merge branch 'upgrade/rails-4' into 'develop' azul
Upgrade/rails 4 See merge request !4
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
Cleanup/ci files See merge request !3
2016-08-15[ci] gitlab: actually cache bundleAzul
2016-08-15[ci] fix travis by using container buildsAzul
This is supposed to fix the bundler error reported in https://github.com/bundler/bundler/issues/3558 sudo: false makes travis use the new infrastructure without sudo
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
[ci] get gitlab to run tests See merge request !2
2016-08-15[ci] use default db prefix on gitlab and travisAzul
This makes writing the tests for database names easier as they should be the same strings on gitlab, travis and locally.
2016-08-12[db] def database on users instead of use_databaseAzul
use_database affects all uses of prepare_database - so also the one in tmp_database. In order to avoid that we do not use_database but just overwrite the database method itself.
2016-08-12[ci] checkout submodule on gitlabAzul
2016-08-12[db] remove DatabaseMethod import from TemporaryUserAzul
It was causing 404s on initializing the database with db:migrate. DatabaseMethods rewrite of #database does not call prepare_database and thus does not create the database when needed. DatabaseMethod is also quite a bit too much for a model that has two databases that can be memoized easily. There's no way to have a separate database instance per record.
2016-08-12move temporary_user into lib - fix load issueAzul
We already did the same for other concerns. The way we load models for couchrest migrations does not work well with concerns in the model directory as they will be loaded twice.
2016-08-08[ci] setup couch for gitlabAzul
Couch docker image will be available on the host called couchdb. So we use curl to check for it and display the version string. And then we move a couchdb.yml config file into place so the right host will be used.
2016-08-01Add .gitlab-ci.ymlazul
2016-07-14[feature] restrict is_admin in the user api, to only allow queryingNavaL
for him/herself So that it we do not expose the is_admin property to anyone else including other admins.
2016-07-14Merge branch 'develop' of https://github.com/leapcode/leap_web into ↵NavaL
feature/expose_admin_in_api