summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-10-08Merge remote-tracking branch 'pr/241' into developAzul
2016-09-30changed number 2 to 3 to have three tweets shownthea
2016-09-30added 'show more tweets'-link when more tweets are existing than displayed, ↵thea
method included to set number of tweets which should be displayed
2016-09-26Display provider message next to tweets aswellAzul
The content.html.haml was modified to pick the layout based on wether tweets are enabled or not. We need to display the provider message in both cases.
2016-09-26Merge remote-tracking branch 'pr/239' into developAzul
2016-09-23Fixed typo in helperluca-marie
2016-09-23merging develop and mariethea
2016-09-23increase number of fetched tweets to make sure 3 most recent tweets without ↵luca-marie
RTs and @ are displayed
2016-09-23Doc 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-09-22same same but slightly differentluca-marie
2016-09-22Modified error messagesluca-marie
2016-09-22initializer/twitter.rb file unnecessary; added change in main view only if ↵luca-marie
twitter feature is set enabled == true
2016-09-22included Theas work on error-handling \o/; changed link to twitter-account ↵luca-marie
in header; fixed erb escaping characters problem without letting evil code pass; setting customized image file 'Avatar_Pic.png' in config/custo../assets to get loaded instead of default twitter-logo
2016-09-22customize: provider message more fine grainedAzul
We used to replace all of home/content - so we missed the twitter feed on the providers. Instead one should now customize home/provider_message only.
2016-09-21finished error-handling with different error-messages for different errors. ↵theaamanda
added info that the account has to be public in Twitter-Doc
2016-09-21included error-handling: twitter-helper includes rescue and error message ↵thea
for fourth value in array. there will always be an empty array that view (text and each - method) does not break. if empty array in view the error-message is shown. (its WIP)
2016-09-13Merge pull request #13 from LoadToCode/marieMarie
Change in code for caching
2016-09-13Change in code for cachingluca-marie
2016-09-13Merge pull request #12 from LoadToCode/theatheaamanda
Deleting not necessary files from offical PR
2016-09-13reseted index.html.haml old statethea
2016-09-13Added what was once deleted by mistakeluca-marie
2016-09-13Deleting one twitter img, only one is neededluca-marie
2016-09-13Updating CSS and view Codeluca-marie
2016-09-13No need of 2nd Twitter imgluca-marie
2016-09-13Cleaning CSS &view code, updating twitter helper with developluca-marie
2016-09-09Merge pull request #5 from LoadToCode/theaMarie
Cool! \o/ timing for twitter caching + script for invalidating token
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-09changed times for twitter cachingthea
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-08Helper has caching of name and tweets included now \o/luca-marie
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-06included extra methods to have the twitter call for twitter name only have ↵thea
happening at one place
2016-09-06Merge pull request #1 from LoadToCode/marietheaamanda
Updating the view and CSS, no pic and twitter handle in each tweet;
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-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-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-01One more gif to play withluca-marie
2016-09-01Update with Twitterluca-marie
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-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-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-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-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
2016-07-12bugfix: require local email in user modelAzul