Commit Graph

809 Commits

Author SHA1 Message Date
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
Keerthi Niranjan
761875559c SEARCH-563
- Typo
2018-01-09 14:25:30 +05:30
Keerthi Niranjan
b32c7784ea SEARCH-563
- Fixed unit tests
2018-01-09 14:20:29 +05:30
Keerthi Niranjan
7b71c8f2dc Merge remote-tracking branch 'upstream/master' into SEARCH-563 2018-01-09 13:38:21 +05:30
Keerthi Niranjan
77ac2102d4 SEARCH-563
- Deleting the tmp files
2018-01-09 13:37:03 +05:30
Vikas Shashidhar
d3f6877b7a
Merge pull request #281 from keerthi16/SEARCH-538
SEARCH-538 (Unit tests / Code refactoring)
2018-01-09 13:17:23 +05:30
Keerthi Niranjan
63b2fe25bd SEARCH-538
- Review comments
2018-01-08 17:38:58 +05:30
Kiran Niranjan
5fd75ab5fa Electron-249 - moved config fields to a constant 2018-01-08 17:15:24 +05:30
Keerthi Niranjan
252047891e SEARCH-538
- Review comments
2018-01-08 16:57:18 +05:30
Kiran Niranjan
ab6a4fdc6a Electron-249 - Updated API work flow 2018-01-08 16:43:10 +05:30
Vikas Shashidhar
1638cfc36c
Merge pull request #284 from VishwasShashidhar/electron-258
electron-258: fixes the pop out issue for meetings and supports undefined urls in case of new window events as per the html dom specs
2018-01-08 12:03:16 +05:30
Kiran Niranjan
92076ce9c7 Electron-249 - Fixed new line issue in setting plugin 2018-01-05 23:40:32 +05:30
Kiran Niranjan
cb324c17dd Electron-249 - added "npm run test" to unpacked-mac 2018-01-05 17:44:19 +05:30
Kiran Niranjan
5ef535d88e Electron-249 - Implemented a new feature that brings electron wrapper when a user receives a notification 2018-01-05 17:42:43 +05:30
Vishwas Shashidhar
f250185067 electron-258: made changes as per the PR recommendation 2018-01-04 23:00:08 +05:30
Vishwas Shashidhar
966b1f712f Merge branch 'master' into electron-258 2018-01-04 22:49:05 +05:30
Vikas Shashidhar
73dbd98f4e
Merge pull request #282 from KiranNiranjan/ELECTRON-231
Electron-231 (Fixes the installer config issue on Windows)
2018-01-03 16:37:36 +05:30
Vikas Shashidhar
6ca2aaa227
Merge pull request #280 from KiranNiranjan/ELECTRON-222
Electron-222 (Fixes Notifications Javascript Error)
2018-01-03 16:32:08 +05:30
Vikas Shashidhar
6e00eff02f
Merge pull request #270 from KiranNiranjan/ELECTRON-250
Electron-250 (Updated the installer bundle)
2018-01-03 16:30:48 +05:30
Vishwas Shashidhar
0edc3d01e2 electron-258: fixes the pop out issue for meetings and supports undefined urls in case of new window events as per the html dom specs 2018-01-02 17:00:12 +05:30
kiranniranjan
e835f8f97f Merge remote-tracking branch 'upstream/master' into ELECTRON-222 2018-01-02 14:33:31 +05:30
Kiran Niranjan
22d913f6c1 Electron-222 - Removed the code which was deleting the method on args 2018-01-02 14:32:40 +05:30
Kiran Niranjan
742dcf2517 Electron-250
Renamed the variables as per the review
2018-01-02 13:00:28 +05:30
Vikas Shashidhar
2855c9b2df
Merge pull request #283 from KiranNiranjan/ELECTRON-156
Electron-156 (Updated Protocol Validation)
2018-01-02 12:51:38 +05:30
kiranniranjan
7d1bbc9107 Merge remote-tracking branch 'upstream/master' into ELECTRON-250 2018-01-02 12:44:07 +05:30
Vikas Shashidhar
4510a35eb1
Merge pull request #276 from KiranNiranjan/ELECTRON-253
Electron-253 (Basic auth issue)
2018-01-02 12:24:27 +05:30
Keerthi Niranjan
4322615e6b SEARCH-538
- Included two new tests
2018-01-02 10:12:14 +05:30
Kiran Niranjan
2c3b35270b Electron-156
Updated the code not to encode the URL and just validate the protocol
2017-12-30 12:49:39 +05:30
Kiran Niranjan
9010c341cb Electron-231
Fixes the installer config issue on Windows
2017-12-29 17:55:42 +05:30
Keerthi Niranjan
988439b780 SEARCH-538
- User config unit tests
2017-12-29 17:36:40 +05:30