1.3.2 release branch - DO NOT MERGE :P #185
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
# Conflicts: # package.json # provisioning/Installer.ps1
# Conflicts: # package.json
# Conflicts: # package.json # provisioning/Installer.ps1
# Conflicts: # package.json
# Conflicts: # package.json # provisioning/Build.ps1
# Conflicts: # package.json
# Conflicts: # package.json
# Conflicts: # package.json
* 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
# Conflicts: # package.json
* upstream/master: GPII-4253: Made OS-whitelisted gpii-windows package an optional dependency GPII-4139: Code review changes GPII-4139: Last second visual fixes GPII-4139: fix minor bug GPII-4139: Fixes of the button labels GPII-4139: Code review changes and adjustments
* stegru/GPII-3853: GPII-3853: Capturing activation of QSS buttons. GPII-3853: Capturing office simplification changes
…numbers in Elasticsearch.
* upstream/master: GPII-4287: Moved the close button on the about dialog GPII-4286: The url changed
* stegru/GPII-3853: GPII-3853: Removed trailing comma GPII-3853: Fixed some fields which where incorrectly being stored as numbers in Elasticsearch.
* stegru/GPII-3853: GPII-3853: Forced setting-changed value to be a string.
* stegru/GPII-3853: GPII-3853: Added metric for sideCar open/close GPII-3853: Removed double raising of the volume change event when mute is toggled. GPII-3853: Correctly recording values that are 0 or false.
# Conflicts: # package.json
This update brings the new changes on GPII-4244
* stegru/GPII-4244:
This update brings the new changes from stegru/GPII-4244
|
CI job failed: https://ci.gpii.net/job/gpii-app-tests/1002/ |
|
I guess we can close this now? |
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.
No description provided.