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

Feature / add js docs #522

Closed
wants to merge 43 commits into from
Closed

Feature / add js docs #522

wants to merge 43 commits into from

Conversation

PhotoNomad0
Copy link
Contributor

Describe what your pull request addresses

  • [ ]

Test Instructions

  • [ ]

PhotoNomad0 and others added 27 commits April 11, 2023 09:49
* updated dependencies.

* connect merge status

* revert markdown-translatable to 2.0.3 for GWE compatibility.
* added git sync icons

* connect merge status

* revert some inadvertant changes

* Added ability to resource and scripture cards to merge to/from master

* added logging and fixed the merge status

* updated the translation-help-rcl version

* updated the version

---------

Co-authored-by: blm <[email protected]>
Co-authored-by: kintsoogi <[email protected]>
* Changed MUI dialog to tCore popup component for lexicon data.

* Fixed styling of the popover component

* Removed unnecessary code from useWindowEvent

* Removed popover TODO

* FIxed close button in popover
* revert markdown-translatable to 2.0.3 for GWE compatibility.

* added updateMergeState

* we added merge status to the store context

* updated single-scripture-rcl version

* added the merge status for header

* updated code for app level merge

* added merging status

* updated dependencies.

* updated merge status key.

* updated merge status key.

* bump

---------

Co-authored-by: jincypjose <[email protected]>
* Current merge functionality replaced with Abel's RCL

* Swapped merge_from_master button for branch-merger

* Beta - Individual Workspace Cards mergeFromMaster working

* Updated header merge from master button to use branch-merger RCL

* Fixed version

* Removed unnecessary files

* Corrected version

* Updated tHelps RCL version

* yarn lock because gEdit is cranky

* Removed TODO comment

* Updated versions
* added a fix to default to qa when localhost or develop link

* added mem mgmt to yarn dev and fixed qa test

* moved defaulting logic to auth context

* cleanup

* changed the github action to use ubuntu-20.04

* reverted the changes

* fix to prevent app from switching to qa when running cypress tests

---------

Co-authored-by: blm <[email protected]>
Co-authored-by: Joel C Johnson <[email protected]>
- Added verse editing and alignment editing
- Changed scripture branches to individual book branches
- Performance Fixes
* reverting PR 428 changes that broke persisting login.

* reverting PR 428 changes that broke persisting login.
* reverting PR 428 changes that broke persisting login.

* reverting PR 428 changes that broke persisting login.

* reverting PR 428 changes that broke persisting login.

* reverting PR 428 changes that broke persisting login.
* Incorporate branch-merger RCL for mergeToMaster

* Put in merge to master

* Close on resource reload... but broken resource
SS - beta.3, TH - beta.4

* Reload resources on merge to master

* Changes to make work

* changes to make run

* Added caching fix for reloading

* checking cache issue

* Fixed caching issue (by removing it... fix later)

* update dependencies versions

* update yarn lock for netlify
* bump (#407)

* Update latest into v1.2.0 (#408)

* QA Fail 372 / Edit/Alignments not saved (#398)

* updated dependencies.

* connect merge status

* revert markdown-translatable to 2.0.3 for GWE compatibility.

* patch for lexicon popups

* updated versions for translation help rcl and resource workspace rcl … (#418)

* updated versions for translation help rcl and resource workspace rcl for issue 416

* updated the versions for translation-helps-rcl and resource-workspace-rcl

* Feature jincy 395 (#422)

* updated versions for translation help rcl and resource workspace rcl for issue 416

* we removed selection context

* removed selection context

* updated version for single scripture rcl

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* fix the refrence crash with translation words

* resolved conflicts

* we updated dependencies

---------

Co-authored-by: blm <[email protected]>

* Updated single-scripture-rcl for aligning reference ranges (#420)

* Updated single-scripture-rcl for aligning reference ranges

* Updated version of gateway-edit

* Maybe changing yarn lock will make it happy

* Update version of single-scripture-rcl

* yarn locks are the bane of my existence

* Updated version of single-scripture-rcl

* Feature 400/ book branch (#412)

* QA Fail 372 / Edit/Alignments not saved (#398)

* updated dependencies.

* connect merge status

* revert markdown-translatable to 2.0.3 for GWE compatibility.

* updated dependncies

* updated dependncies

* updated dependncies

* updated dependncies

* updated dependncies

* bump version

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* fix timeouts

* fix timeouts

* updated dependncies

* updated dependencies.

* updated dependencies.

* move fetch of original language back into app.  consolidate state variables

* move fetch of original language back into app.  consolidate state variables

* updated dependencies.

* bump timeout

* bump timeout

* bump timeout

* updated dependencies. (#436)

* added debug logging

* added debug logging

* cleanup

* cleanup

* updated dependencies (#441)

* updated dependencies.

* updated dependencies.

* Fixed aligner null data on accept with no changes (#425)

* fixes for loading/saving repo.

* updated dependencies.

* fixes for saving resource.

* updated dependencies.

* updated dependencies.

* cleanup.

* updated latest word-aligner-rcl

* updated dependencies.

* cleanup.

* cleanup.

* added title for cards

* updated the RCL version

* updated the dependencies

---------

Co-authored-by: Bruce McLean <[email protected]>
Co-authored-by: jincypjose <[email protected]>
Co-authored-by: Kintsoogi <[email protected]>
Moved update button to right side of header
* bump (#407)

* Update latest into v1.2.0 (#408)

* QA Fail 372 / Edit/Alignments not saved (#398)

* updated dependencies.

* connect merge status

* revert markdown-translatable to 2.0.3 for GWE compatibility.

* patch for lexicon popups

* updated versions for translation help rcl and resource workspace rcl … (#418)

* updated versions for translation help rcl and resource workspace rcl for issue 416

* updated the versions for translation-helps-rcl and resource-workspace-rcl

* Feature jincy 395 (#422)

* updated versions for translation help rcl and resource workspace rcl for issue 416

* we removed selection context

* removed selection context

* updated version for single scripture rcl

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* fix the refrence crash with translation words

* resolved conflicts

* we updated dependencies

---------

Co-authored-by: blm <[email protected]>

* Updated single-scripture-rcl for aligning reference ranges (#420)

* Updated single-scripture-rcl for aligning reference ranges

* Updated version of gateway-edit

* Maybe changing yarn lock will make it happy

* Update version of single-scripture-rcl

* yarn locks are the bane of my existence

* Updated version of single-scripture-rcl

* Feature 400/ book branch (#412)

* QA Fail 372 / Edit/Alignments not saved (#398)

* updated dependencies.

* connect merge status

* revert markdown-translatable to 2.0.3 for GWE compatibility.

* updated dependncies

* updated dependncies

* updated dependncies

* updated dependncies

* updated dependncies

* bump version

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* fix timeouts

* fix timeouts

* updated dependncies

* updated dependencies.

* updated dependencies.

* move fetch of original language back into app.  consolidate state variables

* move fetch of original language back into app.  consolidate state variables

* updated dependencies.

* bump timeout

* bump timeout

* bump timeout

* updated dependencies. (#436)

* added debug logging

* added debug logging

* cleanup

* cleanup

* updated dependencies (#441)

* updated dependencies.

* updated dependencies.

* Fixed aligner null data on accept with no changes (#425)

* fixes for loading/saving repo.

* updated dependencies.

* fixes for saving resource.

* updated dependencies.

* updated dependencies.

* cleanup.

* updated latest word-aligner-rcl

* updated dependencies.

* cleanup.

* cleanup.

* Bug fix for not saving content -464 (#471)

* update languages.json

* fix to not clear screen on network error

* increase upload timeout

* increase upload timeout

* post errors when resource upload error.

* fixed not saving content

* updated dependencies.

---------

Co-authored-by: blm <[email protected]>

* fix to show network error messages if they happen before workspace is initialized. (#473)

* added error handling for creating branch (#480)

* added error handling for creating branch

* updated dependencies.

---------

Co-authored-by: blm <[email protected]>

* fix to show error when branch creation fails for resource card (#481)

* fix to show error when branch creation fails for resource card

* updated dependencies.

* Bugfix 474 / fix glosses (#486)

* fixes for lexicon fetch hazards

* cleanup

* updated dependencies.

* fix merge conflicts

* updated dependencies.

---------

Co-authored-by: jincypjose <[email protected]>
Co-authored-by: Kintsoogi <[email protected]>
Co-authored-by: Joel C Johnson <[email protected]>
* Fixed false-conflict and added error handling for no changes made

* updated tHelps version

* darn tootin yarn locks
* added CSS

* updated the npm version

* updated yarn

---------

Co-authored-by: blm <[email protected]>
* added checkbox list feature for merge dialog

* Added cardsToMerge as a prop

* removed console from store context
* Incorporate bible-reference-rcl changes for tab select

* silly yarn lock

* Updated Bible-Ref-Rcl version and merge bug fix

* updated version
@codecov
Copy link

codecov bot commented Aug 9, 2023

Codecov Report

Merging #522 (eaf73d4) into develop (50675d4) will increase coverage by 3.84%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop     #522      +/-   ##
===========================================
+ Coverage    51.65%   55.50%   +3.84%     
===========================================
  Files           43       43              
  Lines         1299     1299              
===========================================
+ Hits           671      721      +50     
+ Misses         628      578      -50     

see 7 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 13:37 — with GitHub Pages Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 13:44 — with GitHub Pages Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 13:53 — with GitHub Pages Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 14:00 — with GitHub Pages Inactive
@github-pages github-pages bot temporarily deployed to github-pages August 10, 2023 14:07 Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 15:12 — with GitHub Pages Inactive
@github-pages github-pages bot temporarily deployed to github-pages August 10, 2023 15:18 Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 15:24 — with GitHub Pages Inactive
@github-pages github-pages bot temporarily deployed to github-pages August 10, 2023 15:30 Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 15:55 — with GitHub Pages Inactive
@PhotoNomad0 PhotoNomad0 temporarily deployed to github-pages August 10, 2023 17:36 — with GitHub Pages Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants