Commit Graph

371 Commits

Author SHA1 Message Date
Bryan Ashby c1469a1f9c * isSpecialKeyMapped() renamed to isKeyMapped()
* Functional HorizontalMenuView
* Minor updates
2015-07-01 20:18:34 -06:00
Bryan Ashby a1b87c7a60 * Don't need extra data for tracking columns 2015-07-01 16:43:19 -06:00
Bryan Ashby 1606437c27 * Minor updates to HorizontalMenuView (WIP) 2015-06-30 23:09:58 -06:00
Bryan Ashby d346fe72ee * Lots of minor code cleanup
* WIP work on HorizontalMenuView
* Initial art for HorizontalMenuView demo
2015-06-30 22:45:27 -06:00
Bryan Ashby c87c0d69b7 * Some work on color codes module 2015-06-30 13:04:58 -06:00
Bryan Ashby 658c64c8c8 * Bunch of WIP on new setPropertyValue() stuff making it easier to set props from JSON 2015-06-29 23:14:17 -06:00
Bryan Ashby 8a5f890bee * Start work on setProperty() functionality -- this will replace some of the view controller work 2015-06-28 22:45:57 -06:00
Bryan Ashby 541be2d65a * Fix TextEditView when 'text' set by default
* Fix TextEditView row vs col
* Start skeleton on HorizontalMenuView
2015-06-28 22:31:12 -06:00
Bryan Ashby 670bf0fd6e * Load fse stuff from menu.json. Will use form 0..n 2015-06-27 15:32:29 -06:00
Bryan Ashby e7e9070414 * Some additional message related tables
* Change FSE art to 79 columns
2015-06-26 23:12:12 -06:00
Bryan Ashby 5a4c2a3043 * Initial start of message DB 2015-06-25 23:19:32 -06:00
Bryan Ashby 32fdbab88d * Very very early work on FSE module 2015-06-25 22:34:33 -06:00
Bryan Ashby 30b98e9e3b * Some notes
* Placeholder menu editor module
2015-06-24 22:45:21 -06:00
Bryan Ashby 521710e6ec * Page Up / Page Down for SyncTERM
* Page Down fixes
* Down arrow fixes
2015-06-21 22:36:07 -06:00
Bryan Ashby 45aa97071e * Minor fixes 2015-06-21 21:11:11 -06:00
Bryan Ashby 2c8ce36154 * Minor code cleanup
* Some work on Page Up / Page Down (WIP)
* Bug fixes with word wrapping, width checks @ word wrap
2015-06-20 15:15:37 -06:00
Bryan Ashby 714465ac40 * Code cleanup 2015-06-20 00:40:23 -06:00
Bryan Ashby f3cf12f294 * Deleting line functionality change -- now working consistent with end/home treatment
* Some WIP fixes for empty container (e.g. cleared lines)
2015-06-19 16:47:04 -06:00
Bryan Ashby dc69428563 * Some code cleanup
* WIP additional terminal types
* Minor updates to deleting lines in multi line edit - much to go still
2015-06-18 22:17:51 -06:00
Bryan Ashby 68f5a4cbfb * Nothing really, no time 2015-06-18 16:27:41 -06:00
Bryan Ashby 6ac39c373c * A completely broken delete line 2015-06-17 22:38:21 -06:00
Bryan Ashby f3cbffb094 * More WIP on backspace with tabs/etc. 2015-06-17 16:49:32 -06:00
Bryan Ashby d2244ba028 * Some work on backspace processign with tabs... WIP. 2015-06-16 23:43:22 -06:00
Bryan Ashby 2c7527bbcd * Some notes on deleting tabs 2015-06-16 16:30:23 -06:00
Bryan Ashby 7095f388f8 * update comments 2015-06-16 00:30:46 -06:00
Bryan Ashby 3e0926b87a * Update word wrap with backspace 2015-06-16 00:27:04 -06:00
Bryan Ashby d3c6d6fdef * placeholder for backspace 2015-06-15 23:00:47 -06:00
Bryan Ashby 7281011a7a * start of backspace impl 2015-06-15 22:53:49 -06:00
Bryan Ashby 683f21cf1a * Some thoughts 2015-06-15 15:54:33 -06:00
Bryan Ashby 81dab54f78 * Fix line feed key with tabs 2015-06-14 23:18:21 -06:00
Bryan Ashby 2632c150ac * Fix line feed losing a character
* Fix wrapping when tabs are involved
2015-06-14 21:19:25 -06:00
Bryan Ashby 8a75dbc91f * Movement working pretty well with tabs, etc.
* Handling of linefeed (enter key)
* Start work on tab key press
2015-06-13 21:49:12 -06:00
Bryan Ashby dc883ac6e6 * Some ideas on tabstop rework... 2015-06-12 16:44:32 -06:00
Bryan Ashby 1b50993768 * More work on cursor movement inc left key with tabs 2015-06-11 23:09:13 -06:00
Bryan Ashby b24cbd9436 * Word wrapping functional with tabs in the mix (at least when adding chars!) 2015-06-11 21:05:52 -06:00
Bryan Ashby 251a4777f6 * Mostly notes 2015-06-11 16:53:34 -06:00
Bryan Ashby 9ead6ab0fa * Improvement to word wrapping in multi line editor. Now handles spaces, etc. 2015-06-10 21:49:18 -06:00
Bryan Ashby 019dbaf034 * Wrapping & cursor placement improvements 2015-06-10 16:12:21 -06:00
Bryan Ashby b759975742 * Some minor tweaks. Nothing major right now 2015-06-08 22:41:57 -06:00
Bryan Ashby 6bf5a8425c * getSGRFor() 2015-06-08 16:51:27 -06:00
Bryan Ashby 05af6daa8d * Probably some throw away changes 2015-06-08 00:03:09 -06:00
Bryan Ashby 30150dac66 * Some improvements. Start WIP on cursor position when wrapping lines 2015-06-07 23:45:06 -06:00
Bryan Ashby 71511ae4a3 * Some progress on word wrapping and character insertion... very broken. Some ideas... 2015-06-07 21:32:47 -06:00
Bryan Ashby d16a13707f * Yet more work on inserting and word wrapping as we go. Lots of bugs but getting there 2015-06-07 00:04:09 -06:00
Bryan Ashby 832442288e * Some mostly placeholder work for @art, etc. in View properties (e.g. menu.json)
* Lots of work on MultiLineEditTextView2. WIP text insertion, retrieval, etc.
* Tabs working good at a basic level
2015-06-06 19:34:55 -06:00
Bryan Ashby feab2e0233 * Some SyncTERM / EtherTerm key support for new key system
* Break long words for word wrap if required
* Lots of cursor movement improvements for MultiLineEditText2
* Code cleanup
2015-06-06 00:33:59 -06:00
Bryan Ashby f2a61828aa * Small fix 2015-06-05 16:37:17 -06:00
Bryan Ashby 8a17ca694e * Most everything converted to new 'key press' system. Still WIP, some cleanup & probably a few keys to add for various BBS style terminals 2015-06-05 16:20:26 -06:00
Bryan Ashby dd0568f207 * Most of new key/DSR implementation in place... a bit more to go with separation of ch vs key & cleaing up the two handlers -> one onKeyPress 2015-06-04 22:29:14 -06:00
Bryan Ashby a427ad3dda * A little work on new key handling 2015-06-04 17:06:37 -06:00
Bryan Ashby e401e4a1a0 * A lot more work on cursor movement/etc. for MultiLineEditTextView2
* Start mostly placeholder stuff for regular key press / insertion of text
2015-06-03 22:00:33 -06:00
Bryan Ashby 9be258dab5 * Fix some visible vs non-visible, WIP stuff 2015-06-03 17:09:03 -06:00
Bryan Ashby 30b6cbedfb * Some more progress on MLETV2 2015-06-02 22:18:00 -06:00
Bryan Ashby 807551bca9 * Progress on new MLETV2 2015-06-02 16:36:55 -06:00
Bryan Ashby 03821a1afa * Some progress on 2nd ver of MLTEV 2015-06-01 23:00:54 -06:00
Bryan Ashby 3fabeb5071 * Start work on yet another impl. try on MLTEV 2015-06-01 17:10:27 -06:00
Bryan Ashby 40f38d8682 * Not much 2015-05-31 21:50:49 -06:00
Bryan Ashby c8c7566fd3 * Start work on TextBuffer version of MLTEV 2015-05-31 21:18:23 -06:00
Bryan Ashby d7b49e73b3 * Yet more work on this multiline thing :) 2015-05-30 23:45:22 -06:00
Bryan Ashby 69bb7e6302 * Quite a few movement improvements 2015-05-30 22:03:33 -06:00
Bryan Ashby b3848b4dca * More cursor movement. This thing is flaky! 2015-05-29 16:59:21 -06:00
Bryan Ashby 53fe751648 * Not much 2015-05-28 22:17:28 -06:00
Bryan Ashby 9faca92cab * Notes 2015-05-28 11:13:27 -06:00
Bryan Ashby 59e7c661a7 * Fixes to some cursor movement... starting to come together a little 2015-05-28 11:03:20 -06:00
Bryan Ashby 5a6b283923 * Fix backspace in edit views
* Some notes
2015-05-27 22:53:21 -06:00
Bryan Ashby e46105984c * Minor updates to MultiLineEditTextView 2015-05-27 22:11:32 -06:00
Bryan Ashby e62d146075 * WIP on MaskEditTextView stuff. Nothing major yet 2015-05-27 17:27:36 -06:00
Bryan Ashby d9ea295859 * More experimental cursor positioning 2015-05-26 22:57:34 -06:00
Bryan Ashby d83e8e1b55 * Messy, but semi working concept for render vs real gap text buffer 2015-05-26 22:17:57 -06:00
Bryan Ashby 581abd6d2c * More messing around with ideas for multi line 2015-05-21 22:06:35 -06:00
Bryan Ashby c00fa67b94 Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs 2015-05-20 23:07:46 -06:00
Bryan Ashby a24b1045ff * No reall progress on multi line... dur. 2015-05-20 23:07:36 -06:00
Bryan Ashby 07ee5079f4 Merge branch 'master' of ssh://nu.l33t.codes:51977/git/base/enigma-bbs 2015-05-20 13:24:57 -06:00
Bryan Ashby be2c940013 * Some notes and minor changes 2015-05-20 13:24:39 -06:00
Bryan Ashby f9358d04cd * Nothing really... rethinking MultiLineEditTextView 2015-05-18 22:29:33 -06:00
Bryan Ashby eaa4feeebd * Rename position x/y stuff to row/col. X/Y were backwards anyway :) 2015-05-18 11:31:35 -06:00
Bryan Ashby 159cdcb763 * Mostly notes & toying around with MultiLineTextEditView 2015-05-17 21:33:27 -06:00
Bryan Ashby 3bf34487d7 * Start (mostly placeholder) for MultiLineEditTextView 2015-05-16 14:39:14 -06:00
Bryan Ashby 0d9add70bd * Moved menus -> menus.json::menus
* Move prompts -> prompts.json::prompts
* Default to 80x25 if NAWS/ENV/CPR term size negotiations fail. Seeing this with Netrunner. May need more work.
2015-05-15 23:02:58 -06:00
Bryan Ashby 9ac2e9af6e * WIP on MaskEditTextView 2015-05-15 17:17:13 -06:00
Bryan Ashby a96af34a20 * Lots of code cleanup
* New standard MCI codes for labels
* WIP MaskEditTextView
* Extra styles for EditTextView
2015-05-14 23:01:00 -06:00
Bryan Ashby 1a1dd53ca1 * Moved themes from mods/art/themes > mods/themes/ 2015-05-14 16:49:19 -06:00
Bryan Ashby 4e2c21059a * Distinct "menus" vs "prompts" for theme.json so conflicting names can occur
* Add support for theming prompts
2015-05-14 14:56:02 -06:00
Bryan Ashby 34bf823f1f * Some solid progress on themeing / customization via theme.json 2015-05-13 22:21:55 -06:00
Bryan Ashby 767319e234 * Some notes 2015-05-12 23:23:22 -06:00
Bryan Ashby 2aa43295e3 * Start on new theme re-work
* theme_info.json -> theme.json
* Allow pipe codes for styleSGRx
2015-05-12 23:04:22 -06:00
Bryan Ashby 58746ca9a9 * Some code cleanup in user.js
* More work around user/groups
2015-05-12 16:34:11 -06:00
Bryan Ashby a7f9e3846e * WIP on user groups
* Minor changes to user credential prompt
2015-05-11 16:39:28 -06:00
Bryan Ashby ca3453ecfb *Start user groups concept 2015-05-10 21:39:39 -06:00
Bryan Ashby 62da937bf0 * Support for textOverflow (e.g. "...") in TextView/EditTextView
* Show text starting from the begining when non-focus for long EditTextView
2015-05-07 22:13:12 -06:00
Bryan Ashby bd2253aec0 * justify can be specified via menu.json 2015-05-07 16:43:00 -06:00
Bryan Ashby 37adeb5f90 * Fix some handling of height, itemSpacing, etc. in VerticalMenuView
* Change auto scale to be height/width dependent
2015-05-07 16:14:16 -06:00
Bryan Ashby 7fc4858959 * Working, but buggy WIP rework of VerticalMenuView with scrolling 2015-05-06 21:19:24 -06:00
Bryan Ashby 0346cbc7cb * More WIP on VM redesign 2015-05-06 16:43:49 -06:00
Bryan Ashby cdfb7ce6f2 * Start work on VerticalMenuView changes allowing scrolling views. Lots to go. 2015-05-05 22:19:21 -06:00
Bryan Ashby a01f5d2f24 * Just some notes 2015-05-04 22:04:36 -06:00
Bryan Ashby 6dfda0e6d4 * Properly handle item spacing in VerticalMenuView 2015-05-04 15:39:48 -06:00
Bryan Ashby d5017203ac * WIP experimental pausing for ANSI/art 2015-05-03 21:36:53 -06:00
Bryan Ashby 5a00d219f8 * Start work on pausable ANSI display/etc. 2015-05-03 17:35:55 -06:00
Bryan Ashby 3f92a7949d * Some code cleanup
* Lots of notes/thoughts
2015-04-30 22:29:24 -06:00
Bryan Ashby e8346779da * styleColor -> styleSGR1, styleSGR2 2015-04-30 16:41:43 -06:00
Bryan Ashby 04c85d2311 * Fix MCI colors. Everything working well so far! 2015-04-30 14:39:03 -06:00
Bryan Ashby 3f29e3dba4 * Start of work on re-write of SGR stuff related to MCI codes 2015-04-29 15:38:20 -06:00
Bryan Ashby 48be2f69be * Start work on new ANSI parser color/style system. Mostly notes. Will do in bulk later
* Start of styleColorX concept
2015-04-28 22:42:22 -06:00
Bryan Ashby 39fff7826c + Spin & Toggle menu demo start 2015-04-28 21:15:36 -06:00
Bryan Ashby 2c4711a976 * Fix 'small i' textStyle 2015-04-28 17:21:24 -06:00
Bryan Ashby 8bc2f31967 * Minor changes to demo mode. 2015-04-28 17:18:02 -06:00
Bryan Ashby 99fb3b34c7 * Mostly code cleanup & minor refactors 2015-04-27 22:40:05 -06:00
Bryan Ashby cb5fc13da5 * Merged changes 2015-04-27 20:23:21 -06:00
Bryan Ashby 75bb9e91e4 * Some work on cursor hiding while redrawing. WIP. 2015-04-27 20:19:17 -06:00
Bryan Ashby 3e93b5b67d * Allow hot keys to be case insensitive
* Start of better demo
2015-04-27 17:27:23 -06:00
Bryan Ashby 028c5be418 + ToggleMenuView
* Start of hotkeys for menus
* General menu cleanup & rework
2015-04-27 16:04:41 -06:00
Bryan Ashby 10d8812300 + SpinnerMenuView (MCI=SM)
* Some menu view rework... WIP
2015-04-26 21:57:23 -06:00
Bryan Ashby 7a643150e7 * Fixed double extra view redraws
* Redraw views when all of them are ready @ MCI init
* Moved a lot of properties of views to menu.json/prompts
* Allow scrolling editor for EditTextView
* New @config:path.to.property for menu.json view properties/etc.
2015-04-26 20:46:16 -06:00
Bryan Ashby ca2274dcf5 * Not much. Will start on DEMO mode for View development, etc. 2015-04-24 16:54:25 -06:00
Bryan Ashby f4a5b9e4be Merge branch 'master' of ssh://132.0.0.246/git/base/enigma-bbs 2015-04-23 23:01:54 -06:00
Bryan Ashby 91d395e8bc * Again change ANSI font handling
* Add prompt.json
2015-04-23 23:00:48 -06:00
Bryan Ashby 5ae0399519 * More package.json updates & some logging early failures 2015-04-23 21:42:57 -06:00
Bryan Ashby 5ab89f952f * New @systemMethod 2015-04-20 23:24:15 -06:00
Bryan Ashby ec5f1836c5 * clearScreen -> cls for nostalgia
* module cleanup: some simple modules moved to general_menu_method.js @methods
* More work on menu configuration & options
- Removed formatting of args for now. Too tied to MCI, not really needed with argName stuff
2015-04-20 22:50:58 -06:00
Bryan Ashby 8db72430d3 * 'action' must be part of a *menu* not a prompt (they remain generic)
* Menus and prompts in better harmony
* Very eary WIP of converting login/apply/etc. to new system. These can now be helper scirpts and not full MenuModules (very simple!)
2015-04-19 22:58:18 -06:00
Bryan Ashby bac2f63c1a * Tons of work with menu/prompts refactoring -- more to come soon
* More work with menu/prompt accets
2015-04-19 02:13:13 -06:00
Bryan Ashby 5faa11664b * Lots of work with fonts: Support mappings of various cterm/SyncTERM fonts.
* Load font info from SAUCE
* Better work with defaults & theme values
2015-04-16 22:29:53 -06:00
Bryan Ashby 586f3d60b3 * ButtonView is now MCI BT. BN is pre-defined "Board Name"
* Client current theme info loaded & used for e.g. passwordChar
* Code cleanup
2015-04-15 22:46:45 -06:00
Bryan Ashby 5eee568586 * Apply now semi functional 2015-04-14 22:27:07 -06:00
Bryan Ashby 77600d3dde * Fix EtherTerm backspace key
* Better WIP apply art / module
* Better WIP 'enter' and 'leave' events from VC
2015-04-14 00:19:14 -06:00
Bryan Ashby b0103cb178 * Experimental enter/leave events for Views 2015-04-11 23:48:41 -06:00
Bryan Ashby 85a72935fa * Some work on User creation/persistance
* Fix some MCI parsing from menu.json
* Add 'options' to menu entries
2015-04-09 22:49:56 -06:00
Bryan Ashby 2bac8e006e - Remove inputType from previous check in. Will replace with MaskEditTextView stuff
* Cleanup self.options in Views. Just use self.XXXXXX and pass in options to configure
* View's take one param for ctor: options. Including options.client
* Experimental / WIP cursor show/hide in Views
2015-04-08 22:54:13 -06:00
Bryan Ashby 6d84018ef5 * Some WIP inputType 2015-04-07 23:15:34 -06:00
Bryan Ashby 9219cc74a5 * Work on User and loading user from db with authenticate()
* Show login error in login.js experimental stuff
2015-04-06 00:18:08 -06:00
Bryan Ashby 3336caeec9 + Introduction of WIP asset system - menus, prompts, art, etc. @type:location/asset 2015-04-05 01:15:04 -06:00
Bryan Ashby 113e16df0d * Allow passing of arguments to menu's via menu.json including formatted parameters
* Fix menu.json setting of focus on view
2015-04-04 14:41:04 -06:00
Bryan Ashby ae71aa9feb * Rewrite of menu.json handling. More flexability
* Wildcards in menu.json
* Basic menu.json submit filtering working
2015-04-01 22:13:29 -06:00
Bryan Ashby 3274908586 * More work on menu system and form handling. Lots of work to do! 2015-03-30 21:29:06 -06:00
Bryan Ashby d6ffa2b26e * Lots of WIP around menu.json handlinge/etc. 2015-03-29 21:47:48 -06:00
Bryan Ashby 8c9b0e729f * WIP ViewController.loadFromMCIMapAndConfig() 2015-03-27 18:02:00 -06:00
Bryan Ashby cca9334bd3 * WIP on standard menu and menu.json MCI / form mapping. Much to do... 2015-03-26 22:58:22 -06:00
Bryan Ashby 4c4b0de54c * Better form submit format
* Allow comments in menu.json
2015-03-25 23:23:14 -06:00
Bryan Ashby d1b0663b5d * Some basic work on connecting modules 2015-03-23 23:12:19 -06:00
Bryan Ashby 810f001901 * Cleanup & some logging 2015-03-22 23:16:49 -06:00
Bryan Ashby efcc8756ba * WIP Menu system vs raw module access 2015-03-22 22:52:04 -06:00
Bryan Ashby f7462bbbdd + Concept of PluginModule and inherited classes such as ServerModule, MenuModule, ...
* Client now tracks current menu module. Auto detach events, etc.
2015-03-18 23:08:23 -06:00
Bryan Ashby d3e35d286a * Start real work on SSH using ssh2 module 2015-03-16 22:41:14 -06:00
Bryan Ashby 008e9f46d8 * Fix colors in relation to MCI codes
* iCE colors working, I think...
2014-11-12 23:16:47 -07:00
Bryan Ashby 7bac1b5193 + Start of iCE color support... ish.
* Initial NU-MAYA theme matrix
2014-11-09 21:24:09 -07:00
Bryan Ashby f2388ceed1 * Various cleanup + utility methods 2014-11-04 23:50:42 -07:00
Bryan Ashby d242546458 * Some code cleanup
+ Bit of skeleton for TickerTextView
* Detach of events in ViewController
2014-11-04 00:34:54 -07:00
Bryan Ashby eaf2aae48d * Constant time password DK compare
* Minor View update
* Test module. Start work on module switching functionality. NYW!
2014-11-03 22:53:01 -07:00
Bryan Ashby 1264cdde01 * Update color parsing. WIP 2014-11-03 17:04:46 -07:00
Bryan Ashby 6c841105ab + MCI support for focusArgs, e.g. 'focusTextStyle'
+ TextView initial support for fillChar and justify
+ Add color support to string_util.js::pad()
* Better color handling in Views
2014-11-03 16:49:15 -07:00
Bryan Ashby 4234e03008 * Work on forms
* More work on VerticalMenuView: setItems(), etc.
2014-11-02 12:07:17 -07:00
Bryan Ashby 4f3a8ac500 * VerticalMenuView up/down working 2014-11-01 09:50:11 -06:00
Bryan Ashby edc8266310 * A bit of work on VerticalMenuView
* Inheritance updates for Views
* Fixes and better handling of MCI factory
2014-10-31 16:25:11 -06:00
Bryan Ashby c3aa4c44e2 + Start work on MenuView & friends
* connect.js no longer a module. Part of initial connection always
* Cleaner & expandable BBS init
* Better theme handling
2014-10-30 22:59:21 -06:00
Bryan 14a321de2f * Work on themes. Ability to use ANSI to detect screen size if NAWS/etc. fail 2014-10-29 05:30:20 -06:00
NuSkooler 1ef9a4a1ce * Code cleanup. WIP theme stuff. Better CPR handling, etc. 2014-10-29 22:23:44 -06:00
Bryan 7cfe72d53b * Fix Cursor Position Report (CPR) handling! 2014-10-29 01:33:04 -06:00
NuSkooler 1dff6a6906 * Default IDs, support for some basic TextView/labels via MCI 2014-10-27 21:58:34 -06:00
NuSkooler 8119c1688a + Very start of theme support. Various changes 2014-10-26 22:06:41 -06:00
NuSkooler 46875ccddd * User stuff converted to use Async.js. More to come 2014-10-25 21:35:42 -06:00
NuSkooler 668fdd9166 * Better view inheritance. Experimental ButtonView. User stuff 2014-10-23 22:18:38 -06:00
Bryan 8cd062be72 * Notes but ButtonView skeleton 2014-10-23 16:40:52 -06:00
NuSkooler 381ded17a6 * Rewrite of Views functional. WIP more to come 2014-10-22 23:41:00 -06:00
NuSkooler 51d15659d5 * Rewrite of Views. Cleaner. WIP 2014-10-21 23:12:44 -06:00
NuSkooler c6e6c1562d * Work on User & user db 2014-10-20 22:47:13 -06:00
NuSkooler 7a3e375f5d * Start work on database & users 2014-10-19 23:30:44 -06:00
NuSkooler eab6da2b0a * More View updates 2014-10-19 21:06:39 -06:00
NuSkooler 9033ceeac6 * WIP on views 2014-10-18 12:45:24 -06:00
NuSkooler 8986729622 + Start of Views 2014-10-16 22:03:32 -06:00
NuSkooler 9a7e90b9b2 + Initial source checkin 2014-10-16 20:21:06 -06:00