Ben Woodhead
|
2971f31380
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
02c55906d0
|
Changed fedora to islandora
|
13 years ago |
|
Ben Woodhead
|
fe062d14ef
|
fixed documentation
|
13 years ago |
|
Ben Woodhead
|
8d6d9411f2
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
cfae7317a3
|
Deleted fedora attach, newspaper and pidfield
|
13 years ago |
|
Ben Woodhead
|
e4848ed251
|
Merge pull request #23 from bwoodhead/6.x
Added documentation tags back in
|
13 years ago |
|
Ben Woodhead
|
edde1243a1
|
Fixed documentation
|
13 years ago |
|
Ben Woodhead
|
c72a6a7d2f
|
Added documentation back in
|
13 years ago |
|
Ben Woodhead
|
744b72b993
|
Merge branch '6.x' of github.com:Islandora/islandora into 6.x
Conflicts:
api/fedora_utils.inc
|
13 years ago |
|
Ben Woodhead
|
84361d7284
|
added more documentation
|
13 years ago |
|
Ben Woodhead
|
3f160387bd
|
Merge pull request #22 from bwoodhead/6.x
fixed a typo
|
13 years ago |
|
Ben Woodhead
|
d10b32e575
|
fixed a typo
|
13 years ago |
|
Alan Stanley
|
b5f1a87d30
|
Added tab to create new child collections
|
13 years ago |
|
Alan Stanley
|
4974e565b8
|
Removed spaces from .xslts
|
13 years ago |
|
Ben Woodhead
|
da6351439d
|
Merge pull request #21 from nigelgbanks/ISLANDORA-322
ISLANDORA-322: fix the checks for convert and kdu_compress.
|
13 years ago |
|
Nigel Banks
|
20ffe321d1
|
ISLANDORA-322: fix the checks for convert and kdu_compress.
|
13 years ago |
|
Ben Woodhead
|
a322edcb71
|
Merge pull request #19 from bwoodhead/6.x
ISLANDORA-323: Fixed naming
|
13 years ago |
|
Ben Woodhead
|
e56c7d85c8
|
ISLANDORA-323: Fixed naming
|
13 years ago |
|
Ben Woodhead
|
4f9665eac0
|
Merge pull request #18 from nigelgbanks/ISLANDORA-322
ISLANDORA-322: Can't Install Islandora with out XSLT (PHP4 extension) alt
|
13 years ago |
|
Ben Woodhead
|
722f7b3fe0
|
Merge pull request #17 from jonathangreen/6.x
ISLANDORA-318
|
13 years ago |
|
Nigel Banks
|
7e8f2f62c8
|
ISLANDORA-322: Reopened ticket, added requirement that it test for a different xsl library.
|
13 years ago |
|
Nigel Banks
|
5d865f1980
|
ISLANDORA-322: Can't Install Islandora with out XSLT (PHP4 extension) although XSLT is not used within islandora. (Fixed)
|
13 years ago |
|
jonathangreen
|
36997226e6
|
ISLANDORA-318 Updated the class in core which shows the detailed list of content. Renamed it from FedoraObject -> FedoraObjectDetailedContent. This will allow the new API to be used with the newest release of Islandora.
|
13 years ago |
|
Ben Woodhead
|
945c2ec022
|
Merge pull request #16 from nigelgbanks/ISLANDORA-317
ISLANDORA-317: fixed by checking the stuff.
|
13 years ago |
|
Nigel Banks
|
33f7e40156
|
ISLANDORA-317: fixed by checking the stuff.
|
13 years ago |
|
Ben Woodhead
|
4c4e3c9aad
|
Merge pull request #15 from bwoodhead/6.x
Added documentation tags to the class
|
13 years ago |
|
Ben Woodhead
|
20892604f3
|
Added documentation tags to the class
|
13 years ago |
|
Ben Woodhead
|
8bb3840390
|
Merge pull request #14 from nigelgbanks/ISLANDORA-315
Islandora 315
|
13 years ago |
|
Ben Woodhead
|
cc697cc7e3
|
Merge pull request #13 from bwoodhead/6.x
Added tests for Kakadu and ImageMagick
|
13 years ago |
|
Ben Woodhead
|
a75de385b7
|
Added tests for Kakadu and ImageMagick
|
13 years ago |
|
Ben Woodhead
|
7951033390
|
Merge pull request #12 from bwoodhead/6.x
ISLANDORA-268: Added module install tests for xml, xslt and curl
|
13 years ago |
|
Ben Woodhead
|
956a1fc023
|
ISLANDORA-268: Added module install tests for xml, xslt and curl
|
13 years ago |
|
Nigel Banks
|
1681e031f3
|
Fixed datastream state check.
|
13 years ago |
|
Nigel Banks
|
58683c8f71
|
Merge branch 'ISLANDORA-315' of github.com:nigelgbanks/islandora into ISLANDORA-315
|
13 years ago |
|
Ben Woodhead
|
72f3ea62cc
|
Merge pull request #11 from bwoodhead/6.x
ISLANDORA-316: Fixed a naming bug
|
13 years ago |
|
Ben Woodhead
|
6ee39c150f
|
ISLANDORA-316: Fixed a naming bug
|
13 years ago |
|
Nigel Banks
|
4260762fc0
|
Added set_datastream_state function.
|
13 years ago |
|
Ben Woodhead
|
9e4ffd059c
|
Merge pull request #10 from bwoodhead/6.x
Removed ILives.
|
13 years ago |
|
Ben Woodhead
|
792d709d67
|
Removed ILives. It's being replaced by solution packs.
|
13 years ago |
|
Ben Woodhead
|
e48680ad06
|
Merge pull request #9 from bwoodhead/6.x
ISLANDORA-314: Changed names to Islandora from Fedora
|
13 years ago |
|
Ben Woodhead
|
4799653a60
|
ISLANDORA-314: Changed names to Islandora from Fedora
|
13 years ago |
|
Ben Woodhead
|
48b081b33b
|
Merge pull request #8 from bwoodhead/6.x
fixed a typo
|
13 years ago |
|
Ben Woodhead
|
e22cd00b17
|
fixed a typo
|
13 years ago |
|
Ben Woodhead
|
1fb0e07e62
|
Merge pull request #7 from bwoodhead/6.x
ISLANDORA-260 Bugfix
|
13 years ago |
|
Ben Woodhead
|
b3fa58db05
|
Merge branch 'ISLANDORA-278' into 6.x
Conflicts:
CollectionClass.inc
CollectionPolicy.inc
ConnectionHelper.inc
ContentModel.inc
MimeClass.inc
ObjectHelper.inc
SearchClass.inc
SecurityClass.inc
api/dublin_core.inc
api/fedora_collection.inc
api/fedora_export.inc
api/fedora_item.inc
api/fedora_utils.inc
api/rels-ext.inc
api/tagging.inc
fedora_repository.module
formClass.inc
form_elements/css/copyright.css
form_elements/css/filechooser.css
form_elements/css/list.css
form_elements/css/people.css
form_elements/css/sticky.css
form_elements/css/ui-lightness/jquery-ui-1.8.4.custom.css
form_elements/includes/autocomplete.inc
form_elements/includes/creative_commons.inc
form_elements/includes/filechooser.inc
form_elements/includes/people.inc
form_elements/islandora_form_elements.module
form_elements/js/copyright.js
form_elements/js/filechooser.js
form_elements/js/jcarousellite_1.0.1.js
form_elements/js/jquery.breakly-1.0.js
form_elements/js/jquery.easing.1.1.js
form_elements/js/jquery.loadImages.1.0.1.js
form_elements/js/jquery.loadImages.1.0.1.min.js
form_elements/js/jquery.mousewheel.min.js
form_elements/js/jquery.tag.editor-min.js
form_elements/js/jquery.ui.core.js
form_elements/js/jquery.ui.datepicker.js
form_elements/js/jquery.ui.widget.js
form_elements/js/otherselect.js
form_elements/js/people_ahah.js
form_elements/xml/gacs.xml
form_elements/xml/languages.xml
plugins/CollectionFormBuilder.inc
plugins/CreateCollection.inc
plugins/DemoFormBuilder.inc
plugins/DocumentConverter.inc
plugins/Exiftool.inc
plugins/Ffmpeg.inc
plugins/Flv.inc
plugins/FlvFormBuilder.inc
plugins/FormBuilder.inc
plugins/ImageManipulation.inc
plugins/ModsFormBuilder.inc
plugins/PersonalCollectionClass.inc
plugins/QtFormBuilder.php
plugins/Refworks.inc
plugins/ShowDemoStreamsInFieldSets.inc
plugins/ShowStreamsInFieldSets.inc
plugins/fedoraObject.inc
plugins/herbarium.inc
plugins/map_viewer.inc
plugins/qt_viewer.inc
plugins/slide_viewer.inc
plugins/tagging_form.inc
|
13 years ago |
|
Ben Woodhead
|
b9ca342973
|
ISLANDORA-260: Merged in fix
Merge ISLANDORA-260 into 6.x
Conflicts:
fedora_repository.module
|
13 years ago |
|
Ben Woodhead
|
712be926cf
|
Merge pull request #6 from bwoodhead/6.x
Merged in ISLANDORA-132
|
13 years ago |
|
Ben Woodhead
|
93ccb6fe57
|
Merge branch 'ISLANDORA-132' into 6.x
|
13 years ago |
|
Ben Woodhead
|
6d7e84f6d1
|
Merge pull request #5 from bwoodhead/6.x
6.x Inline Documentation Update
|
14 years ago |
|
Ben Woodhead
|
2b37bf090b
|
Merge branch '6.x' of github.com:Islandora/islandora into 6.x
|
14 years ago |
