Ben Woodhead
|
31bd1e22ab
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
Conflicts:
api/fedora_item.inc
|
13 years ago |
|
Ben Woodhead
|
5c3d898954
|
server changes
|
13 years ago |
|
Alan Stanley
|
4945479b9e
|
Added file validity check to function add_datastream_from_file
|
13 years ago |
|
Ben Woodhead
|
a5fc8d1548
|
Merge pull request #27 from willtp87/6.x
ISLANDORA-336 I removed the unnecesary object creation.
|
13 years ago |
|
William Panting
|
5912f5141e
|
ISLANDORA-336 I removed the unnecesary object creation.
|
13 years ago |
|
Ben Woodhead
|
0daf0dcddf
|
Merge pull request #26 from bwoodhead/6.x
6.x
|
13 years ago |
|
Ben Woodhead
|
c0e183fe16
|
Removed the fedora search block
|
13 years ago |
|
Ben Woodhead
|
07399ce314
|
removed edit tag datastream
|
13 years ago |
|
Ben Woodhead
|
6023993939
|
Merge pull request #25 from bwoodhead/6.x
Fixed issues with add collection
|
13 years ago |
|
Ben Woodhead
|
4ec1743465
|
Fixed child collection
|
13 years ago |
|
Ben Woodhead
|
6b8ba5fbbd
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
5d5cd0024e
|
added namespances
|
13 years ago |
|
Ben Woodhead
|
e8187161c1
|
Merge pull request #24 from bwoodhead/6.x
Preparing for a release
|
13 years ago |
|
Ben Woodhead
|
22ed8b376b
|
Visiblity Problem
|
13 years ago |
|
Ben Woodhead
|
592e8a689b
|
Fixed naming and version
|
13 years ago |
|
Ben Woodhead
|
df2d837191
|
Merge branch '6.x' of github.com:Islandora/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
cf58cec0bf
|
Alans changes
|
13 years ago |
|
Ben Woodhead
|
da46bfb18b
|
Set the version to 11.2.beta1
|
13 years ago |
|
Ben Woodhead
|
ca2df534ca
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
4efd40c507
|
another grammar fix
|
13 years ago |
|
Ben Woodhead
|
23c2f95b8b
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
d0ebf93be3
|
more reordering
|
13 years ago |
|
Ben Woodhead
|
8a052f5951
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
0625e37cd0
|
changed weights
|
13 years ago |
|
Ben Woodhead
|
f192150f1b
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
0f03463b96
|
removed an root content collection model
|
13 years ago |
|
Ben Woodhead
|
a5d0a57b90
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
d618a0c727
|
changed the order by adding weights
|
13 years ago |
|
Ben Woodhead
|
5bf687759e
|
changed the ordering
|
13 years ago |
|
Ben Woodhead
|
4eadf53a30
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
a46a98bd44
|
fixed descriptions
|
13 years ago |
|
Ben Woodhead
|
a36a666a4e
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
bf6c5806a0
|
Removed extra content models
|
13 years ago |
|
Ben Woodhead
|
daab5f01b0
|
changed from islandora:top to islandora:root
|
13 years ago |
|
Ben Woodhead
|
fda88842c0
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
f153973795
|
more of alans changes
|
13 years ago |
|
Ben Woodhead
|
7f7b7b15fc
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
bdf7c638ae
|
fixed typo
|
13 years ago |
|
Ben Woodhead
|
bad6388fa0
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
393c37281d
|
cleanup form
|
13 years ago |
|
Ben Woodhead
|
11e77f3218
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
2c3d2379aa
|
Changed to islandora:root and removed extra cmodel stuff
|
13 years ago |
|
Ben Woodhead
|
7ca627792e
|
Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x
|
13 years ago |
|
Ben Woodhead
|
29db7ff3b4
|
fixed a version problem
|
13 years ago |
|
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 |
