Commit Graph

13 Commits

Author SHA1 Message Date
Alexander Machehin 2ee3ea93bd [#345] remove deprecated dynamic finder methods 2014-03-18 19:58:51 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V 960aecb6d5 #30: refactoring of OmniauthCallbacksController#find_for_ouath 2013-03-26 17:35:02 +04:00
Vokhmin Alexey V 69c226be0b #30: update comments, some refactoring 2013-03-26 17:30:43 +04:00
Vokhmin Alexey V cd98088e7f #30: find user by email before registration 2013-03-26 17:22:25 +04:00
Vokhmin Alexey V abfe502b5f #30: update devise.rb and omniauth_callbacks_controller 2013-03-26 16:24:15 +04:00
Vokhmin Alexey V c2e89f8781 #30: use omniauth for registration through Facebook, GitHub, Google 2013-03-26 03:13:15 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Pavel Chipiga 701ccf54dd Fix OpenID registration bug. Refs #2261 2011-12-06 21:45:25 +02:00
Pavel Chipiga 0efa8c83a2 Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954 2011-10-13 13:19:42 +03:00
Pavel Chipiga 77e03df70b Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954 2011-10-11 23:56:51 +03:00