Master -> Main Rename #1596

dannylamb · 2020-08-28T14:12:42Z

Part of #1595

* Render the example helpful tip properly. * Fix note syntax, again.

whikloj · 2020-09-01T13:35:00Z

CONTRIBUTING.md

@@ -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 mainor for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.


script failure master, or -> mainor

whikloj · 2020-09-01T13:35:43Z

CONTRIBUTING.md

 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/maingithub/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.


Script failure /blob/master/.github -> /blob/maingithub

whikloj · 2020-09-01T13:42:01Z

docs/technical-documentation/flysystem.md

@@ -14,13 +14,13 @@ The Drupal Flysystem module uses [flysystem stream wrappers](https://github.com/

 ### The Plugin and Adapter

-Islandora 8 implements a [Flysystem adapter](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Adapter/FedoraAdapter.php) and a [Drupal Flysystem plugin](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Fedora.php). The Flysystem adapter acts as an intermediary between the Flysystem filesystem API and Fedora, translating requests and responses between them. The adapter interacts with Fedora using an instance of the [Chullo Fedora API](/Islandora-CLAW/chullo/blob/master/src/IFedoraApi.php) it receives from the Drupal Flysystem plugin. The Drupal Flysystem plugin's main responsibility is to instantiate the Chullo Fedora API object with the proper authentication and pass it to the Flysystem adapter. To authenticate with Fedora the plugin adds a [handler](http://docs.guzzlephp.org/en/stable/handlers-and-middleware.html) to the Chullo's [Guzzle](http://docs.guzzlephp.org) client which adds a [JWT](https://jwt.io/) authentication header to each request. <!-- After https://github.com/Islandora-CLAW/islandora/pull/119 is merged:  To authenticate with Fedora the plugin adds a handler to the Chullo's Guzzle client with a copy of the site's JWT authentication object so that each Fedora request can generate its own Bearer token. -->
+Islandora 8 implements a [Flysystem adapter](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Adapter/FedoraAdapter.php) and a [Drupal Flysystem plugin](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Fedora.php). The Flysystem adapter acts as an intermediary between the Flysystem filesystem API and Fedora, translating requests and responses between them. The adapter interacts with Fedora using an instance of the [Chullo Fedora API](/Islandora-CLAW/chullo/blob/main/src/IFedoraApi.php) it receives from the Drupal Flysystem plugin. The Drupal Flysystem plugin's main responsibility is to instantiate the Chullo Fedora API object with the proper authentication and pass it to the Flysystem adapter. To authenticate with Fedora the plugin adds a [handler](http://docs.guzzlephp.org/en/stable/handlers-and-middleware.html) to the Chullo's [Guzzle](http://docs.guzzlephp.org) client which adds a [JWT](https://jwt.io/) authentication header to each request. <!-- After https://github.com/Islandora-CLAW/islandora/pull/119 is merged:  To authenticate with Fedora the plugin adds a handler to the Chullo's Guzzle client with a copy of the site's JWT authentication object so that each Fedora request can generate its own Bearer token. -->


This looks to have been there before but the URL for the Chullo Fedora API is missing https:/ and so the link is broken.

Also the commented out text at the bottom states

After #119 is merged:

It is merged, so this can (I assume) by revealed.

Also there were some CLAWs in here.

Suggested change

Islandora 8 implements a [Flysystem adapter](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Adapter/FedoraAdapter.php) and a [Drupal Flysystem plugin](https://github.com/Islandora-CLAW/islandora/blob/8.x-1.x/src/Flysystem/Fedora.php). The Flysystem adapter acts as an intermediary between the Flysystem filesystem API and Fedora, translating requests and responses between them. The adapter interacts with Fedora using an instance of the [Chullo Fedora API](/Islandora-CLAW/chullo/blob/main/src/IFedoraApi.php) it receives from the Drupal Flysystem plugin. The Drupal Flysystem plugin's main responsibility is to instantiate the Chullo Fedora API object with the proper authentication and pass it to the Flysystem adapter. To authenticate with Fedora the plugin adds a [handler](http://docs.guzzlephp.org/en/stable/handlers-and-middleware.html) to the Chullo's [Guzzle](http://docs.guzzlephp.org) client which adds a [JWT](https://jwt.io/) authentication header to each request. 

Islandora 8 implements a [Flysystem adapter](https://github.com/Islandora/islandora/blob/8.x-1.x/src/Flysystem/Adapter/FedoraAdapter.php) and a [Drupal Flysystem plugin](https://github.com/Islandora/islandora/blob/8.x-1.x/src/Flysystem/Fedora.php). The Flysystem adapter acts as an intermediary between the Flysystem filesystem API and Fedora, translating requests and responses between them. The adapter interacts with Fedora using an instance of the [Chullo Fedora API](https://github.com/Islandora/chullo/blob/main/src/IFedoraApi.php) it receives from the Drupal Flysystem plugin. The Drupal Flysystem plugin's main responsibility is to instantiate the Chullo Fedora API object with the proper authentication and pass it to the Flysystem adapter. To authenticate with Fedora the plugin adds a [handler](http://docs.guzzlephp.org/en/stable/handlers-and-middleware.html) to the Chullo's [Guzzle](http://docs.guzzlephp.org) client which adds a [JWT](https://jwt.io/) authentication header to each request. To authenticate with Fedora the plugin adds a handler to the Chullo's Guzzle client with a copy of the site's JWT authentication object so that each Fedora request can generate its own Bearer token.

requiring the full de-clawing of the documentation right now would also require re-writing and also updating a large number of formerly-useful pages... that's an ongoing process, can we do the master-main rename first?

I have no problem not doing a full de-clawing, I just noted the changes on this line as the PR already touched it.

phew. ty. Yeah there are a number of pages in here that need love. I'm currently looking at "hacking on islandora".

whikloj · 2020-09-01T13:42:34Z

docs/technical-documentation/testing-notes.md

@@ -2,7 +2,7 @@

 The map between Drupal URIs and their corresponding Fedora URIs is stored in a service called Gemini. An Islandora "pseudo-field" can be enabled that will display the corresponding Fedora URI on the page of a node, taxonomy term, or media object.  You can also query Gemini directly. Instructions for doing that are provided below.

-For more information about the Gemini service, see the [Gemini README](https://github.com/Islandora-CLAW/Crayfish/tree/master/Gemini).
+For more information about the Gemini service, see the [Gemini README](https://github.com/Islandora-CLAW/Crayfish/tree/main/Gemini).


CLAW in need of de-ing.

rosiel

oops - i caught similar things to @whikloj

rosiel · 2020-08-28T19:39:35Z

CONTRIBUTING.md

@@ -12,7 +12,7 @@ If you would like to submit a use case to the Islandora 8 project, please submit

 ### 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/mainONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/mamains).


Oooooh this didn't go so well. But I like "mamains".

jonathangreen · 2020-09-02T13:10:21Z

Something I noticed yesterday when I made #1602 is that we have some PR going into master right now and some into main, so the two branches are diverging. It looks like #1601 went in against master. And this PR is against master.

jonathangreen · 2020-09-02T13:12:54Z

It seems like master needs to be merged into main and then deleted, as @whikloj noted in islandora-deprecated/ansible-role-grok#9, so they don't keep getting out of sync. Just wanted to note it here so that it doesn't get lost on this PR.

dannylamb · 2020-09-11T13:24:39Z

rolls up his sleeves and gets to it 👨‍🔧

* Fix old email address. * Update closeCommitterVote.txt * De-CLAW * De-CLAW * DeCLAW * Change email * De-CLAW

* Remove comments about WebAC WebAC is not used but is listed as a feature added when using Fedora. Although it is there, I'd suggest leaving off of this documentation. * Update user-intro.md

* Add more details about starting up an islandora. * Update index.md * Mention use of dev branch for prebuilt base box * Update index.md * Fix typo in VBE * Make clearer the different levels of sandbox reqs.

* Added link to newer migration Youtube vid, added migration-overview.md * Replaced used of "*" with "-" for bulleted lists * Updated headings in docs and spelling changes

* Render the example helpful tip properly. (#1586) * Render the example helpful tip properly. * Fix note syntax, again. * Update rdf-mapping.md doc (#1585) Co-authored-by: Eli Zoller <5439169+elizoller@users.noreply.github.com>

@manez

* Merge changes to add @manez to committers. * Alphabeticalize committer names. Co-authored-by: dannylamb <dlamb@islandora.ca>

dannylamb · 2020-09-11T17:10:48Z

eh... that rebase half worked.... let me see...

…nto master-main-rename

…o master-main-rename

dannylamb · 2020-09-11T17:18:40Z

Ok, this has master and main pulled in. Should be ready now. Please squash and merge.

dannylamb · 2020-09-11T17:19:31Z

You'll notice a little extra de-CLAWing 🎩

rosiel · 2020-09-16T14:48:33Z

ping @whikloj - Github's blocking, pending your change request.

dannylamb · 2020-09-16T18:28:36Z

@whikloj, would you mind releasing your hold on this one?

dannylamb · 2020-09-30T15:02:50Z

@whikloj bump

rosiel and others added 4 commits August 24, 2020 09:09

Render the example helpful tip properly. (#1586)

fbdbda5

* Render the example helpful tip properly. * Fix note syntax, again.

Mention the User Call (#1587)

6a66bcf

Update rdf-mapping.md doc (#1585)

26264e8

Update committers.md (#1592)

6c1777b

whikloj requested changes Sep 1, 2020

View reviewed changes

rosiel reviewed Sep 1, 2020

View reviewed changes

jonathangreen mentioned this pull request Sep 3, 2020

Master -> Main Rename #1595

Open

jonathangreen and others added 12 commits September 11, 2020 14:08

Fix committer nomination email address (#1593)

af51eea

* Fix old email address. * Update closeCommitterVote.txt * De-CLAW * De-CLAW * DeCLAW * Change email * De-CLAW

Update travis for the main branch switch (#1594)

ca07b33

Master -> Main Rename

1c82c9b

Remove comments about WebAC (#1555)

2b3e672

* Remove comments about WebAC WebAC is not used but is listed as a feature added when using Fedora. Although it is there, I'd suggest leaving off of this documentation. * Update user-intro.md

Add more details about starting up an islandora. (#1597)

5796c56

* Add more details about starting up an islandora. * Update index.md * Mention use of dev branch for prebuilt base box * Update index.md * Fix typo in VBE * Make clearer the different levels of sandbox reqs.

Update CONTRIBUTING.md (#1601)

9412fc7

Add Jordan to committers list (#1602)

d4dd584

Migration docs updates (#1603)

b8e6961

* Added link to newer migration Youtube vid, added migration-overview.md * Replaced used of "*" with "-" for bulleted lists * Updated headings in docs and spelling changes

Main update (#1612)

4b50a90

* Render the example helpful tip properly. (#1586) * Render the example helpful tip properly. * Fix note syntax, again. * Update rdf-mapping.md doc (#1585) Co-authored-by: Eli Zoller <5439169+elizoller@users.noreply.github.com>

Merge changes to add @manez to committers. (#1613)

d3749c9

* Merge changes to add @manez to committers. * Alphabeticalize committer names. Co-authored-by: dannylamb <dlamb@islandora.ca>

De-CLAWing

167bb17

Derp

e105e3a

dannylamb force-pushed the master-main-rename branch from 4e7ae30 to e105e3a Compare September 11, 2020 17:09

dannylamb changed the base branch from master to main September 11, 2020 17:12

dannylamb added 3 commits September 11, 2020 14:15

Merge branch 'master' of https://github.com/Islandora/documentation i…

c6d14c1

…nto master-main-rename

Merge branch 'main' of https://github.com/Islandora/documentation int…

af9ec67

…o master-main-rename

Missing parenthesis

d54ddbe

rosiel approved these changes Sep 11, 2020

View reviewed changes

whikloj approved these changes Sep 30, 2020

View reviewed changes

whikloj merged commit 49a9c8a into main Sep 30, 2020

whikloj deleted the master-main-rename branch September 30, 2020 17:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master -> Main Rename #1596

Master -> Main Rename #1596

dannylamb commented Aug 28, 2020

whikloj Sep 1, 2020

whikloj Sep 1, 2020

whikloj Sep 1, 2020

rosiel Sep 1, 2020

whikloj Sep 1, 2020

rosiel Sep 1, 2020

whikloj Sep 1, 2020

rosiel left a comment

rosiel Aug 28, 2020

jonathangreen commented Sep 2, 2020

jonathangreen commented Sep 2, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020 •

edited

Loading

rosiel commented Sep 16, 2020

dannylamb commented Sep 16, 2020

dannylamb commented Sep 30, 2020

Master -> Main Rename #1596

Master -> Main Rename #1596

Conversation

dannylamb commented Aug 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rosiel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonathangreen commented Sep 2, 2020

jonathangreen commented Sep 2, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020

dannylamb commented Sep 11, 2020 • edited Loading

rosiel commented Sep 16, 2020

dannylamb commented Sep 16, 2020

dannylamb commented Sep 30, 2020

dannylamb commented Sep 11, 2020 •

edited

Loading