Alan Stanley
|
20a529821e
|
resolved merge conflicts
|
11 years ago |
|
Nelson Hart
|
283a396204
|
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
|
11 years ago |
|
Nelson Hart
|
c6beca5ae8
|
allow mulitple mime types for viewers
|
11 years ago |
|
Jonathan Green
|
dd50626677
|
Merge pull request #399 from jordandukart/7.x-alter-breadcrumbs
Add alterable breadcrumbs to Islandora.
|
11 years ago |
|
Jordan Dukart
|
0c50962a63
|
Add context for ease of use.
|
11 years ago |
|
Jordan Dukart
|
7fef116c00
|
Add alterable breadcrumbs to Islandora.
|
11 years ago |
|
Morgan Dawe
|
c155409a71
|
Merge pull request #395 from willtp87/7.x
api doc clarification
|
11 years ago |
|
Alan Stanley
|
88ff97f4ff
|
changed variable name
|
11 years ago |
|
Alan Stanley
|
d6aa4c34f3
|
updated to islandora_invoke_hook_list
|
12 years ago |
|
Alan Stanley
|
2b912d36cb
|
updated to islandora_invoke_hook_list
|
12 years ago |
|
Alan Stanley
|
3442501dd3
|
clarified propogation message
|
12 years ago |
|
Jonathan Green
|
3012129ffd
|
Merge pull request #397 from nigelgbanks/7.x-solution-pack-viewer-whitescreen
Prevents a white screen when a viewer is set but not enabled.
|
12 years ago |
|
Nelson Hart
|
26216e4f75
|
Merge branch '7.x-solution-pack-viewer-whitescreen' of https://github.com/nigelgbanks/islandora into 7.x
|
12 years ago |
|
Jonathan Green
|
e292b2b840
|
Merge pull request #393 from adam-vessey/7.x-datastream-cache-headers
Cache headers for datastreams.
|
12 years ago |
|
Adam Vessey
|
a653a25c9c
|
Coding standards... Trailing space.
|
12 years ago |
|
Adam Vessey
|
dca15b1ccd
|
Respond with the same headers as we did before, if caching is disabled.
|
12 years ago |
|
Alan Stanley
|
d9f2d1bbcf
|
removed some whitespaces
|
12 years ago |
|
Alan Stanley
|
797bfb923d
|
consolidated looping logic
|
12 years ago |
|
philsogaDGI
|
b9b502728b
|
Merge pull request #394 from MorganDawe/7.x
Added the previously removed print callback, as it was required by anoth...
|
12 years ago |
|
Adam Vessey
|
44d83c7ed9
|
Fix some comments for Jordan.
|
12 years ago |
|
Alan Stanley
|
5a77c93b38
|
changed menu type
|
12 years ago |
|
Adam Vessey
|
6b4768d9f6
|
Add missing function comment.
|
12 years ago |
|
Adam Vessey
|
cc5c982540
|
Add test to test datastream cache responses.
|
12 years ago |
|
Adam Vessey
|
67999de1e7
|
Add checkbox to disable caching functionality.
|
12 years ago |
|
William Panting
|
9335fc3b3a
|
api doc clarification
|
12 years ago |
|
MorganDawe
|
81cc6be977
|
Removed console log function and reference to old view object permission.
|
12 years ago |
|
MorganDawe
|
76e09b2471
|
Fixed Menu path conflicts with printing dc_data and clipping large image and newspaper.
|
12 years ago |
|
Nigel Banks
|
fcb2bf2805
|
Prevents a white screen when a viewer is set but not enabled.
If a user selects a viewer and then disables that module, but does
not change any solution packs viewers settings this can occur.
|
12 years ago |
|
MorganDawe
|
b002191085
|
Added the previously removed print callback, as it was required by another module and was breaking clipping.
|
12 years ago |
|
Alan Stanley
|
be3bca5fb6
|
resolved merge conflict
|
12 years ago |
|
Alan Stanley
|
f478feabb4
|
refactored form logic
|
12 years ago |
|
Adam Vessey
|
f0c2e2dd88
|
Code standards, again.
|
12 years ago |
|
Adam Vessey
|
64c90936d9
|
Coding standards.
|
12 years ago |
|
Jonathan Green
|
00959ff48e
|
Merge pull request #381 from qadan/7.x
added the fancy image assertion back in
|
12 years ago |
|
Adam Vessey
|
55c3fc0b90
|
Force cache revalidation.
|
12 years ago |
|
Adam Vessey
|
630ab0e5ae
|
Implement the HTTP cache validation shenanigans.
|
12 years ago |
|
Adam Vessey
|
d59099aab4
|
Add response headers.
... Still need to react to requests.
|
12 years ago |
|
Jonathan Green
|
93dd11ddd3
|
Merge pull request #391 from christianselig/7.x
Added additional condition to prevent variable from being accessed when ...
|
12 years ago |
|
Christian Selig
|
2ebbf211e7
|
Added additional condition to prevent variable from being accessed when it hasn't been set.
|
12 years ago |
|
Jonathan Green
|
6a4ba3f835
|
Merge pull request #390 from adam-vessey/7.x-prevent-devel-query-log-issues
Set global to prevent query logging when outputting datastreams.
|
12 years ago |
|
Adam Vessey
|
2bb19dbac8
|
Set global to prevent query logging when outputting datastreams.
|
12 years ago |
|
Mitch MacKenzie
|
6e1946e6b3
|
Merge pull request #389 from christianselig/7.x
Added ability to revert to previous versions of datastreams.
|
12 years ago |
|
Christian Selig
|
962f7f46d9
|
Removed unnecessary newlines.
|
12 years ago |
|
Christian Selig
|
9b04972ddb
|
Fixed some small issues including improper comments, not returning properly, unnecessary code and putting the file in temporary:// for safety.
|
12 years ago |
|
Christian Selig
|
798312bedb
|
Added ability to revert to previous versions of datastreams.
|
12 years ago |
|
Alan Stanley
|
3f8f74eb5b
|
return labels from content models
|
12 years ago |
|
Alan Stanley
|
94fe28de4b
|
changed function names to avoid future name collision
|
12 years ago |
|
Jordan Dukart
|
1371e0d7d3
|
Merge pull request #388 from adam-vessey/7.x-fix-docs
Document a feature of hooked access, due to hook invocation.
|
12 years ago |
|
Adam Vessey
|
d6e67c7b34
|
Document a feature of hooked access, due to hook invocation.
|
12 years ago |
|
Jonathan Green
|
f0da320952
|
Merge pull request #387 from jordandukart/7.x-derivatives
Make watchdogs watchdog.
|
12 years ago |
