Commit Graph

4665 Commits

Author SHA1 Message Date
christopherrsmith 4ea1074c6d Chris Smith edits to JDG UST (#1593)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1593
2024-09-19 10:37:37 +00:00
Grant_Ailie 478901fb32 Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1579)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1579
2024-09-17 20:21:27 +00:00
justplainjane47 5bdaa8f67b Merge auto-justplainjane47-LEV into master by justplainjane47 (#1589) 2024-09-14 18:38:05 +00:00
justplainjane47 54d5605e00 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1588) 2024-09-12 01:17:20 +00:00
justplainjane47 ce18988199 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1585) 2024-09-11 22:17:56 +00:00
christopherrsmith c7ff72031d Chris Smith edits to JDG US (#1587)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1587
2024-09-11 12:59:37 +00:00
justplainjane47 dc0d4a2f29 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1584) 2024-09-10 00:49:30 +00:00
christopherrsmith df7c629f0a Merge auto-christopherrsmith-JDG into master by christopherrsmith (#1586) 2024-09-06 12:16:56 +00:00
christopherrsmith 9066880046 Chris Smith edits to JDG (#1583)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1583
2024-09-05 16:51:02 +00:00
justplainjane47 d882fa7db8 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1582) 2024-09-05 11:12:50 +00:00
justplainjane47 152848a3c5 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1578) 2024-09-04 00:45:33 +00:00
justplainjane47 af90afad82 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1577) 2024-09-02 01:20:55 +00:00
justplainjane47 4054a38a02 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1576) 2024-08-31 00:51:40 +00:00
Grant_Ailie 42019aeea5 Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1569)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1569
2024-08-29 21:27:33 +00:00
justplainjane47 5b21f5fa17 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1575) 2024-08-29 17:00:38 +00:00
justplainjane47 8de2726135 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1574) 2024-08-29 00:14:17 +00:00
pjoakes 76db7cac9a Merge auto-pjoakes-JON into master by pjoakes (#1573)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
2024-08-28 21:58:36 +00:00
justplainjane47 c55c135817 Merge auto-justplainjane47-LEV into master by justplainjane47 (#1572) 2024-08-26 21:23:24 +00:00
justplainjane47 162de7547b Merge auto-justplainjane47-LEV into master by justplainjane47 (#1571) 2024-08-23 01:29:38 +00:00
justplainjane47 68af88b84c Merge auto-justplainjane47-LEV into master by justplainjane47 (#1570) 2024-08-19 23:23:22 +00:00
justplainjane47 fbe469527f Merge auto-justplainjane47-LEV into master by justplainjane47 (#1568) 2024-08-17 23:39:15 +00:00
justplainjane47 e5ff08863d Merge auto-justplainjane47-LEV into master by justplainjane47 (#1567) 2024-08-16 13:21:51 +00:00
justplainjane47 2fc13153ba Merge auto-justplainjane47-LEV into master by justplainjane47 (#1566) 2024-08-16 01:23:52 +00:00
Grant_Ailie 26ba9719fc Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1565)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1565
2024-08-15 22:02:39 +00:00
Richard Mahn 26134173d2 Update manifest.yaml 2024-08-15 00:30:41 +00:00
unfoldingWord 7a5455303b Replace Manifest with valid YAML file
Signed-off-by: unfoldingWord <info@unfoldingword.org>
2024-08-14 22:39:29 +00:00
pjoakes 1739d07569 Merge auto-pjoakes-PRO into master by pjoakes (#1563)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
2024-08-06 20:42:48 +00:00
Richard Mahn 12f945f499 Perry's changes to PRO (#1564)
From QA server

Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1564
Co-authored-by: Richard Mahn <richmahn@noreply.door43.org>
Co-committed-by: Richard Mahn <richmahn@noreply.door43.org>
2024-08-06 18:39:45 +00:00
pjoakes 2fa64dbe8f Merge auto-pjoakes-PRO into master by pjoakes (#1555)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
2024-08-06 15:46:44 +00:00
Grant_Ailie 6ea50e3bf8 Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1561)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1561
2024-08-01 22:11:50 +00:00
Stephen Wunrow 42a513cd03 Bradley's edits to UST Lev 20–22 (#1562)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1562
2024-07-30 18:59:31 +00:00
Grant_Ailie de87401cd0 Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1542)-all UST Joshua edits through end of chapter 4
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1542

all UST Joshua edits through end of chapter 4
2024-07-22 15:53:34 +00:00
christopherrsmith e619767490 Merge auto-christopherrsmith-JDG into master by christopherrsmith (#1560) 2024-07-19 10:38:06 +00:00
christopherrsmith 9275b01d56 Chris Smith edits to JDG 1-5 (#1559)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1559
2024-07-19 10:32:08 +00:00
Richard Mahn 46937bdda3 Edits from Bradley for LEV 1-20 (#1556)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1556
2024-07-08 15:28:43 -04:00
pjoakes 5ec830f211 Merge auto-pjoakes-ISA into master by pjoakes (#1554)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
2024-07-03 16:30:27 +00:00
stephenwunrow 91b6340980 Merge auto-stephenwunrow-2TI into master by stephenwunrow (#1553)
Co-authored-by: stephenwunrow <stephenwunrow@noreply.door43.org>
Co-committed-by: stephenwunrow <stephenwunrow@noreply.door43.org>
2024-07-02 22:15:53 +00:00
Stephen Wunrow ca81145ac0 Merge auto-stephenwunrow-1TI into master by stephenwunrow (#1547) 2024-06-28 21:14:26 +00:00
stephenwunrow 67d13a0a55 Merge auto-stephenwunrow-2TI into master by stephenwunrow (#1548)
Co-authored-by: stephenwunrow <stephenwunrow@noreply.door43.org>
Co-committed-by: stephenwunrow <stephenwunrow@noreply.door43.org>
2024-06-28 21:10:10 +00:00
Stephen Wunrow 1c322e21d7 Merge auto-stephenwunrow-1TI into master by stephenwunrow (#1546) 2024-06-27 19:04:31 +00:00
stephenwunrow f2b8a37469 Merge auto-stephenwunrow-2TI into master by stephenwunrow (#1545)
Co-authored-by: stephenwunrow <stephenwunrow@noreply.door43.org>
Co-committed-by: stephenwunrow <stephenwunrow@noreply.door43.org>
2024-06-27 19:02:48 +00:00
Grant_Ailie 940901dd7d Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1541) 2024-06-26 19:41:07 +00:00
Richard Mahn 44bdaa5a2b Fixes \ts tags (#1544)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1544
Co-authored-by: Richard Mahn <rich.mahn@unfoldingword.org>
Co-committed-by: Richard Mahn <rich.mahn@unfoldingword.org>
2024-06-25 16:56:51 +00:00
thesmartwon 327859665e PSA 7:5 Add closing qs tag (#1540)
Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1540
Co-authored-by: thesmartwon <thesmartwon@pm.me>
Co-committed-by: thesmartwon <thesmartwon@pm.me>
2024-06-25 15:48:43 +00:00
thesmartwon 3a549e5450 Fix stray \ts* tags. (#1539)
```sh
sed -i 's:\\ts\*:\\ts\\\*:g' *.usfm
sed -i 's:\\ts\\\* \\:\\ts\\\*\n\\:g' *.usfm
```

Reviewed-on: https://git.door43.org/unfoldingWord/en_ust/pulls/1539
Co-authored-by: thesmartwon <thesmartwon@pm.me>
Co-committed-by: thesmartwon <thesmartwon@pm.me>
2024-06-25 15:39:43 +00:00
Grant_Ailie bcebc2ee6e Merge auto-Grant_Ailie-JOS into master by Grant_Ailie (#1538) 2024-06-25 14:31:06 +00:00
unfoldingWord 12a75365c5 Replace Manifest with valid YAML file
Signed-off-by: unfoldingWord <info@unfoldingword.org>
2024-06-21 16:52:45 +00:00
unfoldingWord b6d1a387e8 Replace Manifest with valid YAML file
Signed-off-by: unfoldingWord <info@unfoldingword.org>
2024-06-21 16:47:21 +00:00
unfoldingWord a5d4c52cbd Replace Manifest with valid YAML file
Signed-off-by: unfoldingWord <info@unfoldingword.org>
2024-06-21 15:44:34 +00:00
pjoakes 8d2e1b09a9 Merge auto-pjoakes-3JN into master by pjoakes (#1531)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
2024-05-03 16:57:34 +00:00