869 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kiranniranjan	e835f8f97f	Merge remote-tracking branch 'upstream/master' into ELECTRON-222	2018-01-02 14:33:31 +05:30
Kiran Niranjan	22d913f6c1	Electron-222 - Removed the code which was deleting the method on args	2018-01-02 14:32:40 +05:30
Kiran Niranjan	742dcf2517	Electron-250 ... Renamed the variables as per the review	2018-01-02 13:00:28 +05:30
Vikas Shashidhar	2855c9b2df	Merge pull request #283 from KiranNiranjan/ELECTRON-156 ... Electron-156 (Updated Protocol Validation)	2018-01-02 12:51:38 +05:30
kiranniranjan	7d1bbc9107	Merge remote-tracking branch 'upstream/master' into ELECTRON-250	2018-01-02 12:44:07 +05:30
Vikas Shashidhar	4510a35eb1	Merge pull request #276 from KiranNiranjan/ELECTRON-253 ... Electron-253 (Basic auth issue)	2018-01-02 12:24:27 +05:30
Keerthi Niranjan	4322615e6b	SEARCH-538 ... - Included two new tests	2018-01-02 10:12:14 +05:30
Kiran Niranjan	2c3b35270b	Electron-156 ... Updated the code not to encode the URL and just validate the protocol	2017-12-30 12:49:39 +05:30
Kiran Niranjan	9010c341cb	Electron-231 ... Fixes the installer config issue on Windows	2017-12-29 17:55:42 +05:30
Keerthi Niranjan	988439b780	SEARCH-538 ... - User config unit tests	2017-12-29 17:36:40 +05:30
Vikas Shashidhar	ed4672d0bc	Merge pull request #279 from VishwasShashidhar/electron-205 ... electron-205: fixes the already fixed issue post merge conflict regression	2017-12-29 17:11:59 +05:30
Kiran Niranjan	0be6104ce2	Merge remote-tracking branch 'upstream/master' into ELECTRON-222	2017-12-29 15:59:35 +05:30
Kiran Niranjan	c8101a9b1e	Electron-222 ... Added a safety check to prevent from using an already destroyed notification window Added method to close all notification when notification config is changed	2017-12-29 15:59:19 +05:30
Vishwas Shashidhar	c13bfd5f14	electron-205: fixes the already fixed issue post merge conflict regression	2017-12-29 12:48:19 +05:30
Keerthi Niranjan	d1e7604895	SEARCH-538 ... - Removed comment	2017-12-29 12:06:19 +05:30
Keerthi Niranjan	c48bb2225e	SEARCH-538 ... - Test for search limit	2017-12-29 12:04:40 +05:30
Keerthi Niranjan	3a3eb4bb15	Merge remote-tracking branch 'upstream/master' into SEARCH-538	2017-12-29 09:38:44 +05:30
Vikas Shashidhar	f4ff287547	Merge pull request #277 from VikasShashidhar/master ... Revert "Merge pull request #269 from keerthi16/skynet"	2017-12-28 18:12:32 +05:30
Vikas Shashidhar	3cf9226bf4	Revert "Merge pull request #269 from keerthi16/skynet" ... This reverts commit 1388c835ef, reversing changes made to c9d6229d6d.	2017-12-28 17:29:27 +05:30
Kiran Niranjan	ee6cf8732b	Electron-253 ... Added type button to prevent form submit	2017-12-28 17:18:00 +05:30
Vikas Shashidhar	5ed8e8f026	Merge pull request #275 from symphonyoss/revert-272-newSkynet ... Revert "Updating Master with Skynet"	2017-12-28 15:35:49 +05:30
Vikas Shashidhar	b91ceb3ee3	Revert "Updating Master with Skynet"	2017-12-28 15:35:33 +05:30
Keerthi Niranjan	fbf051b3a3	Fixed tests	2017-12-28 15:29:37 +05:30
Vikas Shashidhar	d8b83ba2b7	Merge pull request #272 from keerthi16/newSkynet ... Updating Master with Skynet	2017-12-27 17:18:37 +05:30
Keerthi Niranjan	25fdaa78da	Merge remote-tracking branch 'upstream/master' into newSkynet	2017-12-27 17:14:00 +05:30
Vikas Shashidhar	6c15d14fa8	Merge pull request #256 from VishwasShashidhar/electron-205 ... electron-205: fixed file overwrite issues when a custom download folder is set by the user	2017-12-27 17:10:01 +05:30
Vishwas Shashidhar	b64f60d8f2	electron-205: refactored the code as per suggestions on the PR.	2017-12-27 17:01:32 +05:30
Vikas Shashidhar	e4faf84729	Merge pull request #271 from symphonyoss/revert-269-skynet ... Revert "Updating Master with Skynet"	2017-12-27 16:38:40 +05:30
Vikas Shashidhar	d5f7073fef	Revert "Updating Master with Skynet"	2017-12-27 16:38:27 +05:30
Kiran Niranjan	193a4c126d	Electron-250 ... Updated the bundle file Added "http" prefix validation	2017-12-27 16:25:40 +05:30
Keerthi Niranjan	81f14b4916	Merge remote-tracking branch 'upstream/master' into SEARCH-538	2017-12-27 15:56:39 +05:30
Vikas Shashidhar	1388c835ef	Merge pull request #269 from keerthi16/skynet ... Updating Master with Skynet	2017-12-27 15:10:27 +05:30
Keerthi Niranjan	ef820ed999	Removing the library	2017-12-27 15:05:14 +05:30
Vikas Shashidhar	6f7386761a	Merge pull request #268 from keerthi16/skynet ... Updating Skynet with Master	2017-12-27 15:03:43 +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
Keerthi Niranjan	d7b5c28e0f	SEARCH-538 ... - Completed Unit tests for search.js	2017-12-27 14:04:04 +05:30
Vikas Shashidhar	368320f109	Merge pull request #267 from keerthi16/SEARCH-544 ... SEARCH-544 (Re-create real-time index)	2017-12-27 13:01:43 +05:30
Vikas Shashidhar	18182df07a	Merge pull request #262 from keerthi16/SEARCH-539 ... SEARCH-539 & SEARCH-206 (Encryption-Key and Disk Space)	2017-12-27 12:27:28 +05:30
Keerthi Niranjan	786a26d110	Review comments changes	2017-12-27 12:20:34 +05:30
Keerthi Niranjan	52c2078e96	Completed search.js tests	2017-12-27 11:57:49 +05:30
Keerthi Niranjan	316744acaf	Working on unit tests	2017-12-26 17:34:18 +05:30
Vikas Shashidhar	c9d6229d6d	Merge pull request #266 from KiranNiranjan/beta3(2.2.0) ... Beta release 3 (2.2.0)	2017-12-26 12:12:33 +05:30
Kiran Niranjan	a9b2fd7874	Release for 2.2.0 ... Bug fixes Admin whitelist config	2017-12-26 12:08:37 +05:30
Vikas Shashidhar	243144ed4a	Merge pull request #263 from KiranNiranjan/ELECTRON-217 ... Electron-217 (Whitelisting domains & sub-domains)	2017-12-22 16:08:50 +05:30
Vikas Shashidhar	4f5727054b	Merge pull request #265 from KiranNiranjan/ELECTRON-250 ... Electron-250 (Fixed http prefix validation)	2017-12-22 16:03:34 +05:30
Vikas Shashidhar	029358f6b1	Merge pull request #264 from KiranNiranjan/ELECTRON-253 ... Electron-253 (Fixed an issue whit basic auth)	2017-12-22 15:55:14 +05:30
Keerthi Niranjan	a7e838fe0c	SEARCH-538 ... - Working on electron unit tests	2017-12-22 15:46:10 +05:30
Kiran Niranjan	4724e99647	Electron-250 - Fixed http prefix validation	2017-12-22 12:22:15 +05:30
Kiran Niranjan	025738bb2c	Electron-253 - Fixed an issue with clearing up the auth settings	2017-12-22 10:51:28 +05:30
Kiran Niranjan	78c466516c	Electron-217 ... Updated the PR as per the review comments	2017-12-21 13:52:05 +05:30