kiranniranjan cef30ff128 Merge remote-tracking branch 'upstream/master' into ELECTRON-249 ...

# Conflicts:
#	js/mainApiMgr.js

2018-01-18 16:34:56 +05:30

..

aboutApp

Electron-142 - Changed "buildVersion" key to "buildNumber"

2017-10-30 18:36:45 +05:30

activityDetection

electron-97: refactored the code as per the ticket (points 3 & 4 covered)

2017-08-24 16:18:32 +05:30

basicAuth

Electron-253

2017-12-28 17:18:00 +05:30

compressionLib

Revert "Merge pull request #269 from keerthi16/skynet"

2017-12-28 17:29:27 +05:30

cryptoLib

Merge remote-tracking branch 'upstream/master' into SEARCH-569

2018-01-10 10:36:22 +05:30

desktopCapturer

Electron-139 - Updated the if condition

2017-11-09 14:55:54 +05:30

dialogs

Electron-206 - Added code comments

2017-11-09 19:09:52 +05:30

downloadManager

electron-205: fixes the already fixed issue post merge conflict regression

2017-12-29 12:48:19 +05:30

enums

Electron-228 - Changed the event name and optimized code

2018-01-18 14:55:11 +05:30

menus

Electron-262 - Updated display text for both Mac and Windows

2018-01-17 15:23:50 +05:30

notify

Electron-249 - Updated API work flow

2018-01-08 16:43:10 +05:30

preload

Merge remote-tracking branch 'upstream/master' into ELECTRON-249

2018-01-18 16:34:56 +05:30

protocolHandler

electron-97: refactored the code as per the ticket (points 3 & 4 covered)

2017-08-24 16:18:32 +05:30

screenSnippet

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

search

SEARCH-569

2018-01-18 14:31:04 +05:30

spellChecker

electron-97: refactored the code as per the ticket (points 3 & 4 covered)

2017-08-24 16:18:32 +05:30

utils

Electron-217

2017-12-21 13:52:05 +05:30

badgeCount.js

electron-97: refactored the code as per the ticket (points 3 & 4 covered)

2017-08-24 16:18:32 +05:30

bringToFront.js

Electron-249 - Updated API work flow

2018-01-08 16:43:10 +05:30

config.js

Electron-217

2017-12-21 12:53:57 +05:30

eventEmitter.js

Electron-56 (Always on top) (#127)

2017-06-15 10:11:29 -07:00

log.js

electron-97: fixed logging issues for unit tests and added documentation in the README

2017-08-24 17:16:12 +05:30

main.js

Electron-156

2017-12-30 12:49:39 +05:30

mainApiMgr.js

Merge remote-tracking branch 'upstream/master' into ELECTRON-249

2018-01-18 16:34:56 +05:30

memoryMonitor.js

electron-97: refactored the code as per the ticket (points 3 & 4 covered)

2017-08-24 16:18:32 +05:30

windowMgr.js

Merge remote-tracking branch 'upstream/master' into ELECTRON-249

2018-01-17 15:24:27 +05:30