Commit Graph

12 Commits

Author SHA1 Message Date
Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group.rb
	app/views/layouts/application.html.haml
	db/schema.rb
	public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
George Vinogradov f9e7f3fb06 [issue #174] Devise hacks 2012-02-10 01:45:26 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
konstantin.grabar d205eb2dd9 [refs #105] Add language check on user save 2012-01-17 15:57:46 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Pavel Chipiga c5fdfcd39d Fix sessions layout meta tags. Refs #2162 2011-11-10 01:50:51 +02:00
George Vinogradov 5732e999b1 Finished merging of master with itima_web_refactoring 2011-10-20 18:05:06 +04: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
Timothy N. Tsvetkov 309b037acf Paul Irish BUY BUY oMG, Using AWESOME web-app-theme 2011-03-31 03:10:23 +04:00
Alexey Nayden 340e8697c7 Devise integration 2011-03-09 20:38:10 +03:00