Kiran Niranjan
ab978399ff
Electron-391 (Redesigned Windows & macOS installer) ( #346 )
...
- update Mac installer design
- update installer as per latest design and content
- fix outlet connection issues in installer pane
- Redesign Symphony installer for Windows
- Fix spacing issue in installer
- Fix launch Symphony action
- add new design for mac installer
- Fix typo from Advanced Installer to Advance Settings
- Add test script to unpacked-mac
- added font family for macOS in intro page
- update font family
2018-04-30 17:02:51 +05:30
Vishwas Shashidhar
f14c6878e7
bump up version number
2018-04-19 23:27:35 +05:30
Kiran Niranjan
ec98374bcf
Electron-433 (Changes the logic for updating user config) ( #341 )
...
- change logic in handling user config selection on install
- fix log issues
- Update user config by validating execPath or is mac
- Remove post install from aip config
- Update user config by validating execPath or is mac
- Fix lint issues
- use native isNaN method
- Remove unwanted code
- PR review
2018-04-19 23:26:42 +05:30
Kiran Niranjan
81d9cae5d5
Electron-409 - Fix generating crash report ( #336 )
2018-04-12 14:36:16 +05:30
Vishwas Shashidhar
cffa8962a6
Fix eslint error for map and bump up version
2018-04-11 19:04:21 +05:30
Vishwas Shashidhar
600ff53472
Bump up version number to 2.4.0
2018-04-11 18:48:39 +05:30
Kiran Niranjan
3be2986c7e
Electron-401 (fixes crash reporter) ( #334 )
...
- fix crash reporter
- fix typo
- Add support to generate crash report
- Add logic to store globally and return
- PR review fixes
- Add logic to validate file mime type
2018-04-11 18:43:59 +05:30
Vishwas Shashidhar
2e25c97bec
Electron 380: add share logs support ( #333 )
...
- add capabilities to generate log files
- change the location of share logs menu item
- add spectron tests
- add menu item text for windows
- fix issue reported on windows archiving other files
- fix failing spectron tests
- pin archiver dependency version
2018-04-06 13:42:41 +05:30
Vishwas Shashidhar
1d1b90d2ae
bump up version number
...
- bump up version number on fixing critical bug ELECTRON-397
2018-04-02 15:52:01 +05:30
Vishwas Shashidhar
b24cbd7791
bump up version number
2018-03-29 15:55:53 +05:30
Vishwas Shashidhar
923bd3ba1a
ELECTRON-370: upgrade electron dependency to 1.8.4 ( #328 )
2018-03-28 11:45:51 +05:30
Keerthi Niranjan
c3b82a0869
SEARCH-598 and SEARCH-611 (Deleting data folder on Electron Crash) ( #307 )
...
- Deleting the data folder on crash and unexpected shutdown
- Created script for clearing the index data on start up
- Working in dev env
- Added path to package
- Windows path file change
- Working on production build
- Completed implementation
- Few changes to callback
- Few changes to callback
- Updated package
- Fixed windows bug
- Fixed windows bug
- Fixed windows bug
- Added exe for task
- Added exe for task
- Fixed exe file
- Code refactoring
- Updated api file
- Added uuid for the task name
- Updated exe for the uuid
- Updated API file
- AIP version
- Fixes all the scenarios for mac
- Updated the boot file to clear data file on login
- Fixed data folder deleting on application is open
- Windows launch agent
- Working on all the scenario
- Added a launch script and starting the register
- Updated search-win-task.exe file
- Updating the aip file
- Updating the aip file
- Removed randomString lib
- Requested changes (PR)
- Included the library from new repo electron-uitls
- Updated AIP file
- Updated AIP
- Bumped up electron-utils version
- Added missing quotes
- Bumped up electron-utils version
- Added missing quotes
- Bumped utils version
- Bumped utils version
- Update AIP
2018-03-15 16:37:50 +05:30
Keerthi Niranjan
55e75cf5e5
ELECTRON-357 ( #321 )
...
- Skipping npm rebuild every time and only running it once.
- Changed the time-out to 60000ms
- Moved the require to global
- Added done fail in all the catch functions
- Removed unwanted require
2018-03-13 15:50:31 +05:30
Kiran Niranjan
191ca0c05e
Electron-318 (Included build number in the client version info) ( #314 )
...
1. Included build number in getVersionInfo method
2. Update the demo page version info to table view
3. Changed let to var to make it consistent across the file
4. Add Spectron test cases for getVersionInfo
2018-03-12 17:05:25 +05:30
Vishwas Shashidhar
21a78de83e
ELECTRON-340: upgrade electron to 1.8.3 and pin all the dependency versions
2018-03-08 16:39:27 +05:30
Kiran Niranjan
fc13e706be
Electron-308 - Rebased and squash commits
2018-02-20 20:41:04 +05:30
Keerthi Niranjan
391b3e13ea
SEARCH-622
...
- Removed the randomString library and included custom file
- Made some refactoring which was exposing the path which can be deleted from anywhere
2018-02-16 12:34:03 +05:30
Vishwas Shashidhar
e060fca591
ELECTRON-299: upgrade to Electron 1.7.12
...
Electron 1.7.12 adds a security fix for windows apps.
2018-02-02 15:20:46 +05:30
Vishwas Shashidhar
3ffc69b1a1
electron-286: upgrade electron version to 1.7.11
...
this new electron version fixes security issues
2018-01-24 17:02:54 +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
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
Keerthi Niranjan
8a61b86a3d
Fixed some bugs related to build
2017-07-27 20:20:26 +05:30
Keerthi Niranjan
c76397f601
Testing for windows
2017-07-27 10:48:11 +05:30
Keerthi Niranjan
43831cba94
Added ref and ffi to package
2017-07-25 23:00:03 +05:30
Keerthi Niranjan
25917d0301
Merge remote-tracking branch 'upstream/master' into test
...
# Conflicts:
# package.json
2017-07-25 21:06:15 +05:30
Keerthi Niranjan
511ceb12ec
Search implementation
2017-07-25 21:03:24 +05:30
Keerthi Niranjan
1e9648deed
Search implementation
2017-07-25 20:58:38 +05:30
Kiran Niranjan
249021046a
Merge remote-tracking branch 'upstream/master' into ELECTRON-47
2017-07-25 14:28:22 +05:30
Kiran Niranjan
6485324677
Implemented Spell checker
2017-07-25 14:27:57 +05:30
Kiran Niranjan
e504150b99
Disabling spectron tests temporarily
2017-07-24 11:49:03 +05:30
Vikas Shashidhar
dec95759e8
Merge pull request #165 from VishwasShashidhar/electron-99
...
Electron 99
2017-07-21 15:30:21 +05:30
Kiran Niranjan
992bc6649e
Electron build issues
...
1. Moved spectron test to a different directory
2. Added a npm command to run spectron test separately
2017-07-20 17:27:48 +05:30
Vishwas Shashidhar
4be11d4563
electron-99: merged master to resolve conflicts
2017-07-19 16:06:41 +05:30
Vishwas Shashidhar
01a77f0850
electron-99: fixed pop out window issue
2017-07-19 15:19:46 +05:30
Vishwas Shashidhar
cd495ba42a
electron-99: disabled sandboxing for windows
2017-07-14 15:07:25 +05:30
Kiran Niranjan
b05bbd5aa7
Merge remote-tracking branch 'upstream/master' into ELECTRON-77
2017-07-13 10:44:11 +05:30
Kiran Niranjan
e146a95620
Electron-77 - Implemented method to update user config
2017-07-13 01:27:21 +05:30
Kiran Niranjan
8d0f9423a9
Electron-93
...
1. Implemented Robotjs for windows
2. Implemented a method to copy config for both windows and mac
3. Removed a conflict in config file
2017-07-10 20:30:24 +05:30
Kiran Niranjan
3c37591de9
Electron-93 - Implemented robotjs for always on top test
2017-07-07 18:18:09 +05:30
Kiran Niranjan
d220b6ada6
Refactored spectron tests
2017-07-06 15:09:50 +05:30
Kiran Niranjan
9ee4b76d37
Electron-90 Moved the Notification test to Jest from mocha
2017-07-05 14:03:52 +05:30
Kiran Niranjan
c99681e53a
Electron-90
...
1. Spectron tests for notification position
2. Added Spectron
2017-07-02 21:52:10 +05:30
Vikas Shashidhar
a4b79ac998
Merge pull request #147 from VishwasShashidhar/electron-48
...
Electron 48 : launch app fully sandboxed
2017-06-29 16:11:16 +05:30
Vikas Shashidhar
299e75eca3
Electron 44 File Download Experience ( #116 )
...
* Implemented File Download Experience
1. Initiate download manager when a file download is initiated.
2. Add items to download manager when new items are downloaded.
3. Allow user to open file in default OS app.
4. Allow user to show file in finder/explorer.
5. Allow user to close download bar.
* 1. Removed underscore
2. Added safety checks
3. Added support for popouts
4. Creating most elements of download manager if electron
* 1. Moved download manager logic to a separate file
* 1. Added styles to help pushing up the content of the app when the download manager is being shown.
* 1. Added tests for Download Manager.
* Removed unnecessary code.
* Made adjustments to handle positioning of the download manager through the flexbox model rather than the fixed positioning way.
* Removed data attributes being added to body to handle download manager.
2017-06-27 08:08:58 -07:00
Vishwas Shashidhar
cec0932472
electron-48: fixed the product name and added logic to rename the generated exe instead
2017-06-27 15:19:22 +05:30
Vishwas Shashidhar
28bd98655d
electron-48: added logic to launch app fully sandboxed for windows
2017-06-25 14:55:45 +05:30
Vishwas Shashidhar
dcd84ef400
electron-69: fixes the issue raised in the ticket for windows ( #134 )
2017-06-08 09:53:11 -07:00
Lynn
c253741450
fix activity detection tests and build process ( #133 )
2017-06-08 09:10:37 -07:00
Kiran Niranjan
05cde10299
ELECTRON-66 (Unit Tests) ( #129 )
...
* ELECTRON-66 - Fixed activity detection unit test and added dynamic target version
* ELECTRON-66 - Fixed activity detection unit test
2017-06-07 09:11:32 -07:00
Lynn
4abe5c87d8
hide readResult method ( #131 )
2017-06-07 09:05:25 -07:00
Lynn
f97a13c382
add logging and unit tests ( #117 )
...
* add logging and unit tests
* fix logging msg spell for notification
2017-05-31 21:39:08 -07:00
Lynn
105c31af0a
bump electron to ver 1.6.11 ( #110 )
2017-05-25 14:08:14 -07:00
Lynn
573e0e2386
add unpacked build option for mac ( #106 )
2017-05-24 15:03:25 -07:00
Lynn
b21412f1c6
update rebuild ( #86 )
2017-05-10 18:12:47 -07:00
rbarros-daitan
c0908e64ef
Auto Launch ( #75 )
...
* Auto Launch
* Applying comments
* fix app.quit
2017-05-09 14:44:14 -07:00
Kiran Niranjan
4087eb3acc
Electron 32 (Activity Detection) ( #71 )
...
* Implemented user activity detection
* ELECTRON-32: Implemented throttle function
* ELECTRON-32: Fixed some bugs in throttle function
* ELECTRON-32: Updated comments
* ELECTRON-32: Fixed clear interval bug
* ELECTRON-32: Updated as per the review
* ELECTRON-32: Updated return statement
* ELECTRON-32: Added a boolean to the callback function
* ELECTRON-32: Resolved conflicts
* ELECTRON-32 - Added period attribute
2017-05-08 11:30:45 -07:00
Lynn
effa2def9c
downgrad to electron 1.6.7 ( #76 )
2017-05-05 13:52:05 -07:00
Lynn
59a1915481
update to electron 1.6.8 ( #74 )
2017-05-02 16:06:34 -07:00
Lynn
0d735ea859
bump screen-snippet ver
...
bump screen-snippet ver to 1.0.1 - pick up change for msbuild cmd.
2017-04-22 08:07:14 -07:00
Lynn
c6698fe77c
update package.json to fetch screen-snippet dep
...
update package.json to fetch screen-snippet dep
2017-04-22 07:57:27 -07:00
Lynn
fa62eb991c
add screen snippet dep for windows ( #67 )
2017-04-21 16:07:36 -07:00
Lynn
7371c4a8d3
update build and demo instructions ( #63 )
2017-04-19 21:16:39 -07:00
Lynn
b2fcf1afc2
add support for window.open ( #59 )
2017-04-18 09:02:25 -07:00
Lynn
662fa1d864
upgrade electron 1.6.5 ( #51 )
2017-04-03 16:50:35 -07:00
Colin Eberhardt
be655b3076
Enable the Chromium sandbox ( #47 )
...
According to recently added documentation, `sandbox: true` creates a sandbox 'compatible' renderer process, but doesn't actually enable the sandbox. The command line argument I've added is also required.
See discussion here: https://github.com/electron/electron/pull/9054#discussion_r108695652
2017-03-29 17:42:24 -07:00
Lynn
e9422de1c2
fix jest to transform all tested files ( #41 )
2017-03-24 15:52:27 -07:00
rbarros-daitan
3f8757dc90
Add context menu to Symphony Electron ( #39 )
...
* Add context menu to Symphony Electron
* Moving menus to js/menus directory
* make contextMenu window changeable
2017-03-24 09:31:20 -07:00
Lynn
2b0537945b
add babel for testing with jest ( #38 )
2017-03-22 10:24:34 -07:00
rbarros-daitan
b244519045
Redo branch & pr for registry ( #36 )
...
* Redo branch & pr for registry
* fix lint ignore file
2017-03-22 08:10:40 -07:00
Lynn
a10db61d8e
add missing dep: async ( #37 )
2017-03-21 15:28:21 -07:00
Lynn
3a0076c86f
simplify local dev env ( #35 )
2017-03-21 11:50:26 -07:00
Lynn
0dfa3339a3
notifications implementation ( #34 )
...
* wip: notifications
* wip: more notifications
* wip: add getter to proxy
* wip: add setter
* wip: add static getter and method
* wip: add event handlers
* wip: add doc
* wip: add api demo
2017-03-21 09:15:18 -07:00
Lynn
38f92b8849
browserify preload scripts ( #30 )
2017-03-07 14:44:31 -08:00
Lynn
71387c1dce
add linting ( #27 )
2017-03-03 16:07:48 -08:00
Lynn
40e6b173af
add logging and refactor ( #26 )
2017-03-01 16:32:21 -08:00
Lynn
d4ef876828
add unt test framework ( #23 )
2017-02-26 17:58:48 -08:00
Lynn
9554c2d79a
fix missing item in package.json ( #22 )
2017-02-24 12:43:33 -08:00
Lynn
1d55a5ac0a
bump dev dependency ver ( #21 )
2017-02-23 16:40:45 -08:00
Lynn
9933b0d1d2
readme update ( #20 )
2017-02-22 16:24:26 -08:00
Lynn
8f1e1e388a
Installer config ( #19 )
...
* update installer to read pod url from config
* update to installer aip
* fix in undefined in getConfig
2017-02-22 15:34:16 -08:00
Lynn
50ca154a7e
Read config ( #18 )
...
* read config file
* remove homepage from package.json
2017-02-20 10:24:46 -08:00
Peter Monks
57f8124ba5
Fix issue #5 & #7 , and add .gitignore ( #6 )
...
* 🐛 Fix issue #1
* 🆕 Add .gitignore
* 📝 Add incubating badge to readme
* 🎨 Add dist to gitignore
* ⬆️ Update dependencies, correct license string, customise app name
2017-02-17 18:53:25 -08:00
Lynn Neir
074d73c712
update preload files
2017-02-14 17:44:15 -08:00
lneir
5ebd4d4716
add msi installer
2017-02-15 01:26:24 +00:00
Lynn Neir
30f5590946
update dmg img
2017-02-13 16:31:42 -08:00
Lynn Neir
25b77075e3
add api and refactor
2017-02-10 18:20:09 -08:00
Lynn Neir
b420da4a7c
add dep for building on windows
2017-02-06 17:36:49 -08:00
Lynn Neir
6976922bed
upgrade to latest electron
2017-02-06 16:25:03 -08:00
Lynn Neir
cfd0811e7b
fix menu bug and few other bug fixes
2016-11-08 16:32:04 -08:00
Lynn Neir
04250c1fcf
build setup - electron-builder
2016-11-07 12:31:39 -08:00
bryan@symphony.com
632feba8fb
Load Symphony Test
2016-09-26 19:39:43 -07:00