Jordan Dukart
4feca8bc7a
Merge pull request #507 from qadan/7.x
...
7.x web and unit test cases
11 years ago
willtp87
25b53ba01b
copypasta omm nom
11 years ago
willtp87
42375fc595
Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x.dd
11 years ago
willtp87
3850720e65
global defer derivatives setting
11 years ago
Daniel Lamb
1dcee46574
Merge pull request #536 from adam-vessey/7.x-INT-372
...
Recursive things are exclusively magical.
11 years ago
willtp87
6b69518988
defer derivatives api
11 years ago
Adam Vessey
862bde2d64
Ermahgerd, lerns ter lerng.
11 years ago
Adam Vessey
f49f709bad
Recursive things are exclusively magical.
...
... Magically delicious, even.
11 years ago
Nigel Banks
798079f7eb
Merge pull request #535 from MorganDawe/7.x.EMIC-130
...
Added application/rdf for file extension rng in mimedetect.
11 years ago
MorganDawe
80f076f385
Added application/rdf for file extension rng in mimedetect.
11 years ago
Nick Ruest
349e2ca89e
Merge pull request #534 from willtp87/7.x.github_hatest_rebaseing
...
validator fix
11 years ago
willtp87
5d1d9a8630
validator fix
11 years ago
Nigel Banks
edbeb19a39
Merge pull request #531 from ruebot/7.x
...
Add travis #islandora irc notifications
11 years ago
qadan
329e4059f0
Merge pull request #530 from willtp87/7.x.travis
...
php 5.5 in test matrix
11 years ago
nruest
369a997123
Add travis #islandora irc notifications
11 years ago
willtp87
e65bddc8dc
php 5.5 in test matrix
11 years ago
Morgan Dawe
b96b7fab0a
Merge pull request #529 from jordandukart/7.x-METRO-53
...
Make sure our attribute doesn't break markup.
11 years ago
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
qadan
0a6e8300c1
static context non-static statics contexts pfft
11 years ago
qadan
f0a49fd44e
code review changes
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