summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-04-08moving all of core into toplevel, tests fail.Azul
2014-02-04applied mcnair's changes to privacy policyelijah
2014-01-23added a customizable 'bye' page for when a user leaveselijah
2014-01-23move #masthead out of main templates to make the masthead partials more ↵elijah
flexible.
2014-01-23added a default footer with links to privacy policy, tos, pricing, about us, ↵elijah
contact.
2014-01-23added default pricing, privacy policy and tos pages.elijah
2013-12-20make sure overview link is active on Users#showAzul
2013-12-20enable billing engine by default, consolidate APP_CONFIG[:payments] and ↵elijah
APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree]
2013-12-17Merge branch 'develop' into feature/billing-no-authenticated-paymentsjessib
Conflicts: billing/config/locales/en.yml
2013-12-13refactor: remove Overview controller - we can use Users#showAzul
we were only using Users#show to redirect to the edit action. So I replaced that with the overview and we have no more use for the extra controller. This also simplifies linking to the users in question a lot.
2013-10-30notify user their account was successfully deleted (refs #4216)Azul
Also fixes a cornercase when admins deleted their own account. So far they would be redirected to the users list - which then refused access. Now they'll be redirected to the home landing page as well.
2013-10-08Payments made when authenticated will be donations, and not connected to ↵jessib
customer in any way.
2013-10-01Allow admins to view past-due subscriptions.jessib
2013-09-02Remove references to email_settings controller, which has been removed. An ↵jessib
identities controller will replace it.
2013-08-27Not ideal way to do it, but was proving complicated to have a config file ↵jessib
specify which gems for which environments. Here, we have the billing gem included for the development and test environments only, hardcoded in the Gemfile. Then we show the links to billing based on a config file setting. The setting itself could be used to specify different types of billing, but isn't yet.
2013-08-27Merge branch 'master' into billing_with_testsjessib
2013-08-13Option to disable billing engine and hide billing related links. To actual ↵jessib
disable, must remove billing engine from Gemfile (and re-bundle)
2013-08-08Merge pull request #64 from azul/feature/identity-rewritejessib
Feature/identity rewrite
2013-08-06Fix stupid typo.jessib
2013-08-01Merge branch 'master' into billing_with_testsjessib
Conflicts: app/views/home/index.html.haml
2013-07-31added empty 'home' layout and removed debugger from homecontrollerelijah
2013-07-25Have navigation link to new customer form if user is not already a braintree ↵jessib
customer.
2013-07-24removed email settings controller and viewsAzul
PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback. This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.
2013-07-23Some clean-up of billing display.jessib
2013-07-23Some navigation tweaks.jessib
2013-07-22Slight tweaks so navigation basically should work with billing.jessib
2013-07-17Adding some links, which will be removed.jessib
2013-07-11fix incorrect calling of tickets_pathelijah
2013-07-11Slight cleanup due to some emacs annoyances.jessib
2013-07-09Merge branch 'master' into feature/authentication_generic_errorjessib
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
2013-07-06minor - remove masthead_noauth partialelijah
2013-07-04minor changes to css and home page.elijah
2013-07-04help - fix ticket navigation & links (use @user, not user).elijah
2013-07-04better ticket view navigation: tickets are now either global in scope (for ↵elijah
admins) or stay as a nested resource for a particular user (for normal users and when you visit the tickets list of a particular user).
2013-07-04cleaned up application layout and some minor css.elijah
2013-07-04new layout for the home buttonselijah
2013-07-04new home pageelijah
2013-07-04added html_title helper - use @title to set page title.elijah
2013-07-04start of new ui - css changes, layout changes, navigation changes.elijah
2013-06-27Want to tweak some, but start to displaying base generic message via javascript.jessib
2012-12-18refactor: using tab partials for user editingAzul
2012-12-17Removing references to pjax.jessib
2012-12-12quick fix for langing page to not have spacerAzul
2012-12-07Merge branch 'master' into help_developjessib
Conflicts: app/views/layouts/application.html.haml help/app/controllers/tickets_controller.rb help/test/functional/tickets_controller_test.rb users/test/support/stub_record_helper.rb
2012-12-07first stub at displaying success messagesAzul
2012-11-26don't collabse the navAzul
2012-11-22don't collabse the navAzul
2012-11-20ui tweaks to the menuAzul
2012-11-20ui tweaks to the menuAzul
2012-11-16playing around with pjax-rails but not using it yetjessib