Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
* translating error messages
* not caching login and password in js anymore
* catching non responses
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
|
|
|
|
|
|
|
|
|
|
|
|
also commented the sessions controller test a bit and fixed it
|
|
|
|
Conflicts:
users/app/assets/javascripts/srp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and thus merging into feature-admin_users branch.
|
|
config file.
|
|
Conflicts:
users/app/controllers/application_controller.rb
users/app/models/user.rb
|
|
|
|
|
|
|