Commit Graph

408 Commits

Author SHA1 Message Date
Kiran Niranjan
f5ab7035e6 Merge remote-tracking branch 'upstream/master' into ELECTRON-134 2017-11-04 00:11:09 +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
Vikas Shashidhar
8fb57d2375
Merge pull request #207 from VishwasShashidhar/electron-141
Electron 141: fix on url validation issue on installer
2017-10-31 15:36:30 +05:30
Vikas Shashidhar
1a848d2c11
Merge pull request #223 from KiranNiranjan/ELECTRON-196
Electron-196 (Pop-out min-height)
2017-10-31 15:32:43 +05:30
Kiran Niranjan
96e30a41d9 Electron-196 - Updated default pop-out window size and min height 2017-10-31 10:20:44 +05:30
Kiran Niranjan
714209f8f9 Electron-142 - Changed "buildVersion" key to "buildNumber" 2017-10-30 18:36:45 +05:30
Kiran Niranjan
450992cdf8 Electron-142 - setting 'N/A' if version number is not available 2017-10-30 18:06:42 +05:30
Kiran Niranjan
564950ec92 Electron-142 - Included build version in the about app section 2017-10-30 14:25:33 +05:30
Kiran Niranjan
48bad2eddb Electron-134 - setting the pod information empty until the back is ready 2017-10-26 14:29:37 +05:30
Kiran Niranjan
69a1e94445 Merge remote-tracking branch 'upstream/master' into ELECTRON-134 2017-10-26 09:58:24 +05:30
Vikas Shashidhar
eee6fe8bc9 Merge pull request #221 from KiranNiranjan/ELECTRON-181
Electron-181 (Error: Object has been destroyed)
2017-10-25 18:41:27 +05:30
Vishwas Shashidhar
4beefbaed6 electron-141: added logic in the mac installer to prepend protocol for a url in case of absence of one 2017-10-25 15:08:19 +05:30
Vishwas Shashidhar
a85d15e21d electron-141: added logic to prepend protocol if it is missing during the installation process 2017-10-25 14:02:07 +05:30
Kiran Niranjan
89767363c5 Electron-181 - Removed the unwanted closeAll function which was throwing an error 2017-10-25 13:30:46 +05:30
Vishwas Shashidhar
f29d09301f electron-141: enabled digital signing in AIP 2017-10-25 12:15:28 +05:30
Vishwas Shashidhar
cf3dda3022 electron-141: added logic to validate pod url via JScript and removed C sharp dependencies 2017-10-25 12:14:28 +05:30
Vishwas Shashidhar
372a506311 Merge branch 'master' into electron-141
* master:
  Bumped up version to 2.0.0
  removed package-lock.json from git cache and added it to gitignore
  Electron-175 - Method to set AlwaysOnTop property for about window
  Electron-171 - Added issue link to the comment
  Electron-170 - Added code comments
  Electron-170 - Added an event to update the monitor drop-down whenever a display is added/removed
  Electron-171 - corrected a code comment
  Electron-171 - Fixes the Configuration window positioning when multiple monitors are connected
  electron-17: disabled crash report upload to server
  electron-17: refactored code to read data from the config file and added pod url to the extras object

# Conflicts:
#	.gitignore
2017-10-25 11:27:06 +05:30
Vikas Shashidhar
d1257ff091 Merge pull request #218 from KiranNiranjan/ELECTRON-182
Electron-182 (Fixes an error in notification configuration window)
2017-10-19 15:44:35 +05:30
Vikas Shashidhar
99f3f86eb4 Merge pull request #220 from VishwasShashidhar/electron-185
electron-185: bumped up version numbers for mac and windows installers
2017-10-18 18:45:17 +05:30
Vishwas Shashidhar
aa6166d646 electron-185: bumped up version numbers for mac and windows installers 2017-10-18 18:43:05 +05:30
Kiran Niranjan
9684c9457f Electron-182 - Fixes an error that occurs when we add/remove displays 2017-10-18 13:11:25 +05:30
Vikas Shashidhar
0fd57a8dd0 Merge pull request #216 from VikasShashidhar/master
Bumped up version to 2.0.0
2017-10-18 12:07:53 +05:30
Vikas Shashidhar
4ce9ec2168 Bumped up version to 2.0.0 2017-10-18 12:06:10 +05:30
Vikas Shashidhar
c80595c984 Merge pull request #215 from VishwasShashidhar/electron-180
removed package-lock.json from git cache and added it to gitignore
2017-10-17 21:39:08 +05:30
Kiran Niranjan
a1dfea70bb Electron-154 - Modified the code to open the main window after reading the config fields 2017-10-17 11:39:19 +05:30
Vishwas Shashidhar
15aed177b5 removed package-lock.json from git cache and added it to gitignore 2017-10-17 11:14:53 +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
Vikas Shashidhar
bb28b1e7d8 Merge pull request #213 from KiranNiranjan/ELECTRON-175
Electron-175 (AlwaysOnTop for about Symphony window)
2017-10-13 13:59:35 +05:30
Vikas Shashidhar
6ac36cc876 Merge pull request #202 from KiranNiranjan/ELECTRON-171
Electron-171 (Configuration window positioning)
2017-10-13 13:55:12 +05:30
Vikas Shashidhar
a8d919be63 Merge pull request #210 from KiranNiranjan/ELECTRON-170
Electron-170 (Monitor position in notification settings)
2017-10-12 22:23:14 +05:30
Vikas Shashidhar
a046bc3245 Merge pull request #199 from VishwasShashidhar/electron-17
Electron 17: Minor enhancements
2017-10-12 22:14:08 +05:30
Kiran Niranjan
837d0dc265 Electron-175 - Method to set AlwaysOnTop property for about window 2017-10-11 20:58:32 +05:30
Kiran Niranjan
6b6a1d27a7 Electron-134 - Completed the notification redesign 2017-10-10 14:37:11 +05:30
Kiran Niranjan
cdc249857d Merge remote-tracking branch 'upstream/master' into ELECTRON-134 2017-10-10 13:18:31 +05:30
Kiran Niranjan
73636b2a9d Electron-171 - Added issue link to the comment 2017-10-09 21:12:43 +05:30
Kiran Niranjan
20384230bf Electron-170 - Added code comments 2017-10-09 21:02:41 +05:30
Kiran Niranjan
622ad97df4 Electron-170 - Added an event to update the monitor drop-down whenever a display is added/removed 2017-10-09 20:40:56 +05:30
Vishwas Shashidhar
3af4cb0a48 Merge branch 'master' into electron-17
* master:
  Fixed failing tests with Download Manager.
2017-10-09 20:23:31 +05:30
Vishwas Shashidhar
67f2734cae Merge branch 'master' into electron-141
* master:
  Fixed failing tests with Download Manager.
  electron-135: added logic to clean up event listeners
  electron-135: fixes as per PR comments to avoid leakages
  electron-151: pinned the electron version
  Electron-142 - Fixes the issue where it prevents creating multiple instances of the about window
  electron-135: fixed typo in the method name
  electron-135: added code comments
  electron-135: fixes the raised issue
  electron-151: added electron 1.7.8 as dependency

# Conflicts:
#	tests/DownloadManager.test.js
2017-10-09 20:23:12 +05:30
Vishwas Shashidhar
2dc9e45062 electron-141: removed clashing download manager test changes 2017-10-09 20:02:51 +05:30
Vikas Shashidhar
89e823823e Merge pull request #208 from VikasShashidhar/electron-144
Fixed failing tests with Download Manager.
2017-10-09 20:01:45 +05:30
Vikas Shashidhar
08a14ae66c Fixed failing tests with Download Manager. 2017-10-09 20:00:53 +05:30
Vishwas Shashidhar
dd0882c0b6 electron-17: fixes merge conflicts with master 2017-10-09 19:57:38 +05:30
Vikas Shashidhar
1fecd103a4 Merge pull request #200 from VishwasShashidhar/electron-151
Electron 151: Fixes link crash issue
2017-10-09 19:29:40 +05:30
Vishwas Shashidhar
89bbcfde61 electron-141: fixes the url validation issue for both mac and windows 2017-10-09 19:29:05 +05:30
Vikas Shashidhar
124b705075 Merge pull request #203 from KiranNiranjan/ELECTRON-142
Electron-142 (Prevents multiple instances of about window)
2017-10-09 15:41:29 +05:30
Vikas Shashidhar
31b9072793 Merge pull request #201 from VishwasShashidhar/electron-135
Electron 135: Pop out window -> url opens in external browser
2017-10-09 15:40:45 +05:30
Vishwas Shashidhar
e0f03011ae electron-141: fixed typo in the advanced installer messages 2017-10-09 13:39:09 +05:30
Vishwas Shashidhar
3b62ae5313 electron-141: fixed the messages in advanced installer 2017-10-09 13:35:55 +05:30