Alan Stanley
5849b17f01
Merge branch '6.x' of https://github.com/Islandora/islandora into 6.x
13 years ago
Alan Stanley
fcaa12f57f
Made version numbers conform
13 years ago
Jonathan Green
55999b06c8
Merge pull request #146 from adam-vessey/6.x
...
ISLANDORA-695 Fix replace datastream errors.
13 years ago
Alan Stanley
bdf38c6a01
removed debug message
13 years ago
Alan Stanley
7b3463ba5a
added mappings for mkv and wmv files
13 years ago
Adam Vessey
87972d4a1a
ISLANDORA-695 Fix replace datastream errors.
...
... Looks like I had created had an error in my fix, so this
should fix the error from the previous fix... Should be good now.
13 years ago
Alan Stanley
06f4a0d335
Merge branch '6.x' of https://github.com/Islandora/islandora into 6.x
13 years ago
Jonathan Green
221a3ef5e9
Merge pull request #144 from adam-vessey/6.x
...
ISLANDORA-695 Replacing datastream errors.
13 years ago
Adam Vessey
2ddd247647
ISLANDORA-695 Replacing datastream errors.
...
Create a work around for file_create_url not playing nice.
13 years ago
Jonathan Green
7c018f3ab6
Merge pull request #143 from adam-vessey/6.x
...
Little more checking if there is any tab content...
13 years ago
Adam Vessey
6b05e20316
Remove lines creating getDatastream error...
13 years ago
Adam Vessey
f54e2f2acb
Little more checking if there is any tab content...
...
... If there is none, we don't bother rendering the tab.
13 years ago
nruest
32f2f7d753
sketching out fits support
13 years ago
Jonathan Green
c0c0701253
Merge pull request #141 from adam-vessey/6.x
...
6.x
13 years ago
Jonathan Green
8bc54d1b01
Merge pull request #142 from jordandukart/6.x
...
Added xslt extension to MimeClass.inc
13 years ago
Jordan Dukart
6f59b764cc
Added xslt extension to MimeClass.inc
13 years ago
Adam Vessey
1f30a3ded1
Merge branch '6.x' of git://github.com/Islandora/islandora into 6.x
13 years ago
Adam Vessey
efbd0da51e
Refine "Object Details" handling.
...
- Allow "form" structure to be returned by the hook call in
addition to markup.
- Fix permissions.
13 years ago
Jonathan Green
d30efed3be
Merge pull request #140 from jmacwilliams/6.x
...
islandora now calls out to modules to alter the collection query
13 years ago
Jason MacWilliams
530d5a3aca
added notes to reverse iterator in purge_relationships
13 years ago
Jason MacWilliams
845c33964a
updated purge_datastream to iterate backwards through the rels elements instead of forward so it can correctly remove all of them
13 years ago
Jason MacWilliams
21a6fd1aee
updated getCollectionQuery to call out an alter for other modules to update the query (specifically for the xacml module, but others could alter as well)
13 years ago
Jonathan Green
7c9aefc8ec
Merge pull request #139 from willtp87/ISLANDORA-581
...
ISLANDORA-581 On content model trigered tabs we use module_exists to ver...
13 years ago
William Panting
8c3da4569a
ISLANDORA-581 On content model trigered tabs we use module_exists to verify if a module is present and enabled before calling code. We also use module_load_include instead of including directly.
13 years ago
Alan Stanley
3d226bec86
Merge branch '6.x' of https://github.com/Islandora/islandora into 6.x
13 years ago
Jonathan Green
1fa2f2a3ae
Merge pull request #138 from adam-vessey/6.x
...
6.x
13 years ago
Adam Vessey
ac0cfab95c
Merge branch '6.x' of github.com:adam-vessey/islandora into 6.x
13 years ago
Adam Vessey
0b8ef2ecd9
Fixed where I missed avoiding the page cache for datastreams.
13 years ago
Jonathan Green
72630f1462
Merge pull request #137 from jonathangreen/6.x
...
Removed Old Configuration Options
13 years ago
jonathangreen
a3c66723f1
Fixed Namespaces Message (for real this time)
13 years ago
jonathangreen
d5549e9a33
Fixed Namespaces Message
13 years ago
jonathangreen
2b471e48a6
Removed Useless Configuration Options
...
There are old configuration options that predate time (are older
then islandora has been in GIT) that just don't do anything anymore.
We used to hide them in advanced settings. Just killed them.
13 years ago
Alan Stanley
c0f8ff77e6
Merged files
13 years ago
Adam Vessey
2371ea7869
Use function to get query.
13 years ago
Jonathan Green
3ca0bcb7cd
Merge pull request #136 from adam-vessey/6.x
...
6.x
13 years ago
Adam Vessey
116916d5ce
Merge branch '6.x' of digital.march.es:/var/www/html/drupal/sites/all/modules/islandora/ into 6.x
13 years ago
Adam Vessey
08e0c679b3
Speed up breadcrumb query.
...
... Guess it doesn't really do much towards optimization server-side.
13 years ago
Jonathan Green
05fbdcfa1c
Merge pull request #135 from adam-vessey/6.x
...
6.x
13 years ago
Adam Vessey
63d505a1f1
Use the relevant constant.
13 years ago
Adam Vessey
ff615b140a
Merge branch '6.x' of github.com:Islandora/islandora into 6.x
...
Conflicts:
ObjectHelper.inc - changed to drupal_set_header.
13 years ago
Adam Vessey
3d7c6bc00f
Merge branch '6.x' of digital.march.es:/var/www/html/drupal/sites/all/modules/islandora/ into 6.x
13 years ago
Adam Vessey
5db38dde91
Use drupal set headers to allow proper page caching, but disable caching...
...
Noticed at first that it wasn't working, and then it made the DB huge...
Anyway.
13 years ago
Jonathan Green
b338e388ef
Merge pull request #134 from jmacwilliams/6.x
...
updated configurations to save display mode as well and config options, ...
13 years ago
Jason MacWilliams
c2f0b10ffc
updated configurations to save display mode as well and config options, also report a successful save to the user
13 years ago
Jonathan Green
c71cf5c8fe
Merge pull request #133 from jordandukart/6.x
...
6.x
13 years ago
Jordan Dukart
3cb70d9223
Comment spacing, islandora_object_load function
13 years ago
Jordan Dukart
a4985161f7
Comment spacing, islandora_object_load function
13 years ago
Jonathan Green
773de14639
Merge pull request #131 from jordandukart/6.x
...
Added tuque wrapper for use in 6.x development
13 years ago
Jordan Dukart
d8b404d7b5
Added tuque wrapper for use in 6.x development
13 years ago
Jonathan Green
3d0b98ab21
Merge pull request #130 from jordandukart/6.x
...
Change to allow the use of diacritics. JIRA ticket ISLANDORA-625
13 years ago