summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
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-26Merge branch 'develop' into help_developjessib
2012-11-26hide buttons in table-hover unless hovered over trAzul
2012-11-22don't collabse the navAzul
2012-11-20ui tweaks to the menuAzul
2012-11-20ui tweaks to the menuAzul
2012-11-19Merge branch 'develop' into help_developjessib
Conflicts: app/assets/javascripts/application.js ui_dependencies.rb
2012-11-16playing around with pjax-rails but not using it yetjessib
2012-11-12adding client side validations to the mixAzul
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-31using controller extensions for application controller by handAzul
2012-10-29Merge branch 'help_develop' into developAzul
2012-10-19moved login navigation to the rightAzul
2012-10-17UI tweaks including newer version of bootstrapAzul
2012-10-17complete signup, login, logout workflowAzul
2012-10-11Merge branch 'develop' into help_developjessib
Conflicts: .gitignore
2012-10-11first steps at reducing coreAzul
2012-10-08Merge branch 'release-0.1.0' into help_developjessib
Conflicts: .gitignore
2012-10-08LeapWebDemo -> LeapWebAzul
2012-10-05Rough code to add & comment on tickets.jessib
2012-10-02bringing sign_up back to lifeAzul
2012-09-27Adding in what used to be leap webapp demoAzul
we're merging repositories into one