summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2017-04-03fix: icons that were using the bootstrap 2 syntaxAzul
2017-04-03feature: delete user clearing usernameAzul
2017-03-29fix: bring back wrapped signup button with cancelAzul
2017-03-27fix: bootstrap 3 style of menusAzul
span10 now is .col-??-10. ul.unstyled now is ul.list-unstyled also leave out unnecessary li if billing is disabled.
2017-03-27upgrade: simple_form to bootstrap 3Azul
* reran the simple form initializer. * wrapped submit buttons are now broken and need a fix. * disabled confirmation validation in client side validations as the error message always is attached to the wrong field.
2017-03-23bugfix: handle couch 404sAzul
our special error handler for json requests would turn all exceptions into 500s - removed it. now the rescue_responses can do their thing again.
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-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-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-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-13Updating CSS and view Codeluca-marie
2016-09-13Cleaning CSS &view code, updating twitter helper with developluca-marie
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-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-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-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-01Twitter controller now as helper, some more styling in CSS, bug fixluca-marie
2016-09-01Update with Twitterluca-marie
2016-05-23move signup from users to account_controllerAzul
There was a lot of special case handling going on in the users_controller for this. Lot simpler this way.
2016-05-23cleanup: remove service level code from users_controllerAzul
There's no route to this right now and it also seems to be tested nowhere. Since i am about to split up the users_controller let's get rid of this and put it in the place we want it once we actually finish the implementation
2016-05-18api: allow version bumping - bump to 2Azul
2016-05-14ensure invalid user ids still render the ticket formAzul
We still have strange urls requested like /pt/users/AnonymousUser.../tickets/new Not sure where they are coming from - but this should make sure we respond with sth. meaningful instead of erroring out. Conflicts: app/views/layouts/_content.html.haml
2016-05-13ensure invalid user ids still render the ticket formAzul
We still have strange urls requested like /pt/users/AnonymousUser.../tickets/new Not sure where they are coming from - but this should make sure we respond with sth. meaningful instead of erroring out.
2016-05-02upgrade: bootstrap control-group -> form-groupAzul
2016-05-02upgrade: use bootstrap3 row and col-md-*Azul
2016-03-30api: added json error pages, allow "." in the :id param of all api routeselijah
2016-01-14added UI for invite codeselijah
2016-01-10highlight admin areas with caution tape (wip)elijah
2016-01-10fix user listelijah
2015-10-19[bug] Only show donation if payment presentFolker Bernitt
2015-10-19Merge pull request #198 from claucece/developazul
Braintree_implementation
2015-10-19Merge pull request #196 from EvyW/developazul
Admin - Ability to enable/disable user
2015-10-05deleted commentclaucece
2015-10-05add a comment regarding homeclaucece
2015-10-05add subscriptionsclaucece
2015-10-05changed routes and linksclaucece
2015-10-05subscriptions, translationclaucece
2015-10-05subscriptions, haml and translationsclaucece
2015-10-05Donation buttonclaucece