leap_web.git - [leap

Age	Commit message (Collapse)	Author
2012-11-09	Merge branch 'develop' into feature-warden-srp	Azul
	Conflicts: users/app/assets/javascripts/srp
2012-11-09	merged srp master into json api branch	Azul

2012-11-06	undo accidentally reverted srp-js and ruby 1.9 debugger in gemfile	Azul

2012-11-06	Merge branch 'develop' of ssh://leap.se/leap_web into develop	Azul

2012-11-06	first steps towards warden srp testing	Azul

2012-11-04	fixed functional tests	Azul

2012-11-04	using new login helper and cleaning up test a bit	Azul

2012-11-04	stubbing current_user the warden way	Azul

2012-11-04	Merge branch 'develop' into feature-warden-srp	Azul
	Conflicts: Gemfile.lock users/app/controllers/application_controller.rb users/leap_web_users.gemspec
2012-11-04	using ruby-srp 0.1.4 - ruby 1.9.3 compatible	Azul

2012-11-04	using ruby-srp 0.1.4 - ruby 1.9.3 compatible	Azul

2012-11-04	fixing tests, including support files from all engines	Azul

2012-11-04	minor: yaml syntax fix	Azul

2012-11-04	Merge branch 'feature-admin_users' into develop	Azul

2012-11-02	add debugger for ruby 1.9 so it works too.	Azul

2012-11-02	minor: it's gem install bundler	Azul

2012-10-31	Looks like the help code has already been merged into the develop branch, ↵	jessib
	and thus merging into feature-admin_users branch.
2012-10-31	Code to check administration (and ugly test display.) This includes example ↵	jessib
	config file.
2012-10-31	Merge branch 'develop' into feature-admin_users	jessib
	Conflicts: users/app/controllers/application_controller.rb users/app/models/user.rb
2012-10-31	Merge branch 'develop' of ssh://leap.se/leap_web into develop	jessib

2012-10-31	using controller extensions for application controller by hand	Azul

2012-10-31	minor: need to cd into leap_web before initializing submodules	Azul

2012-10-31	Merge branch 'develop' of ssh://leap.se/leap_web into develop	Azul

2012-10-31	user creation should send ok flag so js can start login	Azul

2012-10-31	using json template for rendering the warden failures	Azul

2012-10-31	user creation should send ok flag so js can start login	Azul

2012-10-30	new README	elijah

2012-10-30	sending proper error messages from warden.	Azul
	still need to translate these
2012-10-30	using rails_warden bit of refactoring	Azul
	without rails_warden the failure app action was not getting set properly.
2012-10-30	adding in warden with a basic strategy	Azul
	currently failing because we are not setting the content-type header.
2012-10-29	Merge branch 'help_develop' into develop	Azul

2012-10-29	Merge branch 'help_develop' into develop	jessib

2012-10-29	first steps at is_admin?	Azul

2012-10-24	removing duplicate testing of helper_methods	Azul
	* once tested as helper * once tested as @controller.send...
2012-10-24	Extraction of test support methods	Azul

2012-10-24	basic admin controller methods and helpers + tests	Azul

2012-10-19	login after signup right away.	Azul

2012-10-19	added dummy cert file for tests and illustration	Azul

2012-10-19	Revert "Created deploy branch with some springbok specifics"	Azul
	This reverts commit 439e27ef2792a03e5e50f8b9c607fca512cb1452. Conflicts: config/cert
2012-10-19	moved login navigation to the right	Azul

2012-10-18	Uses the working authentication code.	jessib

2012-10-17	Merge branch 'master' into help_develop	jessib

2012-10-17	Merge branch 'develop' into help_develop	jessib

2012-10-17	Not sure we actually want this in version control, but adding changes so ↵	jessib
	long as we have it.
2012-10-17	Merge branch 'feature-authentication_system' into develop	Azul

2012-10-17	UI tweaks including newer version of bootstrap	Azul

2012-10-17	complete signup, login, logout workflow	Azul

2012-10-17	improved signup and login js	Azul

2012-10-16	Some functional tests and other tweaks.	jessib

2012-10-16	working version of srp_js	Azul