jonathangreen
|
daf8e6a5bb
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
f9a5df6e22
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Conflicts:
islandora_basic_collection/includes/collection_management.inc
|
13 years ago |
 Paul Pound
|
40a7f806fe
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
fa9f1b60dc
|
all files created as part of creating derivative should now be deleted and renamed image process inc
|
13 years ago |
|
Jonathan Green
|
6cba6f995b
|
Merge pull request #121 from krisbulman/7.x
template cleanup issets issets issets
|
13 years ago |
|
krisbulman
|
d55c01c212
|
template cleanup issets issets issets
|
13 years ago |
|
jonathangreen
|
63300908af
|
Updated the admin screen more.
|
13 years ago |
|
rwincewicz
|
faaf0e8627
|
Added check for creating child collections to ensure the collectionCModel is present in the collection policy
|
13 years ago |
|
rwincewicz
|
4893daffc9
|
Removed debug statement
|
13 years ago |
|
rwincewicz
|
25167c6cc9
|
Removed duplicate files that had been renamed
|
13 years ago |
|
rwincewicz
|
8da0c685b3
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
78f38ea6a8
|
Changed names of includes files for collection management so they're less ambiguous
|
13 years ago |
|
jonathangreen
|
a91b5e6a85
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
34d27d4d5e
|
Updated Admin
|
13 years ago |
|
Paul Pound
|
172ab64e89
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
d6e01d037e
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
539e99bb71
|
added init functions to load admin css for each module
|
13 years ago |
|
rwincewicz
|
97ddd63b41
|
Fixed merge conflict
|
13 years ago |
|
Jonathan Green
|
a99cc68f70
|
Merge pull request #120 from krisbulman/7.x
template fixes and default collection list view
|
13 years ago |
|
rwincewicz
|
87e0272f17
|
Changed collection management so that every content model can be removed from the collection policy
|
13 years ago |
|
krisbulman
|
8d32b34267
|
Merge remote-tracking branch 'upstream/7.x' into 7.x
|
13 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
|
13 years ago |
|
Paul Pound
|
586843910a
|
removed check for islandora content model forms in collection module
|
13 years ago |
|
Paul Pound
|
c8953af1ec
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
e0fe8c1701
|
moved templates to theme directory and preprocess functions to theme.inc
|
13 years ago |
|
jonathangreen
|
a2d2121ffb
|
Updated islandora admin form.
|
13 years ago |
|
jonathangreen
|
d0d8104aea
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Conflicts:
islandora.module
|
13 years ago |
|
Mitchell MacKenzie
|
9b2fee62f4
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Mitchell MacKenzie
|
22306a5760
|
Use ingest registry menu path
|
13 years ago |
|
jonathangreen
|
ae151e6bd0
|
Updated some things.
|
13 years ago |
|
Paul Pound
|
a07117b248
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
e0f0ffe8e6
|
updated pager function to limit pages to 10 in collection module
|
13 years ago |
|
rwincewicz
|
31941f1d31
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
362a397410
|
Further code cleanup and some documentation
|
13 years ago |
|
Paul Pound
|
20f407bca5
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
dbadd0ce5a
|
added a wrapper template for collection objects
|
13 years ago |
|
rwincewicz
|
8a3b1a74ea
|
Removed ISLANDORACM from basic image content model
|
13 years ago |
|
rwincewicz
|
822e945ff7
|
Cleanup in collection manager and addition of hook to add in new collection management functions
|
13 years ago |
|
rwincewicz
|
cc6f5a956a
|
Fixed collection policy for create child collection function
|
13 years ago |
|
rwincewicz
|
7d59379a9d
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
1b304fac97
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
75873d3ec1
|
Updated ingest function.
|
13 years ago |
|
rwincewicz
|
1c134ef38e
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
030cc80c2b
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
f34afe346f
|
added check to make sure an object has a cmodel iin basic image
|
13 years ago |
|
rwincewicz
|
52b45beba9
|
Updated islandora.module
|
13 years ago |
|
rwincewicz
|
97f2062c6b
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
8c4ca4fb1e
|
Added collection policy creation to create child collection
|
13 years ago |
|
jonathangreen
|
0118ad6208
|
Sundry updates
- Added a confirmation to purge.
- Fixed collection links
- Provided link to full size
|
13 years ago |
|
Paul Pound
|
fe43733d5f
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
