6.x #126
Merged
6.x #126
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
FlowPlayer requires the "Content-Length" header to be returned in order to work properly, but it wasn't getting returned in the header when a user was not logged in. A slight change to the semantics, and opening up of the getDatastream API-M method via XACML seems to work.
Had to do with migration to use of newer REST API; it takes the version parameter differently, as a query parameter instead of a position in the URL.
Error intro'd during datastream replace 'improvements'.
... As opposed to spitting out markup for it directly.
Conflicts: ObjectHelper.inc - fix content size acquisition
Was using wrong variable name.
Conflicts: ObjectHelper.inc
The XSLT will still be used if it is present, though.
Was able to instantiate without a PID, which would mean that the 'collectionObject' object helper would not get created... Blargh.
Hurray for enabling code reuse!
... Facilitates implementation of equivalent functionality, where the object was instantiated with the PID, and then the page was passed to the method declared in your ISLANDORACM stream.
Should make the length an actual configurable value... Shouldn't be hard, though.
... Including those provided by islandora proper.
Called just before return of drupal_render()'d markup. Passed the
tabset and associative array of the parameters with which
hook_islandora_tabs() was called; that is:
array(
'content_models' => {an array of ContentModel objects},
'pid' => {the PID of the object being rendered},
'page' => {the page of the object to be displayed},
)
…tab remains selected.
This function tries to make use of imagecache(_external) if it is
avaiable; otherwise, falls back to using theme('image').
Also, use imagecache_external!
…ge to request all profiles and create a table for user selection
…table display mode (with configuration)
…ue, added description to radiogroup
Conflicts: plugins/tagging_form.inc - both introduced slightly different fixes...
Can now use some basic typing (int, string) for RDF literals.
Conflicts: fedora_repository.module
jonathangreen
pushed a commit
that referenced
this pull request
Jun 4, 2012
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.
Refactors, rewrites, and cleanups...
Everything between d36fdd2 and 48c1551 can be ignored... Did some combination of a rebase and merge which seems to have made a mess of things. (Also smaller "fix" commits in that range were squashed into the surrounding commits, and so are not duplicated later)
Mentionable are commits: