summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
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-11-12make sure we log json request errors and their backtracesAzul
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-21the class for the html tag is linux32 - not just linuxAzul
2013-10-21adopt css to mac-> osx changeAzul
2013-10-18Merge pull request #98 from jessib/feature/billing-past-due-subscriptionsazul
Feature/billing past due subscriptions
2013-10-15detect os in browser and show proper download linkAzul
We add a class to the html element based on the detected os and use that to pick which download link should be visible. If we detect an os that is not supported we display a deactivated download link instead with all alternatives.
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-03Ensure json requests get json error response on failureAzul
Normally rails sends an html page which can't be parsed by the client.
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-11add header to prevent iframeselijah
2013-07-11set no-cache headers in the responseelijah
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-07move icon path -- it turns out /icons/ is used by apache in most default ↵elijah
installations, so leap's icons moved to /leap-img/
2013-07-06minor - remove masthead_noauth partialelijah
2013-07-06rename /img/ to /icons/ so as to not conflict with existing puppet deploy ↵elijah
recipes.
2013-07-04bootswatch is messing up with the bootstrap icons, so i am disabling it for now.elijah
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-04add js to report all errors to the user, not just ones related to field ↵elijah
validation.
2013-07-04new layout for the home buttonselijah
2013-07-04new home pageelijah
2013-07-04redirect to overview if authenticatedelijah
2013-07-04added html_title helper - use @title to set page title.elijah
2013-07-04remove gem bootstrap-editableelijah
2013-07-04new ui for ticketselijah
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
2013-06-27bootstrap menu now has 60 px height - adjust body paddingAzul