Feature jincy 457 #504
Merged
Feature jincy 457 #504
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
* Updated .gitignore testing files/paths * Changed Jest coverage directory to jest-coverage * Changed Cyprees coverage directory to cypress-coverage, added multiple scripts to combined Cypress and Jest test coverage reports * Added step to github action to combine Cypress & Jest coverage reports * Added another step to github action to upload combined coverage report to Coveralls * README.md * Test * recovered * jest.config.js * Added badges to README.md * README.md * Migrated from coveralls to codecov for code coverage reporting * set ubuntu-latest on gh action, updated badges * t * gh action twaeks * Removed unnecesary codecov token * Updated badges version numbers * Fixes for running in Windows and README.md * updated instructions. * Created MinimizableWrapper.js * Created MinimizedCards.js * Created useMinimizedCardState.js custom hook * Updated secondary theme main color * Created MinimizedCards FAB component * Fixing minimized card bug * Created MinimizedCards component * Code clean-up on MinimizedCards.js * Added onMinimize method prop to ResourceCard.js * Code clean-up & added data persistence to minimized cards in useMinimizedCardState hook * removed src/components/MinimizableWrapper.js * Added more code comments to useMinimizedCardState * Added minimize/restore feature to resource cards * yarn.lock * Typo * Improved varuable name in useMinimizedCardState * Moved MinimizedCards component and useMinimizedCardState.js from gateway edit app to resource-workspace-rcl to allow for other apps to gain the minimize card feature * Removed unused framer-motion dependency * Updated respective dependencies * fix for unformatted paste * adding UI Design documentation to README.md * Further small edit in README.md * Bugfix larsg 337 usfm new version (#339) * WIP-updated to new version usfm-js #133 * bump version * #328 - bumped version for translation-helps-rcl (#345) * bumped version for translation-helps-rcl * include latest mui (v5) * included emotion (styled, react) * bumped version - boxes no longer displayed when not focused * fixed yarn.lock * bumped version for rcl component - translation-helps-rcl * Fix account settings behavior * Bugfix #355 / Fix when dcs user has no organizations (#356) * Removed circular progress and show disabled org/language select when user has no orgs * Added lock file changes * Bugfix #358... updated translation-helps to load GL Quotes (#359) * updated translation-helps-rcl dependency * updated translation-helps-rcl version * Updated verion to 1.1 (#366) * Feature #330/ampersand support (#371) * merged Lars' ampersand fixes * updating scripture resource rcl * quote and occurrences cleanup * rebuild * rebuild * add support for verse ranges in scripture pane highlighting * add support for verse ranges in scripture pane highlighting * update dependencies * update dependencies --------- Co-authored-by: Manny Colon <[email protected]> Co-authored-by: Bruce McLean <[email protected]> Co-authored-by: Cecil New <[email protected]> Co-authored-by: larsgson <[email protected]> Co-authored-by: Kintsoogi <[email protected]> Co-authored-by: Abel Pérez <[email protected]>
* 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
#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
* 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 * 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
* 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
…_does_not_close Bugfix #437/word aligner does not close
…aveButton Bugfix #442 broken save button
Bugfix #446 / fix tn saving
* 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]>
* 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 * updated dependencies.
* fixes for lexicon fetch hazards * cleanup
…se_2.0_intoMain.2 # Conflicts: # README.md # package.json # src/components/ResourceCard.js # src/components/WorkspaceContainer.js # src/utils/resources.js # yarn.lock
Merge release 2.0 into main.2
Codecov Report
@@ Coverage Diff @@
## develop #504 +/- ##
===========================================
+ Coverage 50.98% 51.69% +0.70%
===========================================
Files 43 43
Lines 1318 1300 -18
===========================================
Hits 672 672
+ Misses 646 628 -18
... and 1 file with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
6 tasks
kintsoogi
pushed a commit
that referenced
this pull request
Sep 27, 2023
added checkbox list feature for merge dialog
kintsoogi
pushed a commit
that referenced
this pull request
Sep 29, 2023
* added checkbox list feature for merge dialog * Added cardsToMerge as a prop * removed console from store context
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.
Describe what your pull request addresses
Test Instructions