summaryrefslogtreecommitdiff
path: root/app/views/layouts
AgeCommit message (Collapse)Author
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-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-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-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-17Removing references to pjax.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
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
2012-11-09Various very small tweaks: comments about main div display in firefox, give ↵jessib
info for when creating unauthenticated tickets, redirecting to index when closing a ticket, fix default select for ticket filtering.
2012-11-08added generic flash blockAzul
2012-10-19moved login navigation to the rightAzul
2012-10-17UI tweaks including newer version of bootstrapAzul
2012-10-08LeapWebDemo -> LeapWebAzul
2012-09-27Adding in what used to be leap webapp demoAzul
we're merging repositories into one