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

7.x-1.3 cherry-picking #105

Closed
wants to merge 38 commits into from
Closed

7.x-1.3 cherry-picking #105

wants to merge 38 commits into from

Conversation

ruebot
Copy link
Member

@ruebot ruebot commented Apr 22, 2014

Grabbing the following commits for 7.x-1.3:
#93
#94
#97
#98
#99
#100

ruebot and others added 30 commits March 13, 2014 12:31
Added fallback for missing genre tags
made subjects repeatable
Change the default value to be consistent.
new package and admin submenu
@ruebot
Copy link
Member Author

ruebot commented Apr 22, 2014

I should grab #92 as well once it is merged.

nigelgbanks and others added 2 commits April 23, 2014 08:17
Update outdated Travis configurations.
…cherrypick

Conflicts:
	islandora_scholar.info
@ruebot
Copy link
Member Author

ruebot commented Apr 23, 2014

@nigelgbanks let me know if this reflects what you mentioned on the list. A little ugly, but I think it does the job.

'type' => MENU_NORMAL_ITEM,
'page callback' => 'drupal_get_form',
'page arguments' => array('islandora_scholar_admin_form'),
'access arguments' => array('access administration pages'),
'file' => 'includes/admin.form.inc',
),
'admin/islandora/scholar/base' => array(
'admin/islandora/solution_pack_config/scholar/base' => array(
Copy link
Member

Choose a reason for hiding this comment

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

Can't merge this, it will break as the Islandora Menu changes are not part of this release.
"admin/islandora/solution_pack_config"

@nigelgbanks
Copy link
Member

There is a number of breaking changes in this pull request, as it uses menus not defined in the core Islandora module.

The fixes that are included are fairly minor, I'd recommend not including this in the release.

@ruebot ruebot deleted the 7.x-1.3-cherrypick branch April 25, 2014 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants