Commit Graph

738 Commits

Author SHA1 Message Date
Vishwas Shashidhar
de8d062f8c ELECTRON-274: fix as per pr comments 2018-02-23 17:15:31 +05:30
Vishwas Shashidhar
f0222b0101 ELECTRON-274: fix issue. 2018-02-23 17:01:16 +05:30
Vikas Shashidhar
8813e19240
Merge pull request #305 from VishwasShashidhar/ELECTRON-279
Electron 279: add disable gpu switches
2018-02-20 09:52:01 +05:30
Vishwas Shashidhar
ae7fd4edab Merge branch 'master' into ELECTRON-261 2018-02-19 15:58:28 +05:30
Vikas Shashidhar
8dfb726381
Merge pull request #300 from VishwasShashidhar/ELECTRON-305
ELECTRON-305: Upgrade to electron 1.8.2
2018-02-19 10:49:12 +05:30
Vikas Shashidhar
f23ed615a7
Merge pull request #301 from keerthi16/SEARCH-605-new
SEARCH-605 (Electron - Cannot enable swift search on Windows 7)
2018-02-16 15:38:47 +05:30
Keerthi Niranjan
70f37644e9 Merge remote-tracking branch 'upstream/master' into SEARCH-605-new
# Conflicts:
#	js/search/searchConfig.js
2018-02-16 15:34:29 +05:30
Vikas Shashidhar
182465ef7f
Merge pull request #302 from keerthi16/SEARCH-622
SEARCH-622 (Remove the "randomString" dependency from electron & refactoring)
2018-02-16 15:16:55 +05:30
Keerthi Niranjan
b789a0a855 SEARCH-622
- Review comments
2018-02-16 13:55:57 +05:30
Keerthi Niranjan
6449393c7f SEARCH-605
- Changed the check
2018-02-16 13:44:52 +05:30
Keerthi Niranjan
48fe7a6fbe SEARCH-605
- Review comments fix
2018-02-16 13:32:50 +05:30
Keerthi Niranjan
5c1674070a SEARCH-622
- Updated tests
2018-02-16 12:43:54 +05:30
Keerthi Niranjan
391b3e13ea SEARCH-622
- Removed the randomString library and included custom file
- Made some refactoring which was exposing the path which can be deleted from anywhere
2018-02-16 12:34:03 +05:30
Keerthi Niranjan
a71a62720d SEARCH-605
- return resolve missing
2018-02-15 14:00:53 +05:30
Keerthi Niranjan
0ee004ccf1 SEARCH-605
- Updated unit tests
2018-02-15 12:20:52 +05:30
Keerthi Niranjan
ba342d571e SEARCH-605
- Permission error on windows 7 temporary fix
2018-02-15 11:06:49 +05:30
Vishwas Shashidhar
55995635f4 ELECTRON-305: Upgrade to electron 1.8.2 2018-02-08 16:35:31 +05:30
Vikas Shashidhar
9ca227ccb9
Merge pull request #293 from KiranNiranjan/ELECTRON-284
Electron-284 (Changed the bring to front API)
2018-02-07 16:04:54 +05:30
Vikas Shashidhar
6bdeaf0ed9
Merge pull request #296 from VishwasShashidhar/ELECTRON-299
ELECTRON-299: upgrade to Electron 1.7.12
2018-02-06 17:51:45 +05:30
Vishwas Shashidhar
3c4ae0615e ELECTRON-261: removed extra attributes
removed extra attributes in the config file as per PR suggestion.
2018-02-06 17:35:06 +05:30
Vishwas Shashidhar
e060fca591 ELECTRON-299: upgrade to Electron 1.7.12
Electron 1.7.12 adds a security fix for windows apps.
2018-02-02 15:20:46 +05:30
Vikas Shashidhar
44edb200e4
Merge pull request #295 from VishwasShashidhar/ELECTRON-286
electron-286: upgrade electron version to 1.7.11
2018-01-29 14:49:17 +05:30
Vishwas Shashidhar
bbc2228365 ELECTRON-261: remove unused import 2018-01-27 16:26:49 +05:30
Vishwas Shashidhar
d3b95f70e9 ELECTRON-261: add logic to get gpu related flags from config file 2018-01-25 22:59:25 +05:30
Vishwas Shashidhar
3ffc69b1a1 electron-286: upgrade electron version to 1.7.11
this new electron version fixes security issues
2018-01-24 17:02:54 +05:30
Vishwas Shashidhar
7f0f5f8449 electron-261: add gpu switches
for windows environments to ensure screen-sharing doesn't break with multiple monitors, we add flags to disable gpu
2018-01-23 16:38:44 +05:30
Kiran Niranjan
e25c3c6c01 Electron-284 Added an new api for bring to front feature 2018-01-23 13:47:17 +05:30
Vikas Shashidhar
c90fd8d886
Merge pull request #286 from KiranNiranjan/ELECTRON-249
Electron-249 (Bring Wrapper to Front)
2018-01-18 16:59:48 +05:30
kiranniranjan
81c8fdf7a5 Electron-249 Resolved conflicts 2018-01-18 16:40:07 +05:30
kiranniranjan
cef30ff128 Merge remote-tracking branch 'upstream/master' into ELECTRON-249
# Conflicts:
#	js/mainApiMgr.js
2018-01-18 16:34:56 +05:30
Vikas Shashidhar
aa1de21773
Merge pull request #292 from KiranNiranjan/ELECTRON-228
Electron-228 (Fixes Screen Snippet Reload Issue)
2018-01-18 16:14:46 +05:30
kiranniranjan
ad700f2d82 Electron-228 - Changed the event name and optimized code 2018-01-18 14:55:11 +05:30
Vikas Shashidhar
cb864b3f1c
Merge pull request #291 from keerthi16/SEARCH-569
SEARCH-569 (Index Version)
2018-01-18 14:33:36 +05:30
Keerthi Niranjan
26a5b1d22f SEARCH-569
- Updated indexVersion
2018-01-18 14:31:04 +05:30
kiranniranjan
20e1f0b6ca Electron-228 - Added an event to terminate screen snippet process whenever the main window is reloaded/navigated 2018-01-18 12:53:27 +05:30
kiranniranjan
fdb397d343 Merge remote-tracking branch 'upstream/master' into ELECTRON-249 2018-01-17 15:24:27 +05:30
kiranniranjan
605fad25c0 Electron-262 - Updated display text for both Mac and Windows 2018-01-17 15:23:50 +05:30
Keerthi Niranjan
253aee2ac6 SEARCH-569
- Updated indexVersion
2018-01-12 17:31:59 +05:30
Keerthi Niranjan
27cab1ab93 SEARCH-569
- Fixed tests for Windows
2018-01-12 16:32:18 +05:30
Keerthi Niranjan
fdad87b22a SEARCH-569
- Fixed tests for Windows
2018-01-12 14:09:19 +05:30
Keerthi Niranjan
68f65248d7 SEARCH-569
- Fixed tests for Windows
2018-01-12 12:23:34 +05:30
Vikas Shashidhar
665f35b08e
Merge pull request #290 from KiranNiranjan/ELECTRON-262
Electron-262 (Fixes Badge Count Issue)
2018-01-10 20:57:33 +05:30
kiranniranjan
26c1bc91dd Electron-262
Updated the code comment
2018-01-10 18:14:06 +05:30
Vikas Shashidhar
4d50a9d7fb
Merge pull request #289 from keerthi16/SEARCH-569
SEARCH-569 (Remove the version from user index folder name)
2018-01-10 17:40:38 +05:30
kiranniranjan
a3af9abdf9 Electron-262
Implemented a method to reset badge count on window navigation/reload
2018-01-10 16:48:43 +05:30
Keerthi Niranjan
df277cd4e4 Merge remote-tracking branch 'upstream/master' into SEARCH-569
# Conflicts:
#	js/cryptoLib/index.js
2018-01-10 10:36:22 +05:30
Vikas Shashidhar
d49cffb185
Merge pull request #288 from keerthi16/SEARCH-563
SEARCH-563 (Deleting the temp files)
2018-01-10 10:22:19 +05:30
Keerthi Niranjan
e9a89ff429 SEARCH-569
- Fixed tests
2018-01-10 10:15:03 +05:30
Keerthi Niranjan
181fa7b767 SEARCH-569
- Review comments fix
2018-01-09 19:59:00 +05:30
Keerthi Niranjan
603d74c5b9 SEARCH-569
- Removing the version information from user index folder
2018-01-09 16:16:59 +05:30