-
-
Notifications
You must be signed in to change notification settings - Fork 41
Merge branch 'release/9.3' into 'master' #634
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
Conversation
* Add highlighting for parser-approved analyses * Add GetAnalysisColor * Change to use check marks and red Xs * Add AddOpinion * Add SetGuessColor. Make double approved analyses be green * Remove double coloring and add space * Fix unit test failure * Remove unnecessary changes
* Fix LT-21867: HC rule doesn't work * Fix unit test
Change-Id: If2769369514d415054687db2285b3c4801c23b2f
* Fix LT-21867: HC rule doesn't work * Fix unit test * Fix LT-22101: Problem adding a column in affix template
* Fix LT-21945: Different modes for parsing vs. analyzing * Fix LT-21945: Rename menu items * Incorporate liblcm with related changes * Fix unit tests * Fixed problems reported by Jason
Co-authored-by: Mark Kidder <83427558+mark-sil@users.noreply.github.com>
Instead of using COM we added a wrapper class that uses DllImport to create and call methods on the VwPropertyStore object. Change-Id: I8681ad9140a3b5a887b1ba672dae9b58dab55a75
* Fix LT-22153: Handle merging flextext * Make unit tests work
Remove the code in Src\Widgets, which does not appear to be used.
* Fix LT-826: Allow affixes to be overtly ordered * Fix LT-826: disable Move command in appropriate circumstances * Updte to latest liblcm
* Removed many of the Linux specific build steps and files
* Fix LT-21902: Allow duplicating a slot * Update to latest liblcm
* Replace Stem Name with Stem Allomorph Label in UX * Replace stem name with stem allomorph label * Update Help filenames
* LT-21907 Change "stem name" to "stem allomorph label" Change-Id: I2c13feaee5ace262f6016a728261f12cf4fa6079 * LT-21907 Fix parser tracing messages for stem name change Change-Id: I75232e5336f9ed97cee300dedb50f1a21fb6ce2d
When adding an image, add it directly to the MasterFragment. This has two benefits: 1. Avoids cloning the image every time the fragment is cloned. 2. Avoids the need to update the part ID in the Drawing.blip.Embed every time the image is cloned. Since the image is added directly to the MasterFragment the part ID doesn’t change.
Remove the code in Src\CommonCOMDlgs, which does not appear to be used. It looks like this was being built for Linux, but not Windows.
Change-Id: I00f314469db5648038103fb544ccd9ecf15f5f28
There was data in a DocFragment that was only needed by the fragment that was going to write to the docx file. We now moved that data to a MasterDocFragment and only have a Body in the regular DocFragment. Regular DocFragments are frequently created and discarded. Not having them open a memory stream saves a significant amount of time. Combined with the performance improvements in commit e1943fb, export times are now 30% to 50% of previous times.
Fix LT-21907c: fix mistakes with plural labels
* Fix LT-21908: Create a utility to remove user-approved analyses * Fix bugs in LT-21908
LT-22312: Make copyright more accessible in Webonary Create GeneratePictureLicenseContent method in LcmGenerator that returns a string containing picture copyright and license info. In GenerateContentForPicture, use this new method to generate the license content and add license as an argument to AddImage. In "AddImage" in the Xhtml generator, add the license as a title in the image element, so that license will display when mousing over the image. In "AddImage" in the JSON generator, add a "copyrightLicense" property to the image data so it will be searchable in the database. Update expected results in JSON generator tests to include new copyrightLicense property.
* Fix LT-22349: Crash after clicking Find Example Sentence * Remove some controls
This was causing all Dictionary View imports to crash. Change-Id: I8b8f5e8513a3df4a160e3d206c8d104717191ae5
* Export each Style's Function (@use) (needed to match on import) * Fix style export for undefined structure: The Style import expects a missing `structure` attribute for StructureValues.Undefined. The initial fix to LT-20393 caused a regression with the same steps as LT-20895. Fix the style export update so that the legacy style import continues to work. Also: * Modernize the import * Update a message about the installation CD * Fix incorrect exception messages regarding the import * Remove some TE-specific code * Fix the comment on EnsureCompatibleFactoryStyle * Test Style Serialization * Update comments and messages; remove dead code
… there (#612) * Fix LT-22336: "Publish Sense In" column incorrectly showing data * Replace field="Senses" with field="AllSenses" broadly * Remove change to ReversalEntriesForSenseEdit
* Fix LT-22303: Import flextext adds a paragraph marker * Use ParagraphParser.EndsWithEOS
Change-Id: If7ffe01d72e6a291ad082a525bfbf48f0769d260 # Conflicts: # Src/Common/FieldWorks/App.config
Change-Id: If873e493f32ea6d694d150b93cf18c7a65ba3821
Update Model.SelectedPublication when a new publication is selected in Webonary dialog. This fixes an issue where the number of records to upload is not updated when the publication is changed.
Fix second LT-22352 problem
This change adds prepended text to Word 2007 and Libre Office. This change also prevents the appended text from converting to all capitals. What caused this was that we were setting two styles in a single run. If we want to apply the "Interlin Variant Types" styles to the prepended and appended text then we would need to have separate runs. I did test moving them to their own runs and they were able to have different styles, however I didn’t include that change in this PR because additional work would be needed to support right to left writing systems. Also, Flex doesn’t display them with different styles so we would probably also need to fix the Flex display.
When the user turns off the display of vernacular spelling errors the UseVernSpellingDictionary property is set to false and the SpellCheckingId is set to "<None>" for all of the VernacularWritingSystems. It looks like some projects were backed up when these were not in sync. When we initialize the MorphologyListener we now set the SpellCheckingId’s to "<None>" if the property is false.
Fix SFM import duplicating list items with diacritics by normalizing SFM to NFD before looking up internal data since the internal list data is NFD. Add unit test to check for NFD normalization.
Change-Id: I7014dde34a16819a98abab7a711403601875f0d6
During Dictionary View import, existing styles were being cleared before importing new styles, so if the new styles could not be imported, the stylesheet would be left empty. To fix this, import styles without clearing the stylesheet first. This also simplifies the import process, which was likely complicated to compensate for incomplete exports pre-9.3.5. * Export <paragraph> elements for paragraph styles, even if empty (should be the case for only Normal, as all other paragraph styles should have at least a basedOn attribute). * Export 'structure' and 'use' attributes for each Style (if not default). * If 'structure' and 'use' attributes are missing on a known style, use the pre-import values. * Catch more exceptions during style import. * Clarify message locations for different exceptions * Unit test style import * Permit import and export of list styles (they are already supported) * Also add `fwdictconfig` to the solution spelling dictionary. POSSIBLE FUTURE WORK: * Rewrite the style import to handle importing shared user styles differently from loading new installed styles * Check for style importability in DictConfigImportCtlr.PrepareImport
Refresh on closing Dictionary Configuration Import Dlg only if styles were successfully imported.
# Conflicts: # Build/Src/FwBuildTasks/Substitute.cs # Build/mkall.targets # Build/nuget-common/packages.config # Src/LexText/Interlinear/BIRDInterlinearImporter.cs # Src/LexText/Lexicon/ReversalListener.cs # Src/LexText/ParserCore/HCLoader.cs # Src/MasterVersionInfo.txt
|
commit 28e2c9029a: commit d5720b8647: commit 039bbe7719: commit 6d6aaea7f2: commit da7374bff0: commit 0c9ec79095: commit 7110eff3e8: commit 780ca2318f: commit d4c0bf376c: commit 691f8ebda6: commit a2bbe92f32: commit 8df2ecb88a: commit 4a1c840f5d: commit ac039af525: commit 327105edaa: commit 624c79c0dd: commit 9f4a532c23: commit 392a495f82: commit 644fefd113: commit f68f7ee1dd: |
and close 'develop' and 'release/*' branches. Continuing to build pushes and PRs to release branches as a way to stabilize a release while the next sprint continues.
jasonleenaylor
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jasonleenaylor partially reviewed 565 files and all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @papeh).
This change is
I ran it backwards in another commit; you can see here that it is nearly no-op.