Commit Graph

2899 Commits

Author SHA1 Message Date
Vishwas Shashidhar
a1b11074cf electron-126: made changes to mac installation config use cases 2017-09-08 15:27:41 +05:30
Keerthi Niranjan
698e1a3b32 SEARCH-155
Index real-time data.

- safety checks
- removed lodash isobject
2017-09-08 14:45:55 +05:30
Kiran Niranjan
b3300bb9e3 Electron-118 - removed the duplicate code block 2017-09-08 12:48:03 +05:30
Kiran Niranjan
59666767d2 Electron-118 - Implemented a method to disable always on top while using screen snippet (windows) 2017-09-07 23:45:10 +05:30
Vikas Shashidhar
771bbace66 Merge pull request #183 from VikasShashidhar/electron-127
Electron 127: Fine tune Preload Script
2017-09-07 21:33:50 +05:30
Vishwas Shashidhar
2d0ed985d6 Merge branch 'electron-113' into electron-126 2017-09-07 14:51:23 +05:30
Keerthi Niranjan
f1122c35d3 SEARCH-155
Index real-time data.

- removed the array for the message
2017-09-07 14:08:12 +05:30
Vishwas Shashidhar
2336ca0b7d electron-126: added logging in config file 2017-09-07 13:13:19 +05:30
Vishwas Shashidhar
683962ee03 electron-126: added code documentation 2017-09-06 22:19:44 +05:30
Vishwas Shashidhar
69d6c40ac3 Merge branch 'master' into electron-126 2017-09-06 22:10:20 +05:30
Vishwas Shashidhar
a89862be06 Merge branch 'master' into electron-113 2017-09-06 22:08:17 +05:30
Vishwas Shashidhar
1049807a14 electron-126: implemented changes for single user install in user config 2017-09-06 22:06:00 +05:30
Vikas Shashidhar
8536b2d317 Removed a workaround which was required to overcome the prevention of using the "will-navigate" event in a sandboxed environment. 2017-09-05 19:19:10 +05:30
Vikas Shashidhar
caa4e24032 Merge pull request #182 from KiranNiranjan/ELECTRON-125
Electron-125 (Electron Screen Share)
2017-09-05 18:23:25 +05:30
Keerthi Niranjan
652a3389f3 SEARCH-155
Index real-time data.

- Read messages from data feed
- Index the messages in real-time index.
2017-09-05 17:21:23 +05:30
Vishwas Shashidhar
55c3714b2b electron-113: fixes the issues raised by qa. 2017-09-05 11:26:42 +05:30
Vikas Shashidhar
4e9b8e9890 Merge branch 'master' of github.com:VikasShashidhar/SymphonyElectron 2017-09-04 17:13:40 +05:30
Vikas Shashidhar
56bebd0ee9 Pushing updated package file 2017-09-04 17:13:29 +05:30
Vikas Shashidhar
e9aab5b552 Added package-lock.json 2017-09-04 17:13:29 +05:30
Kiran Niranjan
363017bdf9 Electron-125 - Flipped the condition 2017-09-01 21:59:26 +05:30
Kiran Niranjan
0b003d1df9 Electron-125 - Flipped the condition 2017-09-01 21:35:38 +05:30
Kiran Niranjan
6b158dd21d Electron-125 - Fixed desktop capturer issue which was caused by a regression 2017-09-01 19:35:52 +05:30
Vikas Shashidhar
35177567ce Merge pull request #179 from VishwasShashidhar/electron-113
Electron 113 (User Config Changes)
2017-09-01 14:41:59 +05:30
Vishwas Shashidhar
5e67987696 ELECTRON-113: added documentation 2017-09-01 13:56:02 +05:30
Vishwas Shashidhar
526c7cc1c9 Merge branch 'master' into electron-113
# Conflicts:
#	js/main.js
#	package.json
2017-09-01 12:53:10 +05:30
Vikas Shashidhar
112725df7c Merge pull request #181 from keerthi16/Search-154-Search-116
Search-154 & Search-116 (Changed encryption implementation)
2017-08-29 21:44:51 +05:30
Vikas Shashidhar
4dc499cb83 Merge pull request #180 from VishwasShashidhar/electron-97
Electron 97 (Refactoring)
2017-08-29 21:04:51 +05:30
Vikas Shashidhar
5d6f8fe823 Merge branch 'master' of github.com:symphonyoss/SymphonyElectron into skynet
Sync master into skynet
2017-08-28 17:50:51 +05:30
Keerthi Niranjan
59505ed93d SEARCH-154 & SEARCH-116
1. Serialized the messages array from the client app
2017-08-28 14:18:48 +05:30
Keerthi Niranjan
c8b45e091e SEARCH-154 & SEARCH-116
1. Getting the key and the userId from the client app
2. Creating a encrypted file as soon as the batch indexes are merged
3. Deleting the data folder when the quits
4. Few changes in the encryption and decryption
2017-08-28 12:13:58 +05:30
Vishwas Shashidhar
b502d65de2 electron-97: fixed logging issues for unit tests and added documentation in the README 2017-08-24 17:16:12 +05:30
Vishwas Shashidhar
1819b7f82d electron-97: refactored the code as per the ticket (point 5 i.e. local logging covered) 2017-08-24 16:52:32 +05:30
Vishwas Shashidhar
d566e38b6a electron-97: removed console log statements in the spectron tests 2017-08-24 16:31:09 +05:30
Vishwas Shashidhar
5f557247a7 electron-97: refactored the code as per the ticket (points 3 & 4 covered) 2017-08-24 16:18:32 +05:30
Vishwas Shashidhar
28bd9399aa electron-97: refactored the code as per the ticket (points 2 & 6 covered) 2017-08-24 13:21:02 +05:30
Vishwas Shashidhar
7ab0f75e2e electron-97: completed point 1 in refactoring 2017-08-23 22:08:33 +05:30
Vishwas Shashidhar
f2909cdebd electron-113: refactored the code as per PR comments 2017-08-23 14:32:58 +05:30
Vishwas Shashidhar
8aa5f50459 Merge branch 'master' into electron-113
* master:
  Electron-114 - Added a condition to not include reload in context menu when clicked on links
2017-08-22 21:29:42 +05:30
Vishwas Shashidhar
a52cce2104 electron-113: fixed indentation issues 2017-08-22 21:27:33 +05:30
Vishwas Shashidhar
bb939d77ee electron-113: fixed issues w.r.t. reinstall cases on windows 2017-08-22 21:18:21 +05:30
Keerthi Niranjan
8d73e930ed SEARCH-154 & SEARCH-116
1. Hardcoded the key and userId for now
2017-08-22 16:34:57 +05:30
Vikas Shashidhar
5d6a3670a2 Merge pull request #178 from KiranNiranjan/ELECTRON-114
Electron-114 (Reload Context Menu)
2017-08-22 13:59:24 +05:30
Vikas Shashidhar
1f2939545b Merge pull request #177 from keerthi16/SEARCH-116-GCM
Search-116 (Implement Encryption and Decryption of Index)
2017-08-22 13:02:17 +05:30
Keerthi Niranjan
0bc51c50b1 Merge remote-tracking branch 'upstream/skynet' into SEARCH-116-GCM
# Conflicts:
#	package.json
2017-08-22 12:58:12 +05:30
Keerthi Niranjan
8c1c599699 SEARCH-116-GCM
1. Fixed userData path issue
2017-08-22 12:45:06 +05:30
Vikas Shashidhar
9e26aa9d45 Merge pull request #176 from keerthi16/SEARCH-154
Search-154 (initial commit)
2017-08-21 21:31:09 +05:30
Keerthi Niranjan
b36b546c3d SEARCH-116-GCM
1. Renamed the encrypted file
2017-08-21 16:12:42 +05:30
Vikas Shashidhar
e802ecefc5 Pushing updated package file 2017-08-21 15:47:39 +05:30
Vikas Shashidhar
50b79df1ce Added package-lock.json 2017-08-21 15:39:01 +05:30
Keerthi Niranjan
e01e334fa9 SEARCH-116-GCM
1. Removed the key creation in crypto
2. Hash SHA256
3. Changed the encrypted zip name
2017-08-21 13:39:07 +05:30