Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Media versioning #96

Merged
merged 28 commits into from
Sep 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d46ce38
add separate routes in milliner for versioning nodes and media
elizoller Feb 21, 2020
620b5e4
separate createVersion for node and Media as much as possible, create…
elizoller Feb 21, 2020
e7338ce
remove excess log statements
elizoller Feb 21, 2020
6a65e3c
code cleanup
elizoller Feb 21, 2020
efd2203
fix node versioning - no gemini from the controller so made a helper…
elizoller Feb 21, 2020
419d1f3
adding and updating tests - still some of these fail
elizoller Feb 21, 2020
a5b717d
Bump symfony/http-foundation from 3.4.30 to 3.4.36 in /Hypercube (#92)
dependabot[bot] Mar 26, 2020
3909fd6
Bump symfony/http-foundation from 3.4.30 to 3.4.36 in /Milliner (#94)
dependabot[bot] Mar 26, 2020
cfaf024
Bump symfony/http-foundation from 3.4.30 to 3.4.36 in /Recast (#91)
dependabot[bot] Mar 26, 2020
8f54843
Bump symfony/http-foundation from 3.4.30 to 3.4.38 in /Gemini (#101)
dependabot[bot] Mar 26, 2020
f870cb1
Bump symfony/http-foundation from 3.4.30 to 3.4.38 in /Homarus (#98)
dependabot[bot] Mar 26, 2020
4252083
Update CONTRIBUTING.md (#104)
manez Aug 25, 2020
37b95bb
Update .travis.yml (#105)
dannylamb Aug 27, 2020
e93f569
Master -> Main Rename (#106)
dannylamb Aug 31, 2020
d694430
removing unnecessary logging
elizoller Sep 9, 2020
31367b2
update Milliner composer dependencies
elizoller Sep 9, 2020
6abec98
add separate routes in milliner for versioning nodes and media
elizoller Feb 21, 2020
fd24812
separate createVersion for node and Media as much as possible, create…
elizoller Feb 21, 2020
d11815f
remove excess log statements
elizoller Feb 21, 2020
7e23fbd
code cleanup
elizoller Feb 21, 2020
5737cc2
fix node versioning - no gemini from the controller so made a helper…
elizoller Feb 21, 2020
352043b
adding and updating tests - still some of these fail
elizoller Feb 21, 2020
9b4c607
removing unnecessary logging
elizoller Sep 9, 2020
257728c
update Milliner composer dependencies
elizoller Sep 9, 2020
54b1170
Merge branch 'media_versioning' of https://github.com/asulibraries/cr…
elizoller Sep 9, 2020
40b4e34
fix erroring test
elizoller Sep 9, 2020
853ecec
fix spacing in test
elizoller Sep 9, 2020
291ebe0
update tests - copy paste from @dannylamb
elizoller Sep 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ matrix:

branches:
only:
- /master/
- /main/
- /^dev/

before_install:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ If you are reading this document then you are interested in contributing to Isla

## Workflows

The group meets each Wednesday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora/documentation/wiki#islandora-8-tech-calls). Anybody is welcome to join the calls, and add items to the agenda.
The Islandora 8 Tech Call meets each Wednesday at 1:00 PM Eastern, and the Islandora 8 User Call meets every second Thursday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora/documentation/wiki#islandora-8-tech-calls). Anybody is welcome to join the calls, and add items to the agenda.

### Use cases

If you would like to submit a use case to the Islandora 8 project, please submit an issue [here](https://github.com/Islandora/documentation/issues/new) using the [Use Case template](https://github.com/Islandora/documentation/wiki/Use-Case-template), prepending "Use Case:" to the title of the issue.

### Documentation

You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/master/docs).
You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/main/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/main/docs).

### Request a new feature

Expand Down Expand Up @@ -58,9 +58,9 @@ Contributions to the Islandora codebase should be sent as GitHub pull requests.

Take a look at [Creating a pull request](https://help.github.com/articles/creating-a-pull-request). In a nutshell you need to:

1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off master, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off main, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
2. Commit any changes to your fork.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/main/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.

You may want to read [Syncing a fork](https://help.github.com/articles/syncing-a-fork) for instructions on how to keep your fork up to date with the latest changes of the upstream (official) repository.

Expand Down
2 changes: 1 addition & 1 deletion Gemini/cfg/config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ syn:
enable: false
# Path to the syn config file for authentication.
# example can be found here:
# https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example.xml
# https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example.xml
config: ../syn-settings.xml
87 changes: 45 additions & 42 deletions Gemini/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Homarus/cfg/config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ syn:
enable: True
# Path to the syn config file for authentication.
# example can be found here:
# https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example$
# https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example$
config: ../syn-settings.xml


Expand Down
Loading