Landon Wilkins 0c7e0c2b85 converts users/admin_merge js_block into js_bundle ... test plan: * regression test users admin merge Change-Id: I781115b754b5f13bbab440673b5eab2f62928465 Reviewed-on: https://gerrit.instructure.com/29098 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jon Jensen <jon@instructure.com> QA-Review: August Thornton <august@instructure.com> Product-Review: Landon Wilkins <lwilkins@instructure.com>		2014-02-21 16:59:15 +00:00
..
_cc_prefs.html.erb	new dashboard design	2012-11-11 21:56:16 -07:00
_current_conference.html.erb	new dashboard design	2012-11-11 21:56:16 -07:00
_enrollment.html.erb	fix permissions check for UsersController#show	2013-03-09 17:59:03 -07:00
_group.html.erb	i18n users	2011-06-24 12:33:03 -06:00
_logins.html.erb	Fix password-validation errors not showing up	2013-12-03 17:24:25 +00:00
_merge_results.html.erb	use unicode sorting for ruby and db stuff	2013-10-02 21:38:03 +00:00
_name.html.erb	round avatars everywhere (almost)	2014-02-13 18:00:45 +00:00
_scheduled_conference.html.erb	add scheduling support to conferences	2013-12-17 23:46:41 +00:00
_welcome.html.erb	self enrollment refactor to facilitate CN integration	2012-12-19 12:29:47 -07:00
admin_merge.html.erb	converts users/admin_merge js_block into js_bundle	2014-02-21 16:59:15 +00:00
dashboard_sidebar.html.erb	add API for user's upcoming_events	2013-04-30 15:43:46 +00:00
delete.html.erb	change block helpers for rails 3.2 compatibility	2013-10-11 23:09:37 +00:00
grades.html.erb	Fix reported header errors	2013-05-10 18:08:20 +00:00
index.html.erb	converts users/index js_block into js_bundle	2014-02-05 22:01:50 +00:00
masquerade.html.erb	more i18n fixes	2013-04-22 15:34:18 +00:00
merge.html.erb	i18n users	2011-06-24 12:33:03 -06:00
new.html.erb	use common stylesheets everywhere they're needed, fixes CNVS-7736	2013-08-26 20:26:42 +00:00
registered.html.erb	converts users/registered js_block into js_bundle	2014-02-05 22:02:09 +00:00
show.html.erb	rename User#accounts to User#all_accounts	2013-10-31 22:15:23 +00:00
teacher_activity.html.erb	Misc remaining icon replacement	2012-12-05 15:43:19 -07:00
user_dashboard.html.erb	Fix reported header errors	2013-05-10 18:08:20 +00:00