Vishwas Shashidhar 3a8dae853b Merge branch 'master' into electron-194 ...

# Conflicts:
#	js/main.js

2017-11-10 10:44:07 +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-174 - Removed the label CSS as it was not being used

2017-11-05 10:43:51 +05:30

desktopCapturer

Electron-139 - Updated the if condition

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

dialogs

Electron-174 - implemented basic authentication for electron

2017-10-18 12:17:09 +05:30

downloadManager

Merge branch 'master' into electron-144

2017-10-05 15:55:45 +05:30

enums

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

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

menus

Electron-154 - Modified the code to open the main window after reading the config fields

2017-10-17 11:39:19 +05:30

notify

Electron-134 - Optimized CSS & made changes as per review comments

2017-11-05 10:23:40 +05:30

preload

Merge branch 'master' into electron-17

2017-10-06 14:04:03 +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-118 - removed the duplicate code block

2017-09-08 12:48:03 +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-139 - Updated the if condition

2017-11-09 14:55:54 +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

config.js

Merge branch 'master' into electron-194

2017-11-10 10:44:07 +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

Merge branch 'master' into electron-194

2017-11-10 10:44:07 +05:30

mainApiMgr.js

electron-97: refactored the code as per the ticket (points 2 & 6 covered)

2017-08-24 13:21:02 +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

Electron-139 - Disabled menu bar for pop-out windows

2017-11-09 12:53:49 +05:30