Do not point at non-existent branch of CC & merge in Sufia master #2885
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for using sufia with curation_concerns 1.7.0.alpha
Handle the case where the admin_set_id is a blank string
Allow depositing in admin sets you have deposit access to
Add visibility template to Admin Set form
Add a modal when there are many types of works to select from
Now it's Work-Collection-Work-Collection Refs #2689 (Fixes second bullet)
Refs #2698 (Fixes third bullet)
Fix the dashboard icon style
Grant edit access to managers of AdminSet
If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes #2433
The 'New Work' link in the toolbar opens the modal
All the work type icon generation in one place
Search for a user on the AdminSet participants form
Show AdminSets on the admin page
Workflow work was merged into master.
mjgiarlo
changed the title
jcoyne
approved these changes
Nov 14, 2016
houndci-bot
reviewed
Nov 14, 2016
| border-color: $icon-border-color-hover; | ||
| color: $icon-font-color-hover; | ||
| transition-property: background-color, color; | ||
| transition-duration: .35s; |
There was a problem hiding this comment.
.35 should be written with a leading zero as 0.35
houndci-bot
reviewed
Nov 14, 2016
| background-color: $icon-background-color-hover; | ||
| border-color: $icon-border-color-hover; | ||
| color: $icon-font-color-hover; | ||
| transition-property: background-color, color; |
There was a problem hiding this comment.
Properties should be ordered background-color, border-color, color, transition-duration, transition-property, transition-timing-function
houndci-bot
reviewed
Nov 14, 2016
| border: 2px solid $icon-border-color; | ||
| overflow: hidden; | ||
| transition-property: background-color, color; | ||
| transition-duration: .35s; |
There was a problem hiding this comment.
.35 should be written with a leading zero as 0.35
houndci-bot
reviewed
Nov 14, 2016
| border: 2px solid $icon-border-color; | ||
| overflow: hidden; | ||
| transition-property: background-color, color; | ||
| transition-duration: .35s; |
There was a problem hiding this comment.
.35 should be written with a leading zero as 0.35
houndci-bot
reviewed
Nov 14, 2016
| } | ||
| .glyphicon { | ||
| background: $icon-background-color; | ||
| color: $icon-font-color; |
There was a problem hiding this comment.
Properties should be ordered background, border, border-radius, color, display, height, line-height, margin, overflow, transition-duration, transition-property, transition-timing-function, width
houndci-bot
reviewed
Nov 14, 2016
| } | ||
| .glyphicon { | ||
| background: $icon-background-color; | ||
| color: $icon-font-color; |
There was a problem hiding this comment.
Properties should be ordered background, border, border-radius, color, display, height, line-height, margin, overflow, transition-duration, transition-property, transition-timing-function, width
houndci-bot
reviewed
Nov 14, 2016
| transition-duration: .35s; | ||
| transition-timing-function: ease-out; | ||
| } | ||
| .glyphicon { |
There was a problem hiding this comment.
Rule set contains (13/10) properties
houndci-bot
reviewed
Nov 14, 2016
| transition-duration: .35s; | ||
| transition-timing-function: ease-out; | ||
| } | ||
| .glyphicon { |
There was a problem hiding this comment.
Rule set contains (13/10) properties
mjgiarlo
force-pushed
the
point_at_cc_master
branch
from
38fdfb5
to
dec4060
Compare
mjgiarlo
changed the title
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Nov 30, 2016
Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Moving test onto one line for error. Adds spec to test the workflow selection on the admin_set edit form. Removing test that is throwing an error. Updating admin_set_controller_spec to incude permission template Merging / fixing conflicts. switching away from instance variable to a local varirable. Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Moving test onto one line for error. Adds spec to test the workflow selection on the admin_set edit form. Removing test that is throwing an error. Updating admin_set_controller_spec to incude permission template Merging / fixing conflicts. switching away from instance variable to a local varirable. Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy Merge sidebar change from master
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Revert "Adding rpec tests for Workflow name on admin sets." This reverts commit 8618a63. Adding rpec tests for Workflow name on admin sets. Moving test onto one line for error. Adds spec to test the workflow selection on the admin_set edit form. Removing test that is throwing an error. Updating admin_set_controller_spec to incude permission template Merging / fixing conflicts. switching away from instance variable to a local varirable. Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy Merge sidebar change from master
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Merged branch adminset_workflows into adminset_workflows Adding spec for adminset workflow_name Merge pull request samvera-deprecated#2955 from projecthydra/speed_up_feature_specs_and_nuke_the_travis_timeout Speed up feature specs and nuke the travis timeout Remove or reduce unnecessary sleep statements in specs to prevent Travis hangs and delays. Merge pull request samvera-deprecated#2956 from projecthydra/getting-started-updates Clarifying Prerequisites section of the README Bumping tested versions Based on feedback from @mjgiarlo [skip ci] The instructions have moved and hydra-jetty is no longer maintained Add link to Solr Merge pull request samvera-deprecated#2944 from projecthydra/single-step-with-depositor-review add notion of 'depositor review' to one step mediated deposit workflow Merge pull request samvera-deprecated#2953 from projecthydra/remove_mediated_deposit_flipper Remove enable_mediated_deposit feature flipper. add notion of 'depositor review' to one step mediated deposit workflow Remove enable_mediated_deposit feature flipper. Fixes samvera-deprecated#2952 Removing test that is throwing an error. Updating admin_set_controller_spec to incude permission template Merge pull request samvera-deprecated#2951 from projecthydra/skip_workflow_if_mediated_deposit_off Do not use Admin Set-specified workflow if mediated deposit is disabled Merge pull request samvera-deprecated#2950 from projecthydra/cc_users_should_not_be_required Do not require CC users in workflow notifications Do not use Admin Set-specified workflow if mediated deposit is disabled Fixes samvera-deprecated#2949. Do not require CC users in workflow notifications Merging / fixing conflicts. switching away from instance variable to a local varirable. Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Merged branch adminset_workflows into adminset_workflows Adding spec for adminset workflow_name Merge pull request samvera-deprecated#2955 from projecthydra/speed_up_feature_specs_and_nuke_the_travis_timeout Speed up feature specs and nuke the travis timeout Remove or reduce unnecessary sleep statements in specs to prevent Travis hangs and delays. Merge pull request samvera-deprecated#2956 from projecthydra/getting-started-updates Clarifying Prerequisites section of the README Bumping tested versions Based on feedback from @mjgiarlo [skip ci] The instructions have moved and hydra-jetty is no longer maintained Add link to Solr Merge pull request samvera-deprecated#2944 from projecthydra/single-step-with-depositor-review add notion of 'depositor review' to one step mediated deposit workflow Merge pull request samvera-deprecated#2953 from projecthydra/remove_mediated_deposit_flipper Remove enable_mediated_deposit feature flipper. add notion of 'depositor review' to one step mediated deposit workflow Remove enable_mediated_deposit feature flipper. Fixes samvera-deprecated#2952 Removing test that is throwing an error. Updating admin_set_controller_spec to incude permission template Merge pull request samvera-deprecated#2951 from projecthydra/skip_workflow_if_mediated_deposit_off Do not use Admin Set-specified workflow if mediated deposit is disabled Merge pull request samvera-deprecated#2950 from projecthydra/cc_users_should_not_be_required Do not require CC users in workflow notifications Do not use Admin Set-specified workflow if mediated deposit is disabled Fixes samvera-deprecated#2949. Do not require CC users in workflow notifications Merging / fixing conflicts. switching away from instance variable to a local varirable. Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy
scholarworks
pushed a commit
to scholarworks/sufia
that referenced
this pull request
Dec 2, 2016
Removingn blank line. Removed unnecessary label method. fixing a codeclimate complaint. Code Clean up (removing debug comments) Setting workflow_name on admin_set permission_template Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into adminset_workflows Removing unneeded spec. Squashing Commits for clarity. Merging project hydra mde Merge pull request samvera-deprecated#2885 from projecthydra/point_at_cc_master Do not point at non-existent branch of CC & merge in Sufia master Merging in Sufia master branch because it has fixes needed to support CC master Do not put at non-existent branch of CC. Workflow work was merged into master. Merge pull request samvera-deprecated#2884 from projecthydra/admin_collections Show AdminSets on the admin page Show AdminSets on the admin page Fixes samvera/hyku#471 Merge pull request samvera-deprecated#2873 from projecthydra/search_for_user Search for a user on the AdminSet participants form Merge pull request samvera-deprecated#2877 from projecthydra/mde_working Add WorkflowByAdminSetStrategy to mediated_depost_epic. Clean WorkflowByAdminSetStrategy Branch Cleaned branch for WorkflowByAdminSetStrategy to squash prior commits. Search for a user on the AdminSet participants form Fixes #samvera/hyku#416 Addressing trap for nil requests. Formtting removing redundant braces syntax formatting. syntax formatting. Fixing spec. typo! sending nil attribute Removing admin_set.save stuff Missed a close ) testing spec Adding check for default to avoid nil error. Extra character. Adding workflow_name to spec Working through spec. Original was not correct. Removing work parameter. Typo. Merged branch mediated_deposit_epic into mediated_deposit_epic Changes per @jcoyne request on PR samvera-deprecated#2846 Editing Spec syntax updating workflow_by_admin_set spec Adding workflow_id to permissions_template Test for WorkflowByAdminSetStrategy Merge pull request samvera-deprecated#2870 from projecthydra/encapsulate_icons All the work type icon generation in one place Merge pull request samvera-deprecated#2872 from projecthydra/choose_work_header The 'New Work' link in the toolbar opens the modal The 'New Work' link in the toolbar opens the modal If the current user can create more than one work type, and they select "New Work" from the toolbar, the modal will pop-up and ask the user which type of work to create. If there is only one work type, the modal is not opened. Fixes samvera-deprecated#2433 Merge pull request samvera-deprecated#2869 from projecthydra/admin_set_management Grant edit access to managers of AdminSet All the work type icon generation in one place. Ref samvera-deprecated#2867 Grant edit access to managers of AdminSet Fixes samvera/hyku#417 Merge pull request samvera-deprecated#2868 from projecthydra/fix_underline Fix the dashboard icon style Space the action icons evenly across the page Refs samvera-deprecated#2698 (Fixes third bullet) Reorder action links Now it's Work-Collection-Work-Collection Refs samvera-deprecated#2689 (Fixes second bullet) Don't have an underline on the action links. Ref samvera-deprecated#2698 Merge pull request samvera-deprecated#2865 from projecthydra/work_type_picker Add a modal when there are many types of works to select from Merge pull request samvera-deprecated#2857 from projecthydra/admin_set_visibility_template Add visibility template to Admin Set form Merge pull request samvera-deprecated#2848 from projecthydra/admin_set_search_builder Allow depositing in admin sets you have deposit access to Add visibility template to admin set form. See samvera/hyku#419 Add a modal when there are many types of works to select from Fixes samvera-deprecated#2434 Allow depositing in admin sets you have deposit access to Fixes samvera/hyku#427 Merge pull request samvera-deprecated#2853 from projecthydra/trap_missing_admin_set Handle the case where the admin_set_id is a blank string Handle the case where the admin_set_id is a blank string Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Merge pull request samvera-deprecated#2852 from projecthydra/fix_sufia Fix for using sufia with curation_concerns 1.7.0.alpha Fix for using sufia with curation_concerns 1.7.0.alpha Merge master into mediated_deposit_epic Merge pull request samvera-deprecated#2830 from projecthydra/permission_template Add Managers, Depositors and Viewers to a permission template Changes per @mjgiarlo requests. Typo. Rename AdminSetCreateService to avoid confusion with CC::AdminSetService Apply the permissions template to a deposited document Add viewers, managers and depositors to permission templates Merge branch 'mediated_deposit_epic' of https://github.com/projecthydra/sufia into mediated_deposit_epic Removing override of curation_concerns workflow_factory. Adding workflow factory Merge pull request samvera-deprecated#2845 from projecthydra/generate_work_i18n generate the i18n keys for a work. Fixes samvera-deprecated#2436 Removed comment per Travis error. Update to return workflow_name as admin_set_id or default Editing per recommendations. generate the i18n keys for a work. Fixes samvera-deprecated#2436 Merge pull request samvera-deprecated#2840 from projecthydra/workflow_sidebar_submenu added dropdown style for submenu items on the admin sidebar Fixing style issues Adding WorkflowByAdminSetStrategy
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Workflow work was merged from
workflowintomasterin CurationConcerns. (:clap: @tpendragon)