krisbulman
|
fd79918344
|
Merge remote-tracking branch 'upstream/7.x' into 7.x
|
13 years ago |
|
krisbulman
|
2f1251bf83
|
CSS cleanup, markup change for list views
|
13 years ago |
|
jonathangreen
|
6cd168cee5
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
00e1cc8a3d
|
another collection fix
|
13 years ago |
 Paul Pound
|
f19aa53095
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
03b22bf39c
|
updated islandora.api.inc documentation
|
13 years ago |
|
jonathangreen
|
257addf6cf
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Conflicts:
includes/utilities.inc
islandora_basic_collection/includes/child_collection.inc
islandora_basic_collection/includes/manage_policies.inc
|
13 years ago |
|
jonathangreen
|
ea91ee6dd3
|
Fix my mistakes in collection manager.
|
13 years ago |
|
Danny Joris
|
fddb603d30
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Danny Joris
|
c7a0e1319b
|
created helper function to connect to Fedora
|
13 years ago |
|
rwincewicz
|
c3b3ee1530
|
Fixed restConnection line in manage collection policies
|
13 years ago |
|
rwincewicz
|
649a114fcf
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
3dd37810c1
|
Fixed issue with child collections not being created
|
13 years ago |
|
Jonathan Green
|
1f6d9801cc
|
Merge pull request #122 from DannyJoris/7.x
7.x
|
13 years ago |
|
Paul Pound
|
ff90f4806a
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Danny Joris
|
b04a0a0aad
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Danny Joris
|
633391b9e4
|
added configure paths to .info files
|
13 years ago |
|
Paul Pound
|
1e90c5caec
|
fixed conflict in islandora.api
|
13 years ago |
|
jonathangreen
|
2867e7e575
|
Updated access
|
13 years ago |
|
Paul Pound
|
74bcd0664c
|
updated islandora api documentation
|
13 years ago |
|
jonathangreen
|
6058087c0b
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
jonathangreen
|
ede9e47337
|
Major change to object loading.
|
13 years ago |
|
rwincewicz
|
5a7f421732
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
rwincewicz
|
788fa329ca
|
Added collection policy checking and cleaned up code
|
13 years ago |
|
jonathangreen
|
3f2b0c9d3a
|
File cleanup and moving around
|
13 years ago |
|
jonathangreen
|
1d7f26c8d9
|
Changed how we get objects.
|
13 years ago |
|
jonathangreen
|
29d02c2d13
|
Some updates to collections.
|
13 years ago |
|
jonathangreen
|
0b5babab56
|
Updated collections.
|
13 years ago |
|
Paul Pound
|
479c14d6a5
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
f5cd1015ec
|
added view switching to collection templates
|
13 years ago |
|
jonathangreen
|
d58ff7a4ad
|
Fixed some problems with parsing in DC
|
13 years ago |
|
jonathangreen
|
5f5c8c281e
|
Updated access permissions
|
13 years ago |
|
Paul Pound
|
f6f79fb95c
|
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
|
13 years ago |
|
Paul Pound
|
ad875e69a3
|
updated broken thumbnail url
|
13 years ago |
|
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 |
