summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
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
2013-06-17Use bootswatch rails gem.jessib
2013-02-09configure couchrest session store in initializerAzul
2013-02-04removing bootstrap-editable-inline as that does not exist anymoreAzul
2013-01-23make raising not found error less confusingAzul
2013-01-22render 404 if neededAzul
2013-01-13add head and tail scss, for customizationelijah
2012-12-18refactor: using tab partials for user editingAzul
2012-12-17Removing references to pjax.jessib
2012-12-14Do not include the pjax js and remove the pjax lineAzul
This was breaking inclusion of other js.
2012-12-11Start to using x-editable to have title editable.jessib
2012-12-11Playing around with using x-editable, which isn't yet working.jessib
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