summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-09Cleanup to show enable/deactivate account functionality in new UI.jessib
2013-07-08Merge branch 'master' into feature/disable_accountjessib
Conflicts: users/app/controllers/users_controller.rb users/app/helpers/users_helper.rb users/app/views/users/edit.html.haml users/app/views/users/show.html.haml users/config/locales/en.yml
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-06minor - i18n text editelijah
2013-07-06updated srp_js submoduleelijah
2013-07-06Merge pull request #55 from elijh/feature/new-uiazul
Feature/new ui
2013-07-05tickets - replace input[type=submit] tags with button[type=submit] tagselijah
2013-07-05use :ruby for ruby inside tickets/edit_form partial.elijah
2013-07-05remove unused user viewselijah
2013-07-04Add tests for enabling/deactivating.jessib
2013-07-04Merge branch 'master' into feature/disable_accountjessib
2013-07-04Merge branch 'feature/new-ui' of github.com:elijh/leap_web into feature/new-uielijah
Conflicts: app/assets/stylesheets/application.scss ui_dependencies.rb users/app/controllers/users_controller.rb users/app/views/sessions/new.html.haml users/app/views/users/edit.html.haml users/app/views/users/new.html.haml
2013-07-04bootswatch is messing up with the bootstrap icons, so i am disabling it for now.elijah
2013-07-04redirect to root after user destroyelijah
2013-07-04fix broken users gemspecelijah
2013-07-04remove commented out code.elijah
2013-07-04add 'blue' to admins in dev mode.elijah
2013-07-04remove empty readme fileselijah
2013-07-04fix ticket tests, get :admin_user factory to work.elijah
2013-07-04user tests -- user update has been moved entirely to api controller, so fix ↵elijah
tests to reflect this.
2013-07-04allow forms with blank email forward.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-04test - we allow updating of username via api nowelijah
2013-07-04users - make a nice overview page (well, nice enough) and better users ↵elijah
index/search.
2013-07-04fix user typeaheadelijah
2013-07-04fixed security vulnerability with ticket searchingelijah
2013-07-04removed commented out code from ticket.rbelijah
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-04added strings to core en.ymlelijah
2013-07-04cleaned up application layout and some minor css.elijah
2013-07-04users engine changes - rewrite of the views, separate email settings to a ↵elijah
separate controller, make users_controller html only and v1/users_controller json only.
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-04moved app locales to core gem.elijah
2013-07-04new home pageelijah
2013-07-04fix several issues with tickets: js error, when to redirect, navigation, ↵elijah
localization.
2013-07-04added 'thin' and 'quiet_assets' gems to make development mode much nicer.elijah
2013-07-04add commented out code of how redirect should work with Warden, although I ↵elijah
can't get it working.
2013-07-04style kaminari pagination to work with bootstrapelijah
2013-07-04redirect to overview if authenticatedelijah
2013-07-04added html_title helper - use @title to set page title.elijah
2013-07-04i18n - added a few strongs to app, fixed language at english for now.elijah
2013-07-04set pagination size via config fileelijah
2013-07-04remove gem bootstrap-editableelijah
2013-07-04new ui for ticketselijah
2013-07-04new ui - initial user changeselijah