rwincewicz
|
97ddd63b41
|
Fixed merge conflict
|
12 years ago |
|
Jonathan Green
|
a99cc68f70
|
Merge pull request #120 from krisbulman/7.x
template fixes and default collection list view
|
12 years ago |
|
rwincewicz
|
87e0272f17
|
Changed collection management so that every content model can be removed from the collection policy
|
12 years ago |
|
krisbulman
|
8d32b34267
|
Merge remote-tracking branch 'upstream/7.x' into 7.x
|
12 years ago |
|
krisbulman
|
9873ebe120
|
updated templates for default list view when viewing collections, fixed problem with linking to full image if full image does not exist
|
12 years ago |
 Paul Pound
|
586843910a
|
removed check for islandora content model forms in collection module
|
12 years ago |
|
Paul Pound
|
c8953af1ec
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
e0fe8c1701
|
moved templates to theme directory and preprocess functions to theme.inc
|
12 years ago |
|
jonathangreen
|
a2d2121ffb
|
Updated islandora admin form.
|
12 years ago |
|
jonathangreen
|
d0d8104aea
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Conflicts:
islandora.module
|
12 years ago |
|
Mitchell MacKenzie
|
9b2fee62f4
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Mitchell MacKenzie
|
22306a5760
|
Use ingest registry menu path
|
12 years ago |
|
jonathangreen
|
ae151e6bd0
|
Updated some things.
|
12 years ago |
|
Paul Pound
|
a07117b248
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
e0f0ffe8e6
|
updated pager function to limit pages to 10 in collection module
|
12 years ago |
|
rwincewicz
|
31941f1d31
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
rwincewicz
|
362a397410
|
Further code cleanup and some documentation
|
12 years ago |
|
Paul Pound
|
20f407bca5
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
dbadd0ce5a
|
added a wrapper template for collection objects
|
12 years ago |
|
rwincewicz
|
8a3b1a74ea
|
Removed ISLANDORACM from basic image content model
|
12 years ago |
|
rwincewicz
|
822e945ff7
|
Cleanup in collection manager and addition of hook to add in new collection management functions
|
12 years ago |
|
rwincewicz
|
cc6f5a956a
|
Fixed collection policy for create child collection function
|
12 years ago |
|
rwincewicz
|
7d59379a9d
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
jonathangreen
|
1b304fac97
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
jonathangreen
|
75873d3ec1
|
Updated ingest function.
|
12 years ago |
|
rwincewicz
|
1c134ef38e
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
030cc80c2b
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
f34afe346f
|
added check to make sure an object has a cmodel iin basic image
|
12 years ago |
|
rwincewicz
|
52b45beba9
|
Updated islandora.module
|
12 years ago |
|
rwincewicz
|
97f2062c6b
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
rwincewicz
|
8c4ca4fb1e
|
Added collection policy creation to create child collection
|
12 years ago |
|
jonathangreen
|
0118ad6208
|
Sundry updates
- Added a confirmation to purge.
- Fixed collection links
- Provided link to full size
|
12 years ago |
|
Paul Pound
|
fe43733d5f
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Paul Pound
|
f37d35e3b6
|
added ingest link to connection cmodel also updated image cmodel so derivatives get created
|
12 years ago |
|
rwincewicz
|
ebe34c06e3
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Mitchell MacKenzie
|
125cde750a
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
Mitchell MacKenzie
|
85f7c5dc07
|
DS edit link
|
12 years ago |
|
rwincewicz
|
5c3cc3411e
|
Added policy control to create child collection
|
12 years ago |
|
Paul Pound
|
13825faf5f
|
added ingest to basic image types using a default mods form
|
12 years ago |
|
jonathangreen
|
5499cfd659
|
Getting rid of datastream not found messages.
|
12 years ago |
|
jonathangreen
|
b600074575
|
Fixed datastream error handling
|
12 years ago |
|
jonathangreen
|
2cd4ca5eeb
|
Updated collection manager.
|
12 years ago |
|
jonathangreen
|
ddc5ad96db
|
Breadcrumbs
|
12 years ago |
|
jonathangreen
|
a90080cb59
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
jonathangreen
|
bea8e8063b
|
Updated datastream a little.
|
12 years ago |
|
jonathangreen
|
93cb63b959
|
datastream
|
12 years ago |
|
jonathangreen
|
b48aef3162
|
Autocomplete
|
12 years ago |
|
Mitchell MacKenzie
|
97af81022d
|
Fix RELS_EXT
|
12 years ago |
|
rwincewicz
|
aa0581cee7
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
12 years ago |
|
rwincewicz
|
09d79a2697
|
Change content models in collection is now working
|
12 years ago |
