phil
e6e1086e63
Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x
12 years ago
Jordan Dukart
30bc6f6e0e
Merge pull request #262 from ajstanley/7.x
...
Forced re-ingest for solution packs page.
12 years ago
Adam
ca5eb662e1
Merge pull request #264 from jordandukart/7.x
...
Flush the caches before we output so we don't overrun PHP memory limit.
12 years ago
Jordan Dukart
d6d6155a61
Flush the caches before we output so we don't overrun PHP memory limit.
12 years ago
Phil Soga
4b182ff16c
fixing thev authtokens test
12 years ago
Phil Soga
0696ddfe39
added in files[] = tests/islandora_authtokens.test
12 years ago
Phil Soga
dfe3f8598e
Revert "removing .gitignore"
...
This reverts commit a16257e423
.
12 years ago
Phil Soga
a16257e423
removing .gitignore
12 years ago
Alan Stanley
bbf813848e
fixed forced reingest
12 years ago
Phil Soga
755981bd4d
forgot another conflict
12 years ago
Phil Soga
64a317f5e9
edit conflicts
...
edited conflicts in the islandora.module and islandora.info files
12 years ago
Daniel Lamb
e3ca25cd33
Merge pull request #260 from nigelgbanks/7.x-ingest-index-problem
...
Issue: 1013 MARCXml module ingest hook conflicts with Newspaper/Book pag...
12 years ago
Nigel Banks
355367ae15
Issue: 1013 MARCXml module ingest hook conflicts with Newspaper/Book page ingest
...
Clean up the ingest form code, and make it easier to interact with.
12 years ago
ajstanley
192cf2159b
Merge pull request #259 from ajstanley/7.x
...
Added method to retrieve basic ds_comp info
12 years ago
Alan Stanley
902742f10a
Added method to retreive basic ds_comp info
12 years ago
Jonathan Green
c5758322eb
Merge pull request #258 from nigelgbanks/7.x-filename-conventions
...
7.x filename conventions and coding standards compliance
12 years ago
Nigel Banks
1e594543c9
Drupal coding standards.
12 years ago
Nigel Banks
e18a7498a6
Filename conventions.
12 years ago
Jonathan Green
f898f20f59
Merge pull request #257 from nigelgbanks/7.x-system-settings-form-default-value
...
Added function to simplify system settings forms that utilize AJAX.
12 years ago
Nigel Banks
36aec2a94c
Added function to simplify system settings forms that utilize AJAX.
12 years ago
phil
9eb5507896
Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x
12 years ago
Jonathan Green
6930c09b2d
Merge pull request #255 from willtp87/7.x
...
some datastreams were downloading into
12 years ago
Jonathan Green
8570de3f3b
Merge pull request #256 from nigelgbanks/7.x-default-test-config
...
Updated for changed config value.
12 years ago
Nigel Banks
23c42cb3aa
Updated for changed config value.
12 years ago
William Panting
67308b17d7
some datastreams were downloading into
...
files without extensions
12 years ago
Jonathan Green
18577d628c
Merge pull request #254 from nigelgbanks/7.x-filename-conventions
...
7.x filename conventions
12 years ago
phil
604bf37404
fixed conflicts
12 years ago
Phil Soga
17aa18157f
made changes to manage permissions from codereview
...
ticket 853
12 years ago
Nigel Banks
01f619b38c
Removing unused image.
12 years ago
Nigel Banks
aa7b52f2ac
File naming conventions.
12 years ago
Phil Soga
833286e8b8
Manage Permissions tab changes
12 years ago
Jonathan Green
965932fe49
Merge pull request #252 from nigelgbanks/7.x-set-title-for-view-objects
...
Automatically set the title to the object label when viewing objects.
12 years ago
Nigel Banks
f8a98eb31e
Automatically set the title to the object label when viewing objects.
12 years ago
Jonathan Green
dc22e80964
Merge pull request #251 from nigelgbanks/7.x-dir-message
...
Added a helper function for displaying if the given directory exists.
12 years ago
Nigel Banks
370532007a
Added a helper function for displaying if the given directory exists.
...
This can be used in admin setting forms and else where to indicate if the given
directory exists.
12 years ago
Jonathan Green
7996f439fa
Merge pull request #250 from nigelgbanks/7.x-exec-message
...
Added a helper function for displaying if the given executable is access...
12 years ago
Nigel Banks
f4885ae868
Added a helper function for displaying if the given executable is accessible.
...
This can be used in admin setting forms and else where to indicate if the given
executable is availible, and if its version requirements are met.
12 years ago
Jonathan Green
196b46b0cb
Merge pull request #248 from adam-vessey/7.x
...
Basic Entity support.
12 years ago
Jonathan Green
ba0eb5fa0a
Merge pull request #249 from nigelgbanks/7.x-more-policies
...
Added two more policies, not necessarily required for all users.
12 years ago
Adam Vessey
d583e9f870
Basic Entity support.
...
Expose a few fields, which can be substituted in for Tokens
(in Rules).
12 years ago
Nigel Banks
3015117fbb
Added two more policies, not necessarily required for all users.
...
They both allow access to API-M functions to everyone including
anonymous users.
12 years ago
Jonathan Green
e5ae847022
Merge pull request #243 from nigelgbanks/7.x-tuque-wrapper
...
Created hooks and implemented them as part of the tuque wrapper classes.
12 years ago
Nigel Banks
6ab6b11a3a
Merge branch '7.x' into 7.x-tuque-wrapper
...
Conflicts:
islandora.info
12 years ago
ajstanley
6d7cf7e790
Merge pull request #247 from ajstanley/7.x
...
Changed case to conform to standard
12 years ago
Alan Stanley
a9abf13eaf
Changed case ot conform to standard
12 years ago
Alan Stanley
65772a1c41
made viewer callback potentially aware of fedora object being displayed
12 years ago
Jonathan Green
e3404b0e2a
Merge pull request #246 from nigelgbanks/7.x-filename-conventions
...
Follow File Name Conventions
12 years ago
Nigel Banks
eba34eabbb
Follow File Name Conventions
...
File naming conventions now state that all PHP files (except templates) should
be lower-case and use underscores to separate words in a filename.
includes/IslandoraTuque.inc, and includes/IslandoraTuqueWrapper.inc are not
included in this commit as there is another pull request that corrects their
names in place, and we would like to avoid merge conflicts.
12 years ago
Nigel Banks
23f57b21f9
Removing unused ingest registry hook.
12 years ago
Nigel Banks
c2be7aede8
Removing Ignored file.
12 years ago