summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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.
2016-10-08Merge remote-tracking branch 'pr/241' into developAzul
2016-09-30Merge pull request #19 from LoadToCode/theatheaamanda
changed number 2 to 3 to have three tweets shown
2016-09-30changed number 2 to 3 to have three tweets shownthea
2016-09-30Merge pull request #18 from LoadToCode/theatheaamanda
added 'show more tweets'-link when more tweets are existing than displayed + method included to set number of tweets which should be displayed
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-29Merge branch 'thea' of github.com:LoadToCode/leap_web into theathea
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-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
2016-09-23included count for tweet fetchthea
2016-09-23Merge pull request #16 from LoadToCode/temp_1_marieMarie
Temp 1 marie
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-22Merge pull request #15 from LoadToCode/theaMarie
errorhandling and small changes
2016-09-22clean upluca-marie
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-22Merge branch 'customize/provider-message' into 'develop' azul
customize: provider message more fine grained 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. See merge request !7
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-20deleted leap_web from projectrootthea
2016-09-15included production for readme & secretsthea
2016-09-15twitter readme now contains github markup to show secrets-file contentthea
2016-09-14Merge pull request #14 from LoadToCode/developMarie
Taking it all from branch develop and push it to branch temp_1_marie
2016-09-14Merge remote-tracking branch 'pr/237' into developAzul
Twitter Feature on Main-View from @loadtocode Twitter feature within home/index of LEAP web app as feed of tweets of one user's twitter account How to use it: set up an Application-only authentication by twitter (https://dev.twitter.com/oauth/application-only) and then create a config/secrets.yml including: ``` development: twitter: enabled: false # set to true for usage twitter_handle: XXXXX #put your twitter handle here bearer_token: XXXXX #put your bearer token here test: twitter: enabled: false # set to true for usage twitter_handle: XXXXX #put your twitter handle here bearer_token: XXXXX #put your bearer token here ``` things in the PR: - [x] gemfile:twitter - [x] twitter helper (caching (to avoid reaching twitter rate limits) - [x] index twitter view - [x] twitter css (twitter design as discussed in call: Profil-Header: Picture, Link to twitter + twitter_handle; removed picture and twitter_handle from individual tweet, heading aligns at the top, only the last 3 tweets are shown) - [x] script to generate bearer token - [x] script to invalidate generated bearer token - [x] documentation (Readme + Doc)
2016-09-13Merge pull request #13 from LoadToCode/marieMarie
Change in code for caching
2016-09-13Change in code for cachingluca-marie
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 18:07:10 +0000