Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
users/app/views/sessions/_nav.html.haml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also added #assert_json_error to tests.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* translating error messages
* not caching login and password in js anymore
* catching non responses
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/javascripts/application.js
ui_dependencies.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
something like https://github.com/spree/spree/issues ), using bootstrap for display.
Still want to use pjax, and have more functionality to add: searching, sorting, pagination, etc..
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
help/test/functional/tickets_controller_test.rb
users/test/functional/application_controller_test.rb
users/test/support/auth_test_helper.rb
|
|
|
|
Conflicts:
Gemfile.lock
|