Vikas Shashidhar
3cf9226bf4
Revert "Merge pull request #269 from keerthi16/skynet"
...
This reverts commit 1388c835efc9d6229d6d
2017-12-28 17:29:27 +05:30
Vikas Shashidhar
d5f7073fef
Revert "Updating Master with Skynet"
2017-12-27 16:38:27 +05:30
Keerthi Niranjan
0c652be973
Merge remote-tracking branch 'upstream/master' into skynet
...
# Conflicts:
# js/windowMgr.js
# package.json
2017-12-27 14:52:53 +05:30
Kiran Niranjan
a9b2fd7874
Release for 2.2.0
...
Bug fixes
Admin whitelist config
2017-12-26 12:08:37 +05:30
Kiran Niranjan
d7f62a38b0
Electron-217
...
* Wrote some unit tests for isWhiteList
* Fixed some validation issues
2017-12-12 13:00:32 +05:30
Kiran Niranjan
84cb11e629
Electron-217
...
* Implemented basic logic on whitelisting urls
* Removed a space in PULL_REQUEST_TEMPLATE.md
2017-12-11 22:41:34 +05:30
Vikas Shashidhar
5e9464a5df
Bump up version.
2017-11-11 00:48:22 +05:30
Vikas Shashidhar
743ea33629
Bump up version.
2017-11-11 00:44:38 +05:30
Keerthi Niranjan
785e618e02
SEARCH-197
...
- Included npm lib and removed exe lib
2017-11-09 19:44:35 +05:30
Keerthi Niranjan
1bbb1f3ff0
Merge remote-tracking branch 'upstream/skynet' into SEARCH-197
...
# Conflicts:
# js/main.js
2017-11-07 15:00:14 +05:30
Keerthi Niranjan
fdaa6f840a
SEARCH-197
...
- Setting th env PATH to fix the child_process error
2017-11-07 14:08:47 +05:30
Vikas Shashidhar
48610c3681
Merge remote-tracking branch 'symphony/master' into skynet
...
# Conflicts:
# installer/win/Symphony-x64.aip
# js/main.js
# package.json
2017-11-07 13:31:03 +05:30
Vikas Shashidhar
71ec76b723
Merge pull request #222 from KiranNiranjan/ELECTRON-142
...
Electron-142 (Build Number)
2017-11-03 18:15:16 +05:30
Vikas Shashidhar
f390331134
Merge pull request #214 from KiranNiranjan/ELECTRON-154
...
Electron-154 (Menu items issue on windows)
2017-11-03 18:13:36 +05:30
Kiran Niranjan
714209f8f9
Electron-142 - Changed "buildVersion" key to "buildNumber"
2017-10-30 18:36:45 +05:30
Kiran Niranjan
564950ec92
Electron-142 - Included build version in the about app section
2017-10-30 14:25:33 +05:30
Vikas Shashidhar
4ce9ec2168
Bumped up version to 2.0.0
2017-10-18 12:06:10 +05:30
Keerthi Niranjan
a515ab3c35
SEARCH-197
...
- Removed archiver
- Removed extract-zip
- Implemented new compression algorithm (lz4)
2017-10-17 12:11:13 +05:30
Kiran Niranjan
4f4fc69f85
Electron-154 - Optimized reading config fields which fix the menu items issue on Windows
2017-10-16 16:54:20 +05:30
Vishwas Shashidhar
f5c2492da5
electron-151: pinned the electron version
2017-10-06 23:03:58 +05:30
Vishwas Shashidhar
6d49830c7e
Merge branch 'master' into electron-151
...
* master:
Electron-172 - Fixes the pop-out issue
electron-173: added dependencies to the advanced installer
electron-173: enabled spell checker
Electron-142 - Changed the symphony logo
Electron-142 - Moved inline styles to style tag
Updated window title
Electron-142 - Made changes as per review
Electron-142 - Made changes as per review
Updated comment
Change title to reflect new file display name as per Electron-144
Adds a count to the file name in the download manager if the user downloads a file with the same name.
Electron-142 - Added a new menu item to show application version details
Add tooltip to display full filename in download manager.
# Conflicts:
# package.json
2017-10-06 14:58:47 +05:30
Keerthi Niranjan
db286d9db0
SEARCH-273
...
- Added new library
- New attachments implementation
2017-10-06 13:06:38 +05:30
Keerthi Niranjan
718459c201
SEARCH-273
...
- Added new library
- New attachments implementation
2017-10-06 13:00:25 +05:30
Vishwas Shashidhar
0de7f8faad
electron-173: enabled spell checker
2017-10-06 09:28:12 +05:30
Vishwas Shashidhar
c498f4bd34
electron-151: added electron 1.7.8 as dependency
2017-10-03 21:21:01 +05:30
Vishwas Shashidhar
7985b68dfd
electron-158: added logic to disable spellchecker
2017-09-27 19:46:02 +05:30
Keerthi Niranjan
5ba7bff20a
SEARCH-206
...
- Removed node-forge lib
2017-09-12 13:45:38 +05:30
Vishwas Shashidhar
903820acb1
electron-126: fixes issues with user config changes on installation
2017-09-11 17:06:42 +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
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
7ab0f75e2e
electron-97: completed point 1 in refactoring
2017-08-23 22:08: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
0bc51c50b1
Merge remote-tracking branch 'upstream/skynet' into SEARCH-116-GCM
...
# Conflicts:
# package.json
2017-08-22 12:58:12 +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
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
Vishwas Shashidhar
d4807279f6
electron-113: implemented changes as per the use cases defined in the ticket
2017-08-18 17:59:03 +05:30
Kiran Niranjan
1d641fdf24
Electron-111 - Removed some internal dependencies of electron-spellchecker
2017-08-16 13:56:49 +05:30
Keerthi Niranjan
728bae9c07
Merge remote-tracking branch 'upstream/master' into SEARCH-154
...
# Conflicts:
# installer/win/Symphony-x64.aip
2017-08-16 10:32:55 +05:30
Keerthi Niranjan
f6ae42f854
SEARCH-116 - Temporary push
2017-08-14 10:47:01 +05:30
Kiran Niranjan
65cea1fb1f
Electron-47 - Resolved merge conflicts
2017-08-09 21:34:50 +05:30
Kiran Niranjan
3756d8e3b1
Merge remote-tracking branch 'upstream/master' into ELECTRON-47
...
# Conflicts:
# package.json
2017-08-09 21:31:54 +05:30
Keerthi Niranjan
6634e41953
Merge branch 'SEARCH-182' into SEARCH-154
...
# Conflicts:
# package.json
2017-08-07 12:20:00 +05:30
Keerthi Niranjan
bd595f7380
Implemented hash and cash tags search
2017-08-04 14:07:48 +05:30
Kiran Niranjan
2e943359bb
Electron-104 - Optimized async dependency in electron-notify
2017-08-04 11:58:06 +05:30
Keerthi Niranjan
3db7929d52
Moved library to a folder
2017-08-03 14:48:56 +05:30
Keerthi Niranjan
e80e791636
Added missing --dir for 32 build
2017-08-03 14:33:07 +05:30
Kiran Niranjan
c8ca074f92
Electron-47
...
1. Removed `electron-context-menu` from dependency
2. Added cld.node in app.asar.unpacked dir
3. Resolved conflicts
2017-08-02 16:17:30 +05:30
Keerthi Niranjan
5f0a6cd211
Fixed the pointer issue
...
Added query filter
2017-08-01 17:19:50 +05:30
Kiran Niranjan
e21f7adfaa
Electron-47
...
1. Fixed some issues with windows
2. Changed the arg from external to exclude
2017-08-01 12:19:59 +05:30
Keerthi Niranjan
2e90b8f67e
Added indexvalidator
2017-07-31 18:37:30 +05:30
