Skip to content

Commit

Permalink
Content modeling overhaul (Islandora#86)
Browse files Browse the repository at this point in the history
* Derivatives

* Working through testing

* Coding standards.  Responding to @whikloj's review

* Patching up existing tests

* Baaad merge

* No longer requiring Content-Disposition for media updates since we're updating the file in place.

* Went a bit deeper than I thought.  Small refactor on MediaSourceServcie

* Fiiinnnnaaaalllllllllyyyyyyyy

* Shuffling things around for islandora_image tests

* Altering view and form modes using context

* Coding standards

* Features

* updating feature

* updating feature

* Derivatives and RDF

* Terms flushing to Fedora, split out openseadragon functionality

* Updating dependencies

* Touching up after testing a fresh deploy

* More config updates

* Updating features

* s/field_memberof/field_member_of

* Coding standards and tests

* take that phpcpd

* coding standards

* Adding pcdm#fileOf to the rdf mappings for media.

* Getting rid of swap file

* Updated README.  Shuffled config round into two features, one for core and one as a demo

* Coder

* too good to be true

* maybe this?

* Cleaning up cruft and no longer removing teaser mode when uninstalling the demo feature

* Missed the services yml

* Re-export after testing

* mimetypo

* Re-re-re-re-re-exported

* Changing to dc on terms rdf mapping so title shows up in Fedora
  • Loading branch information
dannylamb authored and seth-shaw-unlv committed Jun 4, 2018
1 parent 6e4815e commit a1987ae
Show file tree
Hide file tree
Showing 211 changed files with 9,585 additions and 2,393 deletions.
Binary file added .islandora.services.yml.swp
Binary file not shown.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ install:
- $SCRIPT_DIR/travis_setup_drupal.sh
- git -C "$TRAVIS_BUILD_DIR" checkout -b travis-testing
- cd $DRUPAL_DIR;
- php -dmemory_limit=-1 $COMPOSER_PATH config repositories.local path "$TRAVIS_BUILD_DIR"
- php -dmemory_limit=-1 $COMPOSER_PATH require "islandora/islandora:dev-travis-testing as dev-8.x-1.x" --prefer-source --update-with-dependencies
- COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 $COMPOSER_PATH config repositories.local path "$TRAVIS_BUILD_DIR"
- COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 $COMPOSER_PATH require "islandora/islandora:dev-travis-testing as dev-8.x-1.x" --prefer-source --update-with-dependencies
- cd web; drush --uri=127.0.0.1:8282 en -y islandora

script:
Expand Down
205 changes: 178 additions & 27 deletions README.md

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@
}
],
"require": {
"drupal/inline_entity_form": "^1.0@beta",
"drupal/context": "^4.0",
"drupal/search_api": "^1.0@beta",
"drupal/search_api": "1.x-dev",
"islandora/jsonld": "dev-8.x-1.x",
"stomp-php/stomp-php": "4.*",
"drupal/jwt": "1.0.0-alpha6",
"drupal/media_entity_image": "^1.2",
"drupal/filehash": "^1.1"
"drupal/filehash": "^1.1",
"drupal/prepopulate" : "^2.0@alpha",
"drupal/eva" : "^1.3",
"drupal/features" : "^3.7",
"drupal/migrate_plus" : "4.0-beta3",
"drupal/migrate_tools" : "4.0-beta3",
"drupal/migrate_source_csv" : "^2.1",
"drupal/permissions_by_term" : "^1.51"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
Expand Down
41 changes: 0 additions & 41 deletions config/install/core.entity_form_display.media.tn.default.yml

This file was deleted.

36 changes: 0 additions & 36 deletions config/install/core.entity_form_display.media.tn.inline.yml

This file was deleted.

13 changes: 0 additions & 13 deletions config/install/core.entity_form_mode.media.inline.yml

This file was deleted.

37 changes: 0 additions & 37 deletions config/install/core.entity_view_display.media.tn.content.yml

This file was deleted.

76 changes: 0 additions & 76 deletions config/install/core.entity_view_display.media.tn.default.yml

This file was deleted.

14 changes: 0 additions & 14 deletions config/install/core.entity_view_mode.media.content.yml

This file was deleted.

22 changes: 0 additions & 22 deletions config/install/field.field.media.tn.field_mimetype.yml

This file was deleted.

5 changes: 0 additions & 5 deletions config/install/islandora.settings.yml

This file was deleted.

22 changes: 0 additions & 22 deletions config/install/media_entity.bundle.tn.yml

This file was deleted.

13 changes: 13 additions & 0 deletions config/install/system.action.delete_media.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
langcode: en
status: true
dependencies:
enforced:
module:
- islandora
module:
- media
id: delete_media
label: 'Delete media'
type: media
plugin: delete_media
configuration: { }
13 changes: 13 additions & 0 deletions config/install/system.action.delete_media_and_file.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
langcode: en
status: true
dependencies:
enforced:
module:
- islandora
module:
- media
id: delete_media_and_file
label: 'Delete media and file(s)'
type: media
plugin: delete_media_and_file
configuration: { }
Loading

0 comments on commit a1987ae

Please sign in to comment.