Development branch with conflict fix#109
Closed
vipinpaul wants to merge 16 commits intodevelopmentfrom
Closed
Conversation
* Added syncpack,linting and fixed bundle issue * Updated the scripts and removed the unwanted scripts * Updating Readme * removing the unwanted branch * adding retry strategy for mac build * changing the mac workflow * installing ripgrep * removing vscode/ripgrep * removing --verbose from mac * removing unused packages @theia/file-search and @theia/search-in-workspace * modifying the workflow for mac build * testing the mac workflow * cache cleaning * removing the test branch * Update package.json Updating the watch script * Feat: Fonts Menu drop down components (#45) Co-authored-by: tchami <131756888+tchamianest@users.noreply.github.com> * Revert "Feat: Fonts Menu drop down components (#45)" (#89) This reverts commit eb82e8f. --------- Co-authored-by: ErnestTchami <131756888+ErnestTchami@users.noreply.github.com> Co-authored-by: tchami <131756888+tchamianest@users.noreply.github.com> Co-authored-by: Brian Ineza <brianineza01@gmail.com>
Co-authored-by: tchami <131756888+tchamianest@users.noreply.github.com>
* Made a new audio plugin widget * Adding waveform,play,pause,stop,rewind functionality with UI * adding rewind,volume control and playback speed * Added a vscode linter * Real time waveform for recorder * added recording functionalities #50 * updated backend binary permissions and modified waveform codes * Adding delete functionality and getting the current system OS in frontend * updated code with device selection * added device management linux * added support for x11 device management * disable buttons css * updated css, wavesurfer and volume code * removed url, passed file * updated css * removed ws volume * updated code to open settings (linux) * fixed two qa reported issues * removed extra code for seek * fixed seeking issue * updated versions * adding UI as dependency --------- Co-authored-by: vipinpaul <vipin.paul@bridgeconn.com>
* Issue41 rebased with development * removed text Goto and set the defulat scope as entire bible * added the missing book NAHUM * fixed the package.json file * fixed package.json --------- Co-authored-by: VIPIN PAUL <37212471+vipinpaul@users.noreply.github.com>
* Initializing a new extension * Adding a start-up page * Create Project UI with all the basic validation * Added target and source language selector * A validation display for the selected files * Updated directory structure and USFM validation in backend * modifying code for multi-usfm validation * Adding the centralized place for scribe * usfm to USJ convertion logic * work back-up * finishing up the project creation with basic structure * on creation opening new workspace
Collaborator
Author
|
Raised this PR to remove branch conflicts - closing this since the conflict has been resolved. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Development branch with conflict fix - merged a un-attached commit