George Vinogradov
|
5732e999b1
|
Finished merging of master with itima_web_refactoring
|
2011-10-20 18:05:06 +04:00 |
|
George Vinogradov
|
ff36b1fdd3
|
Merge branch 'itima_web_refactoring'
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-19 18:09:58 +04:00 |
|
George Vinogradov
|
0d10c50710
|
Changed representation of Users
|
2011-10-17 18:23:51 +04:00 |
|
George Vinogradov
|
d7cddecbe8
|
Changed User representation.
|
2011-10-17 00:49:41 +04: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 |
Alexey Nayden
|
0279f45b6b
|
minor UI fixes
|
2011-03-31 15:43:41 +04:00 |
Timothy N. Tsvetkov
|
5bed0adbf9
|
merge
|
2011-03-31 03:11:10 +04: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
|
a3c3a2e3de
|
Translation fix
|
2011-03-31 02:11:28 +04:00 |
|
Alexey Nayden
|
0ff80b3e16
|
User management
|
2011-03-11 00:48:15 +03:00 |