29b32e2c07
not lying about units
11 years ago
d964ea2042
Appease the Travis gods after a merge conflict fail.
11 years ago
b7b4717e49
Unused var.
11 years ago
b602213c20
Merge branch '7.x-METRO-53' of github.com:jordandukart/islandora into 7.x-METRO-53
...
Conflicts:
islandora.module
11 years ago
5658f0d06a
Merge pull request #526 from jordandukart/7.x-FLVC-64
...
Magic to get around a core Drupal problem.
11 years ago
6133b0973c
Magic to get around a core Drupal problem.
11 years ago
c81ea08877
Merge pull request #524 from adam-vessey/7.x-USDA-65
...
Move hooks calls a little higher.
11 years ago
29978b7a1e
Resolve issue with recursing. Curse you, PHP!
11 years ago
d3e0efce44
Merge pull request #522 from willtp87/7.x.mimes
...
datastream replacing mimes more accurate
11 years ago
931293e351
Merge pull request #525 from willtp87/7.x.deprecation
...
Removing deprecated function islandor_get_comp_ds_mappings.
11 years ago
2712214b81
Removing deprecated function islandor_get_comp_ds_mappings.
11 years ago
37517e526a
Merge branch '7.x-METRO-53' of github.com:jordandukart/islandora into HEAD
11 years ago
022842a0a0
Move hooks calls a little higher.
...
Where they were in the API, modifications triggering other modifications were
causing old data to be used, so the second (and later) modifications would fail
due to "locking"... We now allow modifications to complete to the point where they
update the lastModifiedDate on instances of Tuque objects before invoking our hooks.
11 years ago
4075c972df
Merge pull request #523 from ruebot/7.x
...
I suppose we should have warc in here if we have a web archive solution ...
11 years ago
2a127bb153
I suppose we should have warc in here if we have a web archive solution pack.
11 years ago
9ea9eeed60
datastream replacing mimes more accurate
11 years ago
8e814ce60f
Merge pull request #521 from willtp87/7.x.mimes
...
better xsl handling
11 years ago
9014acf085
better xsl handling
11 years ago
8f3aa8c0ea
Merge pull request #520 from willtp87/7.x.deprecation
...
removing deprecated function islandora_datastream_get_delete_link
11 years ago
ddd9642d82
removing deprecated function islandora_datastream_get_view_link
11 years ago
17057c2676
removing deprecated function islandora_datastream_get_download_link
11 years ago
bba12090fd
removing deprecated function islandora_datastream_edit_get_link
11 years ago
0fb4a6d7b6
removing deprecated function islandora_datastream_get_delete_link
11 years ago
0fcc3f3d39
Merge pull request #519 from willtp87/7.x
...
stray include removal
11 years ago
58a65f7745
stray include removal
11 years ago
09aaf34514
Newline.
11 years ago
fe615ea78e
Change how the print works.
11 years ago
7123fbdf88
Merge pull request #517 from adam-vessey/7.x-UC-15
...
Fix error due to incorrect include.
11 years ago
5e02026712
Merge pull request #515 from adam-vessey/7.x-new-drush-from-composer
...
Use a newer drush release (also, get it with composer).
11 years ago
ab434c379a
Attempt to get use the new drush release.
11 years ago
608b437de6
Merge pull request #513 from ruebot/7.x-ISLANDORA-860
...
Address ISLANDORA-860
11 years ago
0b7b08a254
Address ISLANDORA-860
11 years ago
3b797253ad
the stupidity continues
11 years ago
1c5e2a1893
i did an incredibly stupid thing
11 years ago
835d167397
let's not go nuts
11 years ago
1c0fa96099
moving around some stuffs
11 years ago
d46d76e157
Merge pull request #7 from nigelgbanks/7.x-code-review
...
Operator precedence allowed for strings that were not 4 or 8 characters ...
11 years ago
644344aaa8
Merge pull request #512 from willtp87/7.x
...
better chem mimes
11 years ago
7488ec6f1a
better chem mimes
11 years ago
16d24a3f9c
Operator precedence allowed for strings that were not 4 or 8 characters long.
11 years ago
f59e5801b6
Merge pull request #511 from willtp87/7.x
...
chem mime fixes
11 years ago
f8e7f8062b
chem mime fixes
11 years ago
5261dce897
Merge pull request #510 from willtp87/7.x
...
no need for bin mappings
11 years ago
b0ca737cf8
no need for bin mappings
11 years ago
723a8f54d7
not using t() like some sorta madman
11 years ago
02de114401
better, simpler drupal filter handling
11 years ago
6a94a5e542
Merge branch 'qadan-7.x' into 7.x
11 years ago
22c5ad410d
conflict resolution
11 years ago
9a999b15ac
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
11 years ago
fc357e6f7d
last bit of bugfixes and cleanup
11 years ago
willtp87