Fix #4622: Android Wiki migration #4893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@gp201 Thanks, PTAL, replied to comments. |
|
@MohitGupta121 PTAL |
U8NWXD
suggested changes
Mar 16, 2023
BenHenning
approved these changes
Mar 16, 2023
There was a problem hiding this comment.
Thanks @gp201! The PR broadly LGTM, so approving it. I'm fine with @seanlip resolving any open comments from me once they're resolved, and merging.
@seanlip let's go with a squash merge here (per our discussion about whether to do a special one-time direct merge). I think it avoids introducing inconsistency in the history of the develop branch (since all other commits were proper PR squashes), and we'll have better wiki consistency moving forward as wiki files will be changed within PRs.
seanlip
approved these changes
Mar 17, 2023
|
Unassigning @seanlip since they have already approved the PR. |
Uticodes
pushed a commit
to Uticodes/oppia-android
that referenced
this pull request
Mar 23, 2023
<!-- READ ME FIRST: Please fill in the explanation section below and check off every point from the Essential Checklist! --> ## Explanation <!-- - Explain what your PR does. If this PR fixes an existing bug, please include - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the issue - when this PR is merged. --> - Fixes oppia#4622 - The PR does the following: This PR moves the android wiki into the oppia-andoird codebase allowing contributors to make PRs to the wiki along with changes to the codebase itself. This PR also introduces a GitHub Action (Runs when a PR is merged into develop and when a user makes change to the wiki via the web interface) that copies the content of the wiki folder along with the git history of the wiki folder and deploys it to the oppia-android wiki repository. The steps followed to achieve this wiki migration are present here: [Oppia Android Wiki Migration V2 (1).pdf](https://github.com/oppia/oppia-android/files/10921370/Oppia.Android.Wiki.Migration.V2.1.pdf) ### Note: Please ensure GitHub actions have write permissions. Please follow these instructions to enable it: [GrantingReadandWritePermissionsonGitHub_PDF.pdf](https://github.com/oppia/oppia-android/files/10919834/GrantingReadandWritePermissionsonGitHub_PDF.pdf) ## Essential Checklist <!-- Please tick the relevant boxes by putting an "x" in them. --> - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only <!-- Delete these section if this PR does not include UI-related changes. --> If your PR includes UI-related changes, then: - Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes - For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see [RTL guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines)) - Add a video showing the full UX flow with a screen reader enabled (see [accessibility guide](https://github.com/oppia/oppia-android/wiki/Accessibility-(A11y)-Guide)) - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing --------- Co-authored-by: Rajat Talesra <[email protected]> Co-authored-by: Ben Henning <[email protected]> Co-authored-by: Akshay Nandwana <[email protected]> Co-authored-by: Srikanth K B <[email protected]> Co-authored-by: Jan <[email protected]> Co-authored-by: Abhay Garg <[email protected]> Co-authored-by: Arjun Gupta <[email protected]> Co-authored-by: Sparsh Agrawal <[email protected]> Co-authored-by: Farees Hussain <[email protected]> Co-authored-by: Sarthak Agarwal <[email protected]> Co-authored-by: Sean Lip <[email protected]> Co-authored-by: Apoorv Srivastava <[email protected]> Co-authored-by: Vinita Murthi <[email protected]> Co-authored-by: Ankita Saxena <[email protected]> Co-authored-by: Vojtěch Jelínek <[email protected]> Co-authored-by: Ben Henning <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
The steps followed to achieve this wiki migration are present here:
Oppia Android Wiki Migration V2 (1).pdf
Note: Please ensure GitHub actions have write permissions. Please follow these instructions to enable it:
GrantingReadandWritePermissionsonGitHub_PDF.pdf
Essential Checklist
For UI-specific PRs only
If your PR includes UI-related changes, then: