Jordan Dukart
6ca6dc4c06
Make sure our attribute doesn't break markup.
11 years ago
Jordan Dukart
40fb47f710
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-METRO-53
11 years ago
Adam
f1d6100d14
Merge pull request #527 from jordandukart/7.x-METRO-53
...
Make print not add JS and instead be a tab.
11 years ago
Jordan Dukart
05d2ccd3f8
Merge pull request #528 from willtp87/7.x.iec
...
not lying about units
11 years ago
willtp87
29b32e2c07
not lying about units
11 years ago
Jordan Dukart
d964ea2042
Appease the Travis gods after a merge conflict fail.
11 years ago
Jordan Dukart
b7b4717e49
Unused var.
11 years ago
Jordan Dukart
b602213c20
Merge branch '7.x-METRO-53' of github.com:jordandukart/islandora into 7.x-METRO-53
...
Conflicts:
islandora.module
11 years ago
Adam
5658f0d06a
Merge pull request #526 from jordandukart/7.x-FLVC-64
...
Magic to get around a core Drupal problem.
11 years ago
Jordan Dukart
6133b0973c
Magic to get around a core Drupal problem.
11 years ago
William Panting
c81ea08877
Merge pull request #524 from adam-vessey/7.x-USDA-65
...
Move hooks calls a little higher.
11 years ago
Adam Vessey
29978b7a1e
Resolve issue with recursing. Curse you, PHP!
11 years ago
Jordan Dukart
d3e0efce44
Merge pull request #522 from willtp87/7.x.mimes
...
datastream replacing mimes more accurate
11 years ago
Adam
931293e351
Merge pull request #525 from willtp87/7.x.deprecation
...
Removing deprecated function islandor_get_comp_ds_mappings.
11 years ago
vagrant
2712214b81
Removing deprecated function islandor_get_comp_ds_mappings.
11 years ago
vagrant
37517e526a
Merge branch '7.x-METRO-53' of github.com:jordandukart/islandora into HEAD
11 years ago
Adam Vessey
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
William Panting
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
nruest
2a127bb153
I suppose we should have warc in here if we have a web archive solution pack.
11 years ago
willtp87
9ea9eeed60
datastream replacing mimes more accurate
11 years ago
Nigel Banks
8e814ce60f
Merge pull request #521 from willtp87/7.x.mimes
...
better xsl handling
11 years ago
willtp87
9014acf085
better xsl handling
11 years ago
Jordan Dukart
8f3aa8c0ea
Merge pull request #520 from willtp87/7.x.deprecation
...
removing deprecated function islandora_datastream_get_delete_link
11 years ago
willtp87
ddd9642d82
removing deprecated function islandora_datastream_get_view_link
11 years ago
willtp87
17057c2676
removing deprecated function islandora_datastream_get_download_link
11 years ago
willtp87
bba12090fd
removing deprecated function islandora_datastream_edit_get_link
11 years ago
willtp87
0fb4a6d7b6
removing deprecated function islandora_datastream_get_delete_link
11 years ago
Jordan Dukart
0fcc3f3d39
Merge pull request #519 from willtp87/7.x
...
stray include removal
11 years ago
willtp87
58a65f7745
stray include removal
11 years ago
Jordan Dukart
09aaf34514
Newline.
11 years ago
Jordan Dukart
fe615ea78e
Change how the print works.
11 years ago
William Panting
7123fbdf88
Merge pull request #517 from adam-vessey/7.x-UC-15
...
Fix error due to incorrect include.
11 years ago
William Panting
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
Adam Vessey
ab434c379a
Attempt to get use the new drush release.
11 years ago
William Panting
608b437de6
Merge pull request #513 from ruebot/7.x-ISLANDORA-860
...
Address ISLANDORA-860
11 years ago
nruest
0b7b08a254
Address ISLANDORA-860
11 years ago
Jordan Dukart
644344aaa8
Merge pull request #512 from willtp87/7.x
...
better chem mimes
11 years ago
willtp87
7488ec6f1a
better chem mimes
11 years ago
Jordan Dukart
f59e5801b6
Merge pull request #511 from willtp87/7.x
...
chem mime fixes
11 years ago
willtp87
f8e7f8062b
chem mime fixes
11 years ago
Jordan Dukart
5261dce897
Merge pull request #510 from willtp87/7.x
...
no need for bin mappings
11 years ago
willtp87
b0ca737cf8
no need for bin mappings
11 years ago
Nick Ruest
3e0fc461d9
Merge pull request #509 from willtp87/7.x
...
less batches
11 years ago
willtp87
69188416bd
less batches
11 years ago
Adam Vessey
07d082dc76
Fix error due to incorrect include.
11 years ago
Jordan Dukart
1efecd4dfb
Merge pull request #508 from adam-vessey/7.x-fix-jpeg-mime
...
Correct recently broken MIME-type.
11 years ago
Adam Vessey
8b3d781b3b
Correct recently broken MIME-type.
11 years ago
Nick Ruest
d619fdb6bb
Merge pull request #502 from MorganDawe/7.x.cwrcps-9
...
7.x.cwrcps 9
11 years ago
Jordan Dukart
451764f4f6
Merge pull request #505 from MorganDawe/7.x.chemical_mimetypes
...
7.x.chemical mimetypes
11 years ago
Jordan Dukart
b9bbc1a66c
Merge pull request #506 from willtp87/7.x.post-release
...
removing deprecated constants
11 years ago