Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master #2116

Merged
33 commits merged into from
Nov 9, 2017
Merged

Merge master #2116

33 commits merged into from
Nov 9, 2017

Conversation

jcoyne
Copy link
Member

@jcoyne jcoyne commented Nov 5, 2017

No description provided.

.dropdown-toggle:focus {
outline: 2px auto Highlight; // FireFox
outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
outline: -2px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property outline already defined on line 25


.dropdown-toggle:focus {
outline: 2px auto Highlight; // FireFox
outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property outline already defined on line 25

@@ -20,6 +20,10 @@ legend small {
}
}

#savewidget a {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using id selectors

.dropdown-toggle:focus {
outline: 2px auto Highlight; // FireFox
outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
outline: -2px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property outline already defined on line 25


.dropdown-toggle:focus {
outline: 2px auto Highlight; // FireFox
outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property outline already defined on line 25

@@ -20,6 +20,10 @@ legend small {
}
}

#savewidget a {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using id selectors

@jcoyne jcoyne force-pushed the merge_master branch 3 times, most recently from ee1974f to 6ad7057 Compare November 6, 2017 21:03
Jonathan Dixon and others added 16 commits November 9, 2017 15:28
Set the (overrideable) theme to be used in the work and collection controlers, and use the 1_column layout to pick up the controls navbar.

Fixes samvera-labs/nurax-pre2023#71
Else, clicking "Review Submissions" in Dashboard throws error -- ActionView::Template::Error (RSolr::Error::Http - 414 Request-URI Too Long) -- if the number of workflows in the system is large enough to make the GET request's query string longer than Solr can handle.

Note that this solution requires ActiveFedora 11.5.0, though this code does not break with 11.4.1; it passes an argument that AF < 11.5.0 ignores.

Fixes #1875
Updates the requirements on [rails-controller-testing](https://github.com/rails/rails-controller-testing) to permit the latest version.
This is an innovation in place in more than one Sufia/Hyrax application downstream that makes derivatives work as expected.
This actor assigned a variable to `nil`, then acted only `if variable`. It then
called `save` on the object, making it expensive and leading to potential
surprising impact on other actors. This removes it from the actor stack and
deletes the actor file.
Fixes #1455

* Stop caring about hash keys in workflow notifications
* Admin Set Managers should be granted all registered roles on an active workflow, not just approving
* Fix bug with `#grant_workflow_roles` that prevents creating a new corresponding workflow role when switching workflows
* Scope PermissionQuery#scope_users_for_entity_and_roles to the entity's workflow
* Disentangle PermissionTemplateForm#update_management
mjgiarlo and others added 7 commits November 9, 2017 15:44
References samvera-labs/nurax-pre2023#96
Fixes #1742

With the refactoring of collection controllers to create two collection
show pages (public and dashboard), someone given editor rights to a
collection no longer has a way to get to the editing view.

This change adds the actions onto the public show page to restore this
feature until the collections sprint work is completed.
@ghost ghost merged commit cf20a9d into valkyrie Nov 9, 2017
@ghost ghost deleted the merge_master branch November 9, 2017 23:30
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants