Alan Stanley
|
dcc81b1fcd
|
added islandora xml default for datastrram replacement
|
10 years ago |
|
Alan Stanley
|
3764973b65
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
10 years ago |
|
Nick Ruest
|
e97086584d
|
Merge pull request #466 from whikloj/patch-2
Check for hostname
|
10 years ago |
|
Adam
|
8e67a4932d
|
Merge pull request #546 from lutaylor/7.x
adding reliable install source
|
10 years ago |
|
lutaylor
|
087db8b3b0
|
adding reliable install source
|
10 years ago |
|
Adam
|
f4f32a72a7
|
Merge pull request #537 from willtp87/7.x.dd
defer derivatives api
|
10 years ago |
|
willtp87
|
7bba93d92b
|
typo fix
|
10 years ago |
|
ajstanley
|
9920669f4f
|
Merge pull request #543 from MorganDawe/7.x-EMIC-210
7.x emic 210
|
10 years ago |
|
Alan Stanley
|
95ca398d11
|
resolved conflict
|
10 years ago |
|
willtp87
|
df6ae00376
|
Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x.dd
|
10 years ago |
|
MorganDawe
|
d2ecd81ba8
|
Code review feedback.
|
10 years ago |
|
MorganDawe
|
212276f6d0
|
Corrected small travis issue.
|
10 years ago |
|
MorganDawe
|
4311be0f0d
|
removed unused code.
|
10 years ago |
|
MorganDawe
|
8efd0c23fc
|
Updated file extension logic on ds download.
|
10 years ago |
|
Nick Ruest
|
5110e52590
|
Merge pull request #542 from qadan/7.x-travis-logging
make the drush webserver logs go somewhere real
|
10 years ago |
|
qadan
|
5caf983df8
|
make the drush webserver logs go somewhere real
|
10 years ago |
|
MorganDawe
|
2b2c5c8601
|
Updating extestion and mime detection on download to use drupals file_g=default_mimetype_mapping() funcitons.
|
10 years ago |
|
Jordan Dukart
|
038b6d704c
|
Merge pull request #540 from MorganDawe/7.x-EMIC-210
Removed rng => application/xml mapping.
|
10 years ago |
|
MorganDawe
|
f1de655d9a
|
Updated mime detect class.
|
10 years ago |
|
MorganDawe
|
4dbf46adc9
|
Removed rng => application/xml mapping.
|
10 years ago |
|
Jordan Dukart
|
4feca8bc7a
|
Merge pull request #507 from qadan/7.x
7.x web and unit test cases
|
10 years ago |
|
willtp87
|
25b53ba01b
|
copypasta omm nom
|
10 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 |
