| Age | Commit message (Collapse) | Author |
|---|
|
Feature/identity rewrite
|
|
|
|
PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback.
This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/views/layouts/_messages.html.haml
app/views/layouts/application.html.haml
users/app/assets/javascripts/users.js.coffee
|
|
installations, so leap's icons moved to /leap-img/
|
|
|
|
recipes.
|
|
|
|
|
|
|
|
admins) or stay as a nested resource for a particular user (for normal users and when you visit the tickets list of a particular user).
|
|
|
|
validation.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This was breaking inclusion of other js.
|
|
|
|
|
|
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/javascripts/application.js
ui_dependencies.rb
|
|
|
|
|
|
info for when creating unauthenticated tickets, redirecting to index when closing a ticket, fix default select for ticket filtering.
|
|
|
