DO NOT MERGE: Morphic 1.3.5 #208
Open
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
* upstream/master: GPII-3521: added missing margin to the close button width, which solves the low-resolution issue. GPII-3772: Changed the tooltip message for the Zoom button from "Works in Windows, Edge, Chrome, Firefox, Microsoft Office, and many other applications." to "Works with many applications including Edge, Chrome, Firefox, Microsoft Office, and more."
* stegru/GPII-2338: GPII-2338: Moved service config to gpii-app. GPII-2338: Copying service.json5 into installer. GPII-2338: Renamed service directory to gpii-service GPII-2338: Install+start service in installer GPII-2338: package.json windows ref GPII-2338: Install and start service, removed listeners GPII-2338: Added service to the build. GPII-2338: Fixed service build. GPII-2338: Added the Windows service to the build
* upstream/master: GPII-3777: code review changes: removed extra comma GPII-3777: changed tabindex for more easier adding of test settings; added some tests for quick folders widget GPII-3777: Created new service button for the new url Quick Folders * Added all the needed code in order to provide the siteConfig to the widgets * Using the siteConfig's url to open it instead of the hard-coded one GPII-3773: added some comments GPII-3773: added gpii-express to dependencies GPII-3777: Added the quick folder url in the siteConfig commented unused psp tests; blank sign in/SP button GPII-3777: The button is there, and opens url in the browser (static url for now) GPII-3773: disabled sign in button
* upstream/master: NOJIRA: Fixing some linting errors NOJIRA: used correct syntax GPII-3682: changed tabindex for more easier adding of test settings; added some tests for screen capture widget GPII-3682: Added the proper member for the close button KeyboardEvent GPII-3682: Code review changes GPII-3682: Cleaning up the code GPII-3682: Fixed the head comments section GPII-3682: Simplifying the executeShareX function GPII-3682: Calling the new even through the channel listener in order to hide the QSS on screenshot (its working, but the QSS pops out in 1-2 seconds) GPII-3682: Cleaning the code GPII-3682: Finishing touches * Using the shareX path from siteConfig * Redesigned to match the design, everything moved to the message bundles * Renamed few of the functions and logs * Added all the required comments and definitions GPII-3682: Progress on the task > added new custom widget; > added function used to execute shell commands
Also, updated siteconfig.json according to ShareX location.
* upstream/master: GPII-3794: Changed the screen capture behavior from full screen, to selected region GPII-3786: Re-ordered per Gregg request; Saved space for the Open USB button (tabindex: 220) GPII-3788: Renamed the "Learn More..." links GPII-3786: Fixed the identical tabindexes, and move to a more convenient numbering system; also moved the Quick Folders button next to the system ones, because its a system one (no popup, etc.)
* upstream/master: GPII-3800: Couple of grammar changes
…ult language for qss
* amb26/GPII-3818: GPII-3818: Oops, invalid JSON5 committed
* origin/GPII-3997:
* upstream/master: GPII-4495 Adding reasonable defaults for situations where a new user has keyed-in and does not have any prefsSets yet.
* krisYanachkov/GPII-4384: GPII-4384: change cursor size values from boolean to number
Short-term fix for GPII-4384, see GPII#206 (comment)
* origin/GPII-4498: GPII-4498: Updated cloudFolder link
* sgithens/GPII-4494: GPII-4494 Cleaning up stray comments GPII-4494 Adding comments for model property capturing saving state GPII-4944 Typo in model listener function name GPII-4494 Setting the status of capture tool saving in progress in model.
* upstream/master: GPII-3958: update gpii-windows versionnpm NOJIRA: revert to function instead of 'changeListener' on tray tests GPII-3958: minor timeout adjustment for tests GPII-3958: cleaning the code GPII-3958: minor timeout adjustment for tests GPII-3958: use 'onPSPReadyForKeyIn' promise instead of timeout NOJIRA: Restored the default file for the StandardProfileUrl GPII-3958: replace with NOJIRA: lint error fix GPII-3958: fix tests GPII-3958: Added few comments and clarifications GPII-3958: Read the default setting values from PSPchannel and apply it to the qss
Some leftovers of the old defaultSettings logic that was in place before merging GPII#196 into master.
ShareX is no longer bundled into Morphic
|
CI job failed: https://ci.gpii.net/job/gpii-app-tests/1177/ |
|
Linting failure first: |
This is a leftover of GPII#115
Also, removed duped function declaration from a previous merge
|
CI job passed: https://ci.gpii.net/job/gpii-app-tests/1178/ |
|
CI job failed: https://ci.gpii.net/job/gpii-app-tests/1180/ |
…ely include Capture Tool
…to morphic-1.3.5 * sgithens/GPII-4489-enable-unable-capture: GPII-4489 Adding optional menu item generation to be able to selectively include Capture Tool GPII-4289: Fixed casing. NOJIRA: addressing code review comments NOJIRA: addressing code review comments GPII-4384: change default cursor size to 0 NOJIRA: update gpii-windows version NOJIRA: update gpii-windows version
|
CI job passed: https://ci.gpii.net/job/gpii-app-tests/1195/ |
|
CI job failed: https://ci.gpii.net/job/gpii-app-tests/1196/ |
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.
This is the working branch for Morphic 1.3.5 that is based on the 1.3.x branches - although it's getting closer to master.