Code

Ft/offline text merge#324

Code

Open

sijumoncy wants to merge 50 commits intodevelopmentbible-technology/scribe-scripture-editor:developmentfrom ft/offline-text-mergebible-technology/scribe-scripture-editor:ft/offline-text-mergeCopy head branch name to clipboard

+2,323-37

Commits

Commits on Apr 19, 2024

• added states for handling merge UI

  sijumoncy

  committed
  9706f98

  Copy full SHA for 9706f98

• added UI template for text transaltion merge

  sijumoncy

  committed
  9af115b

  Copy full SHA for 9af115b

• import file function added

  sijumoncy

  committed
  d5b928e

  Copy full SHA for d5b928e

• added fucntions to read and parse impoted file and check the same file in the current project

  sijumoncy

  committed
  d3985a5

  Copy full SHA for d3985a5

• added util function to read usfm from a project

  sijumoncy

  committed
  3d4e8f1

  Copy full SHA for 3d4e8f1

• getting parsed usfm json for imported and exisiting

  sijumoncy

  committed
  afab4e8

  Copy full SHA for afab4e8

• parsed usfm

  sijumoncy

  committed
  f6a51db

  Copy full SHA for f6a51db

• added chapters number and book in nav ui

  sijumoncy

  committed
  9da3d4c

  Copy full SHA for 9da3d4c

• added usfm conflict ui and import components

  sijumoncy

  committed
  e0edd59

  Copy full SHA for e0edd59

• sample render of usfm diff for test

  sijumoncy

  committed
  f629c45

  Copy full SHA for f629c45

• added a prsing script to check and find the comparison results

  sijumoncy

  committed
  321200b

  Copy full SHA for 321200b

• added custom ui to render chapter wise one file

  sijumoncy

  committed
  dcb294c

  Copy full SHA for dcb294c

• simple primary render view chapter wise - single json

  sijumoncy

  committed
  9c9e255

  Copy full SHA for 9c9e255

• test ui

  sijumoncy

  committed
  65dcd00

  Copy full SHA for 65dcd00

• added logic to indentify the conflicts and display with basic styling

  sijumoncy

  committed
  d49d6f0

  Copy full SHA for d49d6f0

• added reset single and select current or incoming section

  sijumoncy

  committed
  0e9ec32

  Copy full SHA for 0e9ec32

• added conflict ui

  sijumoncy

  committed
  82bf7d9

  Copy full SHA for 82bf7d9

• only listing conflicted fiels

  sijumoncy

  committed
  6229b25

  Copy full SHA for 6229b25

• detect chapter conflict resolution

  sijumoncy

  committed
  80d8ac9

  Copy full SHA for 80d8ac9

• added resolve ,reset functionality to retain previous stages based on the chapter resolution

  sijumoncy

  committed
  f380e49

  Copy full SHA for f380e49

• added functionality to save and load conflict files, conflict fixed

  sijumoncy

  committed
  2c89702

  Copy full SHA for 2c89702

• UI for Import and resume usfm conflict

  sijumoncy

  committed
  287ab33

  Copy full SHA for 287ab33

• added functionality for finiahs conflict resolution

  sijumoncy

  committed
  3b531fc

  Copy full SHA for 3b531fc

• refactor codebase to handle file based merge to project based merge, handle multi book-chapter conflict resolution

  sijumoncy

  committed
  8ad16dd

  Copy full SHA for 8ad16dd

• added resolve chapter and book functions added. book resolved ui need to add, and save functionality pending

  sijumoncy

  committed
  8a83618

  Copy full SHA for 8a83618

• strike out and remove nav from resolved chapter; fixed backend file name; resolve button fixed on complete;

  sijumoncy

  committed
  596736e

  Copy full SHA for 596736e

• disabled reset option on chapter conflict resolution, auto switch chapter on completion; fixed issue of last chapter conflict resolved and reset issue;

  sijumoncy

  committed
  b77cf9c

  Copy full SHA for b77cf9c

• functions to trigger complete conflict done

  sijumoncy

  committed
  714a6e5

  Copy full SHA for 714a6e5

• functionality for merge success;replace source files; delete .merge project

  sijumoncy

  committed
  4be97dc

  Copy full SHA for 4be97dc

• added auto select chapter for the current parsed book in the ui

  sijumoncy

  committed
  f5ca445

  Copy full SHA for f5ca445

• updated meta and md5 on final replace

  sijumoncy

  committed
  ced5249

  Copy full SHA for ced5249

Commits on Apr 22, 2024

• added docs and flow diagram

  sijumoncy

  committed
  50f33e9

  Copy full SHA for 50f33e9

Commits on Apr 24, 2024

• refactor fucntions; checkpoint for config store on initial load; fix for load back from inprogress on initial load

  sijumoncy

  committed
  39c58c3

  Copy full SHA for 39c58c3

• fixed issue : showing current and incoming incorrect.

  sijumoncy

  committed
  998fbea

  Copy full SHA for 998fbea

• updated abort modal and fixed loading issue in no conflcit

  sijumoncy

  committed
  59c163d

  Copy full SHA for 59c163d

Commits on Apr 25, 2024

• added new hook for grammar to perf usfm conversion. logic added in sidebar. need to move to mergeUI before writing.

  sijumoncy

  committed
  e9c4385

  Copy full SHA for e9c4385

Commits on Apr 30, 2024

• logic and hooks to convert grammar usfm to perf usfm. added feature for book by book resolve and rewrite

  sijumoncy

  committed
  999bb24

  Copy full SHA for 999bb24

• no conflict notification and checks

  sijumoncy

  committed
  0639043

  Copy full SHA for 0639043

• added confirm on continue merge for startover;perf logics

  sijumoncy

  committed
  860a456

  Copy full SHA for 860a456

Commits on May 2, 2024

• chapter level checkpoint and reload from the checkpoint of chapte

  sijumoncy

  committed
  94b2227

  Copy full SHA for 94b2227

• merge button not showing initially

  sijumoncy

  committed
  241c82e

  Copy full SHA for 241c82e

• loadback inprogress based on config status

  sijumoncy

  committed
  2e15f6b

  Copy full SHA for 2e15f6b

• added conflict detection based on the current and incoming content values

  sijumoncy

  committed
  50a4a27

  Copy full SHA for 50a4a27

• lint fix

  sijumoncy

  committed
  1ea8299

  Copy full SHA for 1ea8299

Commits on May 3, 2024

• folder and import data exit after close issue fixed

  sijumoncy

  committed
  8a4c72d

  Copy full SHA for 8a4c72d

• removed unused fucntion

  sijumoncy

  committed
  d5d6778

  Copy full SHA for d5d6778

Commits on May 10, 2024

• cleanup

  sijumoncy

  committed
  7cf4d54

  Copy full SHA for 7cf4d54

Commits on Jul 9, 2024

• fixes for auto conflict

  sijumoncy

  committed
  5db0a77

  Copy full SHA for 5db0a77

• auto check and mark done

  sijumoncy

  committed
  527ac23

  Copy full SHA for 527ac23

Commits on Jul 17, 2024

• lint: fixed lint issue

  sijumoncy

  committed
  f48c803

  Copy full SHA for f48c803