leap_web.git - [leap

Age	Commit message (Collapse)	Author
2013-07-11	Slight cleanup due to some emacs annoyances.	jessib

2013-07-11	Clear authentication errors before displaying new ones.	jessib

2013-07-11	Merge branch 'master' into feature/authentication_generic_error	jessib

2013-07-11	Merge pull request #56 from leapcode/feature/disable_account	azul
	Feature/disable account
2013-07-09	Merge branch 'master' into feature/authentication_generic_error	jessib
	Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
2013-07-09	Cleanup to show enable/deactivate account functionality in new UI.	jessib

2013-07-08	Merge branch 'master' into feature/disable_account	jessib
	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-07	move 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-06	minor - remove masthead_noauth partial	elijah

2013-07-06	rename /img/ to /icons/ so as to not conflict with existing puppet deploy ↵	elijah
	recipes.
2013-07-06	minor - i18n text edit	elijah

2013-07-06	updated srp_js submodule	elijah

2013-07-06	Merge pull request #55 from elijh/feature/new-ui	azul
	Feature/new ui
2013-07-05	tickets - replace input[type=submit] tags with button[type=submit] tags	elijah

2013-07-05	use :ruby for ruby inside tickets/edit_form partial.	elijah

2013-07-05	remove unused user views	elijah

2013-07-04	Add tests for enabling/deactivating.	jessib

2013-07-04	Merge branch 'master' into feature/disable_account	jessib

2013-07-04	Merge branch 'feature/new-ui' of github.com:elijh/leap_web into feature/new-ui	elijah
	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-04	bootswatch is messing up with the bootstrap icons, so i am disabling it for now.	elijah

2013-07-04	redirect to root after user destroy	elijah

2013-07-04	fix broken users gemspec	elijah

2013-07-04	remove commented out code.	elijah

2013-07-04	add 'blue' to admins in dev mode.	elijah

2013-07-04	remove empty readme files	elijah

2013-07-04	fix ticket tests, get :admin_user factory to work.	elijah

2013-07-04	user tests -- user update has been moved entirely to api controller, so fix ↵	elijah
	tests to reflect this.
2013-07-04	allow forms with blank email forward.	elijah

2013-07-04	minor changes to css and home page.	elijah

2013-07-04	help - fix ticket navigation & links (use @user, not user).	elijah

2013-07-04	test - we allow updating of username via api now	elijah

2013-07-04	users - make a nice overview page (well, nice enough) and better users ↵	elijah
	index/search.
2013-07-04	fix user typeahead	elijah

2013-07-04	fixed security vulnerability with ticket searching	elijah

2013-07-04	removed commented out code from ticket.rb	elijah

2013-07-04	better 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-04	added strings to core en.yml	elijah

2013-07-04	cleaned up application layout and some minor css.	elijah

2013-07-04	users 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-04	add js to report all errors to the user, not just ones related to field ↵	elijah
	validation.
2013-07-04	new layout for the home buttons	elijah

2013-07-04	moved app locales to core gem.	elijah

2013-07-04	new home page	elijah

2013-07-04	fix several issues with tickets: js error, when to redirect, navigation, ↵	elijah
	localization.
2013-07-04	added 'thin' and 'quiet_assets' gems to make development mode much nicer.	elijah

2013-07-04	add commented out code of how redirect should work with Warden, although I ↵	elijah
	can't get it working.
2013-07-04	style kaminari pagination to work with bootstrap	elijah

2013-07-04	redirect to overview if authenticated	elijah

2013-07-04	added html_title helper - use @title to set page title.	elijah

2013-07-04	i18n - added a few strongs to app, fixed language at english for now.	elijah