Commit Graph

1951 Commits

Author SHA1 Message Date
Kiran Niranjan
eb94467220 fix: SDA-2644 - Resolve conflicts and add new changes 2020-11-24 10:45:11 +01:00
Kiran Niranjan
cd60ae268a fix: SDA-2644 - Fix snippet window resize issue based on screen size 2020-11-24 10:43:47 +01:00
psjostrom
c1777e1e4a
Merge pull request #1122 from psjostrom/SDA-2533-Translation
fix: SDA-2625 Fixed japanese screensnippet translation
2020-11-24 10:39:30 +01:00
psjostrom
e75b2952b0 Fixed japanese screensnippet translation 2020-11-24 10:16:38 +01:00
Johan Kwarnmark
2dd67e7954
Merge pull request #1121 from johankwarnmarksymphony/sda-2625
fix: sda-2625 Update translation
2020-11-23 13:04:49 +01:00
Johan Kwarnmark
bfc6be275b sda-2625 Update translation 2020-11-23 12:31:55 +01:00
Johan Kwarnmark
c1e31ef4a4
Merge pull request #1120 from johankwarnmarksymphony/sda-2694-3
fix: setBounds make the application unresponsive and not usable
2020-11-20 13:34:46 +01:00
Johan Kwarnmark
390a2722fd setBounds make the application unresponsive and not usable 2020-11-20 13:00:49 +01:00
psjostrom
167bd14191
Merge pull request #1117 from psjostrom/SDA-2533-Annotate-p2
feat: SDA-2533 Add clear, erase and done functionality.
2020-11-20 09:36:42 +01:00
psjostrom
237341d805 SDA-2533 Fixes after code review 2020-11-20 09:27:52 +01:00
psjostrom
064b9b53b2 SDA-2533 Add clear, erase and done functionality. Further optimizations of logic. 2020-11-20 09:16:17 +01:00
Kiran Niranjan
6811683e29
fix: SDA-2644 (Fix snippet window resize issue based on screen size) (#1115)
* fix: SDA-2644 - Fix snippet window resize issue based on screen size

* fix: SDA-2644 - Resolve conflicts and add new changes

* fix: SDA-2644 - fix background for min width

* fix: SDA-2644 - Limit snippet window size base on screen size
2020-11-19 19:04:08 +05:30
mattias-symphony
c6586965a4
Merge pull request #1116 from mattias-symphony/SDA-2651c
fix: SDA-2651 Using EndSession message to terminate SDA on uninstall
2020-11-19 11:47:08 +01:00
mattias-symphony
277ac9cac8
Merge branch 'master' into SDA-2651c 2020-11-19 08:20:28 +01:00
Mattias Gustavsson
58e895cff6 SDA-2651 Using EndSession message to terminate SDA on uninstall 2020-11-19 08:16:06 +01:00
psjostrom
d5850e9edb
Merge pull request #1112 from psjostrom/SDA-2533-Add-Annotate-To-Screenshot
feat: SDA-2533 add annotate to screenshot
2020-11-17 09:32:34 +01:00
psjostrom
794334ef90
Merge branch 'master' into SDA-2533-Add-Annotate-To-Screenshot 2020-11-17 09:26:06 +01:00
mattias-symphony
b02e72e854
Merge pull request #1114 from mattias-symphony/SDA-2681
fix: SDA-2681 Ensuring correct paths and function for silent install
2020-11-17 08:47:28 +01:00
mattias-symphony
2f03d802b0
Merge branch 'master' into SDA-2681 2020-11-17 07:55:30 +01:00
Kiran Niranjan
33ed6f709c
feat: SDA-2652 - add new API to set if running in mana client (#1113) 2020-11-17 11:51:31 +05:30
Mattias Gustavsson
46cb165e22 SDA-2681 Ensuring correct paths and function for silent install 2020-11-16 13:41:57 +01:00
psjostrom
5545f051f0
Merge branch 'master' into SDA-2533-Add-Annotate-To-Screenshot 2020-11-13 14:47:53 +01:00
psjostrom
31e77cb2d2 SDA-2533 Adding annotate to screen shot. 2020-11-13 14:41:20 +01:00
Johan Kwarnmark
18e4b79f8e
Merge pull request #1110 from johankwarnmarksymphony/sda-2270
chore: SDA-2270: change clientVersion to sbeVersion
2020-11-12 18:23:04 +01:00
psjostrom
7becbbed94 Annotate WIP 2020-11-12 13:42:06 +01:00
mattias-symphony
f759e0ea81
Merge pull request #1111 from mattias-symphony/SDA-2651b
fix: SDA-2651 fix a crash on the 1st time uninstallation
2020-11-12 10:51:28 +01:00
mattias-symphony
e88e22f730
Merge branch 'master' into SDA-2651b 2020-11-12 08:13:48 +01:00
Mattias Gustavsson
af3f11d239 SDA-2651b Force killing Symphony 2020-11-11 15:44:50 +01:00
Johan Kwarnmark
5f927e5d57 sda-2270 update the test 2020-11-10 16:51:41 +01:00
Johan Kwarnmark
c14a9a9ec9 sda-2270 removed merge problem line 2020-11-10 16:40:18 +01:00
Johan Kwarnmark
9db457e1ef sda-2270 removed merge problem line 2020-11-10 16:36:04 +01:00
Johan Kwarnmark
be09caeb81
Update src/renderer/components/about-app.tsx
Co-authored-by: Kiran Niranjan <kiranleo1992@gmail.com>
2020-11-10 16:33:14 +01:00
Johan Kwarnmark
ff1bda00b6 sda-2270 change clientVersion to sbeVersion 2020-11-10 15:51:07 +01:00
Vishwas Shashidhar
3700c8b9ee
SDA-2451: run snyk monitor on build scripts (#1109) 2020-11-10 15:11:39 +05:30
psjostrom
8ea3d6ae74
Merge pull request #1107 from psjostrom/SDA-2402-Annotate-Screenshot-Tool
feat: SDA-2532 Work on state for annotate and adding color picker
2020-11-09 11:55:07 +01:00
psjostrom
6cc3717f4b
Merge branch 'master' into SDA-2402-Annotate-Screenshot-Tool 2020-11-09 10:58:35 +01:00
Johan Kwarnmark
07212cd9ba
Merge pull request #1108 from johankwarnmarksymphony/sda-2657
fix: SDA-2657 remove red frame and screen sharing indicator when reloading
2020-11-09 10:42:20 +01:00
psjostrom
153973862a SDA-2402 Updated snapshot test 2020-11-09 09:15:07 +01:00
psjostrom
87de146c07 SDA-2402 Work on state for annotate and adding color picker 2020-11-06 17:17:48 +01:00
Johan Kwarnmark
fd0ef8593c sda-2657 remove redframe and screen sharing indicator when reloading 2020-11-06 16:55:18 +01:00
mattias-symphony
1451adaf56
Merge pull request #1106 from mattias-symphony/SDA-2651
fix: SDA-2651 fix a crash on the 1st time uninstallation
2020-11-06 08:23:39 +01:00
mattias-symphony
16c3ebf741
Merge branch 'master' into SDA-2651 2020-11-06 08:13:42 +01:00
Vishwas Shashidhar
198d891c94
feat: SDA-2456: add screen annotate tool (#1103)
* SDA-2456: snipping tool component

- Create a react component
- Stylise the component
- Add functionality to open a new window
- Add event against the `Done` button and upload snippet

* SDA-2456: snipping annotate tool

- Added icons for undo, redo & clear
- Made the snipping tool window & the image container dynamic

* SDA-2456: make image dynamic

* SDA-2456: add snapshot tests

* SDA-2456: add the height & width properties to the image container

* SDA-2456: update snipping tool snapshot

* SDA-2456: add support for button selected border

* SDA-2456: close existing annotate window

* SDA-2456 Changed from class to functional component

* SDA-2456: remove outdated tests

* SDA-2456: fix image dimension issue

* SDA-2456: address PR comments by Kiran

Co-authored-by: psjostrom <per.sjostrom@symphony.com>
2020-11-06 12:13:29 +05:30
mattias-symphony
cb85e89b31
Merge branch 'master' into SDA-2651 2020-11-05 15:50:12 +01:00
Mattias Gustavsson
dfb3bdfdc0 SDA-2651 Added second termination step 2020-11-05 15:23:35 +01:00
mattias-symphony
3145631864
Merge pull request #1105 from mattias-symphony/SDA-2593b
fix: SDA-2593 Disabled cancel button in progress dialog
2020-11-04 14:43:41 +01:00
mattias-symphony
cb1c21c768
Merge branch 'master' into SDA-2593b 2020-11-04 14:07:38 +01:00
Mattias Gustavsson
46a253923b SDA-2593 Disabled cancel button in progress dialog 2020-11-04 14:04:13 +01:00
Vishwas Shashidhar
9815796cca
SDA-2170: set context isolation to true by default (#1104) 2020-11-04 16:56:10 +05:30
mattias-symphony
a30df2d969
Merge pull request #1102 from mattias-symphony/SDA-2593
feat: SDA-2593: new design for a simplified installer flow
2020-11-02 14:10:47 +01:00