Victor Woeltjen
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
Henry
44f4a82fa1
Resolved merge conflicts
2016-05-12 16:14:31 -07:00
Henry
836b5db8cf
Reviewed edit mode checking
2016-05-12 16:11:57 -07:00
Henry
d00e13e4ee
Resolved merge conflicts
2016-05-12 16:09:53 -07:00
Henry
433dd87e51
Resolved merge conflicts
2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602
Resolved Merge conflicts, removed previously deleted files
2016-05-12 16:05:27 -07:00
Charles Hacskaylo
a58fe1f81c
[Frontend] Modified .tick-labels in Timelines
...
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
2016-05-10 20:41:52 -07:00
Victor Woeltjen
f85ac79b4a
[Persistence] Remove persistence usage from TimelineSwimlaneDropHandler
2016-04-29 11:53:15 -07:00
Victor Woeltjen
bea9f22a0c
[Persistence] Remove persistence usage from TimelineSwimlaneDecorator
2016-04-29 11:51:21 -07:00
Victor Woeltjen
3f330dccf1
[Persistence] Remove persistence usage from TimelineDragHandler
2016-04-29 11:50:02 -07:00
Victor Woeltjen
f16a107105
[Timeline] Inject resources into CSV action
2016-04-15 08:51:22 -07:00
Victor Woeltjen
f683ca44a2
[Timeline] Read resource utilizations during CSV export
2016-04-15 08:45:42 -07:00
Victor Woeltjen
546cde56a8
[Timeline] Expose internal resource utilization
...
...to allow this to be exported for CSV, #751
2016-04-15 08:32:34 -07:00
Victor Woeltjen
5088453712
[Build] Remove use strict, global
...
Remove usages of use strict and global declarations that are
no longer necessary with JSHint configuration, from files
added/changed since #724
2016-04-08 16:11:12 -07:00
Victor Woeltjen
5e44bfc6c7
Merge branch 'master' into open671
...
Conflicts:
main.js
platform/commonUI/edit/src/policies/EditableMovePolicy.js
platform/commonUI/general/src/directives/MCTTree.js
platform/commonUI/general/src/ui/ToggleView.js
platform/core/src/actions/ActionCapability.js
platform/core/test/models/CachingModelDecoratorSpec.js
platform/core/test/services/InstantiateSpec.js
platform/features/events/bundle.js
platform/features/events/src/DomainColumn.js
platform/features/events/src/EventListController.js
platform/features/events/src/EventListPopulator.js
platform/features/events/src/RangeColumn.js
platform/features/events/src/directives/MCTDataTable.js
platform/features/events/src/policies/MessagesViewPolicy.js
platform/features/events/test/DomainColumnSpec.js
platform/features/events/test/EventListControllerSpec.js
platform/features/events/test/EventListPopulatorSpec.js
platform/features/events/test/RangeColumnSpec.js
platform/features/events/test/policies/MessagesViewPolicySpec.js
platform/features/rtevents/bundle.js
platform/features/rtevents/src/DomainColumn.js
platform/features/rtevents/src/RTEventListController.js
platform/features/rtevents/src/RangeColumn.js
platform/features/rtevents/src/directives/MCTRTDataTable.js
platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
platform/features/rtevents/test/DomainColumnSpec.js
platform/features/rtevents/test/RTEventListControllerSpec.js
platform/features/rtevents/test/RangeColumnSpec.js
platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
platform/features/rtscrolling/bundle.js
platform/features/rtscrolling/src/DomainColumn.js
platform/features/rtscrolling/src/NameColumn.js
platform/features/rtscrolling/src/RTScrollingListController.js
platform/features/rtscrolling/src/RangeColumn.js
platform/features/scrolling/src/DomainColumn.js
platform/features/scrolling/src/RangeColumn.js
platform/features/scrolling/src/ScrollingListController.js
platform/features/scrolling/src/ScrollingListPopulator.js
platform/features/scrolling/test/DomainColumnSpec.js
platform/features/scrolling/test/RangeColumnSpec.js
platform/features/scrolling/test/ScrollingListControllerSpec.js
platform/features/scrolling/test/ScrollingListPopulatorSpec.js
platform/features/table/src/directives/MCTTable.js
platform/features/table/test/controllers/TelemetryTableControllerSpec.js
platform/representation/src/gestures/DropGesture.js
platform/telemetry/src/TelemetryFormatter.js
test-main.js
2016-04-08 16:08:19 -07:00
Pete Richards
c591ade479
Merge remote-tracking branch 'origin/781'
2016-04-06 10:35:40 -07:00
Pete Richards
5b98da6681
Merge pull request #807 from nasa/timeline-model-717
...
[Timeline] Add default values to model
2016-04-01 10:10:15 -07:00
Victor Woeltjen
06c6832676
[Timeline] Add default values to model
...
Add default values to model, such that editing which occurs
before user supplies these properties does not cause errors
to occur. Directly addresses #717 , indirectly addresses
remaining errant behavior associated with #790 .
2016-03-31 15:46:56 -07:00
Victor Woeltjen
4441e88769
Merge pull request #803 from nasa/drag-drop-688
...
[Firefox] Invoke preventDefault on drop
2016-03-31 11:02:26 -07:00
Victor Woeltjen
254a944d7a
[Firefox] Invoke preventDefault on drop
...
...such that Firefox does not try to treat drop as a new URL
to navigate to. Addresses #688 and #527
2016-03-31 10:34:24 -07:00
Victor Woeltjen
530b940a64
[Timeline] Fix reordering
...
Fix reordering behavior when dragging-and-dropping within timelines;
addresses #789 .
2016-03-29 19:46:30 -07:00
Pete Richards
cbea842c8b
Merge branch 'timeline-highlight-767'
2016-03-24 13:33:56 -07:00
Pete Richards
cc5d14deec
Merge branch '755a'
2016-03-24 13:21:59 -07:00
Pete Richards
4c5217d646
[Style] Standardize indentation
2016-03-24 13:20:49 -07:00
Pete Richards
5e54b193ca
[Style] remove unnecessary parenthesis
...
See comment https://github.com/nasa/openmct/pull/782/files#r57380540
2016-03-24 13:14:53 -07:00
Charles Hacskaylo
88784d37fd
[Frontend] Added priority
...
#787
2016-03-24 12:05:10 -07:00
Andrew Henry
700e605bbd
Merge pull request #775 from nasa/timeline-drag-drop-679
...
[Timeline] Move (instead of link) when dragging and dropping within a timeline
2016-03-23 20:00:48 -07:00
Charles Hacskaylo
7da1a4b2a3
[Frontend] Updated glyph defs and descriptions
...
#781
#187
Converted many glyph char defs to
their JSON unicode equivalents;
Updated descriptions for many domain
objects;
2016-03-23 19:04:32 -07:00
Victor Woeltjen
c13231b8e8
[Timeline] Remove NULL_ACTION, clarify logic
...
Per code review feedback,
https://github.com/nasa/openmct/pull/775/files#r57229759
2016-03-23 15:34:05 -07:00
Victor Woeltjen
dd053f7e6e
[Timeline] Invoke $apply from mct-swimlane-drop
...
...and add some checks to ensure this is necessary, to avoid
triggering a ton of digest cycles while dragging.
2016-03-22 17:16:41 -07:00
Victor Woeltjen
cb655d486b
[Timeline] Test reordering within parent
2016-03-22 17:06:58 -07:00
Victor Woeltjen
3c52ceb71a
[Timeline] Remove unused function
...
Removal of domain objects is handled by using the move action.
2016-03-22 17:01:45 -07:00
Victor Woeltjen
b2337dea97
[Timeline] Update failing specs
...
...and remove obsolete test case for handling drops in a timeline
2016-03-22 16:59:09 -07:00
Victor Woeltjen
dea6554e04
[Timeline] Allow drops from tree
...
Don't assume that all drops will be dropped swimlanes.
2016-03-22 12:26:01 -07:00
Henry
e5544615cc
[Timelines] #715 Added a check to prevent mutation when modes are unchanged
2016-03-21 17:01:38 -07:00
Victor Woeltjen
e0a69744e5
[Timeline] Deinline null action
...
...used for cases when no action is needed for timeline move
(and ids will just be reordered.)
2016-03-21 11:53:10 -07:00
Victor Woeltjen
e7a6c34bcc
[Timeline] Handle drops for reordering
...
...as these would be disallowed by Move, normally.
2016-03-21 11:51:51 -07:00
Victor Woeltjen
7f3ac4077c
[Timeline] Drop to correct targets
2016-03-21 11:43:02 -07:00
Victor Woeltjen
5034e88656
[Timeline] Use move action on drag-drop
...
...to avoid creating links when desired behavior is a move,
#679 .
2016-03-21 11:18:18 -07:00
Charles Hacskaylo
aa48044345
[Frontend] Form styling
...
#772
Added ".l-controls-under" styling to allow
channel-selector layout;
Added new hint color constants and refined
style defs;
2016-03-21 11:13:43 -07:00
Charles Hacskaylo
90c82f6ef2
[Frontend] Timeline tooltip and field input tweaks
...
#750
Refined tooltip for Resource Graphing;
Increased size of Activity Link input field;
2016-03-21 10:08:59 -07:00
Charles Hacskaylo
5e6fe16b93
[Frontend] Adding tooltips
...
#750
2016-03-17 16:21:04 -07:00
Charles Hacskaylo
f0ca6fdfdb
[Frontend] Added tooltips
...
#750
Added tooltips to Timeline header elements;
2016-03-17 15:10:42 -07:00
Charles Hacskaylo
471b57f47c
[Frontend] CSS tweaks
...
#750
Moved l-plot-resource cursor: pointer
to a more specific selector;
Added user-select: none to l-header;
Fixed s-status-editing styling so
that tabular labels only appear draggable
while editing;
2016-03-16 18:19:44 -07:00
Charles Hacskaylo
9c775c6715
[Frontend] Changed cursor property
...
#755
Changed s-timeline-gantt.mid to
use cursor: move instead of
ew-resize; Need to verify on Linux;
2016-03-16 17:36:07 -07:00
Victor Woeltjen
f2c040367b
[Timeline] Rename TimelineCSVExporter
...
...to TimelineColumnizer, clarifying its role/responsibilities in the
context of the CSV export task;
https://github.com/nasa/openmctweb/pull/728#discussion_r56031331
2016-03-14 12:00:31 -07:00
Victor Woeltjen
0ff360ced3
[Timelines] Remove excessive ternaries
...
...to improve readability of logic to determine which columns
are needed for a given group of domain objects for CSV export,
as requested during code review,
https://github.com/nasa/openmctweb/pull/728#discussion_r55910477
2016-03-14 11:53:28 -07:00
Victor Woeltjen
406a31889e
[Timeline] Add specs for remaining columns
2016-03-08 12:34:08 -08:00
Victor Woeltjen
9e4e3e9c43
[Timeline] Add JSDoc
...
Add JSDoc to classes implemented Export Timeline as CSV
2016-03-08 11:59:53 -08:00
Victor Woeltjen
bd7cb98a4c
[Timeline] Add missing semicolon
...
...to pass code style checks
2016-03-08 11:40:54 -08:00
Victor Woeltjen
0d419fa5fd
[Timeline] Test TimelineTraverser
2016-03-08 11:30:26 -08:00
Victor Woeltjen
5ee5e7fea1
[Timeline] Add capabilities to test inputs
2016-03-08 10:47:01 -08:00
Victor Woeltjen
66b1a92554
[Timeline] Add test cases for TimelineTraverser
2016-03-08 10:43:13 -08:00
Victor Woeltjen
c23c2b84bf
[Timeline] Test inclusion of timespan properties
...
...in prepared data for CSV export
2016-03-08 10:31:31 -08:00
Victor Woeltjen
0c2285719e
[Timeline] Test inclusion of metadata headers
2016-03-08 10:27:50 -08:00
Victor Woeltjen
fd92c5f970
[Timeline] Add more tests for rows
2016-03-08 10:22:46 -08:00
Victor Woeltjen
938c266b4e
[Timeline] Add Id column to CSV export
2016-03-08 10:20:25 -08:00
Victor Woeltjen
9e6e33983b
[Timeline] Add more objects to test case
2016-03-08 10:17:10 -08:00
Victor Woeltjen
40895ec1b9
[Timelines] Begin spec for exporter
2016-03-08 10:07:21 -08:00
Victor Woeltjen
43db52fd70
[Timeline] Simplify interface
...
...such that responsibility for knowing exportService interface
is more localized.
2016-03-08 10:04:09 -08:00
Victor Woeltjen
75d6803c9f
[Timeline] Test mode columns in CSV Export
2016-03-08 09:59:54 -08:00
Victor Woeltjen
ed679756b3
[Timelines] Test metadata columns in CSV Export
...
...and additionally refactor to run in a test environment
(don't use Array.prototype.find)
2016-03-08 09:56:21 -08:00
Victor Woeltjen
dd66cb60d8
[Timeline] Test export task
2016-03-08 09:47:09 -08:00
Victor Woeltjen
d5283d57e4
[Timeline] Add missing semicolon
2016-03-07 16:35:40 -08:00
Victor Woeltjen
7c140c06dc
[Timeline] Test CSV Export action itself
2016-03-07 16:33:03 -08:00
Victor Woeltjen
f9ff9921a9
[Timelines] Continue testing CSV Export
...
...with initial test cases for the action itself.
2016-03-07 16:22:39 -08:00
Victor Woeltjen
cdac0ad67f
[Timeline] Add test cases for CSV Export
2016-03-07 16:17:19 -08:00
Victor Woeltjen
5d771edcf7
[Timeline] Begin testing CSV Export
2016-03-07 16:13:23 -08:00
Victor Woeltjen
c4f1c4ad1f
[Timeline] Show progress notification during export
2016-03-07 16:09:23 -08:00
Victor Woeltjen
14b8e02f27
[Timeline] Format exported start/end times
2016-03-07 16:02:33 -08:00
Victor Woeltjen
b383921f2a
[Timeline] Export start/end to CSV
2016-03-07 16:00:13 -08:00
Victor Woeltjen
b7a44a7557
Merge branch 'master' into warp135b
2016-03-07 15:21:28 -08:00
Victor Woeltjen
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
Victor Woeltjen
dda0628621
[Build] Clarify expressions
...
...to satisfy JSHint.
2016-03-04 10:49:22 -08:00
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Victor Woeltjen
721557b814
[Templates] Exercise selection method
...
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
2016-02-26 16:29:06 -08:00
Victor Woeltjen
70ed16491a
[Templates] Change watch order
...
...to work around order-sensitive test case
2016-02-26 16:26:31 -08:00
Victor Woeltjen
fe419714f5
[Templates] Check for availability of timespan
...
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
2016-02-26 15:50:07 -08:00
Victor Woeltjen
f3fd2e67fc
[Templates] Watch for selection object
...
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
2016-02-26 15:49:21 -08:00
Victor Woeltjen
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
Pete Richards
9b3c8dce25
[SCSS] Remove old references to compass
...
Remove any old references to compass.
https://github.com/nasa/openmctweb/issues/698
2016-02-22 18:22:44 -08:00
Pete Richards
0a71835687
[Build] Switch compass to bourbon
...
Change mixin library to bourbon. Significantly reduces sass build time.
https://github.com/nasa/openmctweb/issues/698
2016-02-22 18:02:16 -08:00
Pete Richards
ed09214f59
[Build] Save stylesheets to proper location
...
Updates the stylesheet task to output CSS in the correct locations. Remove
config.rb for running compass manually, and remove compiled css files from
project. Add a .gitignore to ensure they don't get included accidentally.
Add a gulp task for running the development server and watching for scss
changes at the same time.
resolves https://github.com/nasa/openmctweb/issues/238
2016-02-19 13:26:20 -08:00
Victor Woeltjen
5306e96374
Merge pull request #668 from nasa/open659
...
[New Edit Mode] #659 Fix to timelines
2016-02-10 17:02:28 -08:00
Henry
10e0acddb3
[New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self
2016-02-10 16:43:08 -08:00
Charles Hacskaylo
ceee7e0da9
[Frontend] Fixed CSS issue with Timeline label elements
...
open #659
CSS for .rep-object-label modified; Added CSS class
to tabular-swimlane-cols-tree.html markup;
Also cleaned up .s-status-pending styles for related
label elements;
2016-02-10 16:38:39 -08:00
Victor Woeltjen
273cf1c14f
[Timeline] Fix columns exported
2016-02-08 18:07:03 -08:00
Victor Woeltjen
b42ccebd5a
[Timeline] Fix imports, dependencies
...
Fix imports and dependencies needed by Export Timeline as CSV
2016-02-08 17:42:26 -08:00
Victor Woeltjen
a444fc01ad
[Timeline] Fix column module definitions
2016-02-08 17:34:10 -08:00
Victor Woeltjen
a126e43286
[Timelines] Handle columns during CSV export
2016-02-08 16:11:00 -08:00
Victor Woeltjen
4adb075a2b
[Timelines] Separate out timeline traversal
...
...from rest of CSV export.
2016-02-08 13:59:34 -08:00
Victor Woeltjen
d8b1e570d9
[CSV Export] Begin implementing
...
Begin implementing initial step, wherein timelines composition
is traversed to build up a list of objects to export.
2016-02-08 13:36:25 -08:00
Victor Woeltjen
5033e2cdbb
[Timeline] Begin adding Export as CSV
...
Sketch in solution for
https://developer.nasa.gov/mct/warp/issues/135
2016-02-08 13:04:41 -08:00
Victor Woeltjen
b0e4947bf0
Merge pull request #500 from nasa/open480
...
[New Edit Mode] Adding sub objects to Timelines
2016-02-08 11:59:54 -08:00
Victor Woeltjen
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Henry
cd2b19eb1e
[New Edit Mode] Fixed failing tests, and added new test in CreateWizard
...
[New Edit Mode] #480 fixed JSLint errors
[New Edit Mode] #480 do not show locator for sub objects
[New Edit Mode] Modified persistence in SaveAction
Removed redundant variable
Fixed Failing Test
Fixed JSLint errors
Improved some documentation
2016-01-21 12:01:38 -08:00
Henry
c65096f166
[New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability
2016-01-20 18:49:39 -08:00
Henry
032b2542f0
Merged from Master
2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
Henry
826d39a749
[New Edit Mode] Fixed logic in EditActionPolicy to use positive logic
2016-01-14 15:02:22 -08:00
Charles Hacskaylo
898dd557e5
[Frontend] Refactor to use s-status-editing instead of ng-class
...
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
2016-01-08 16:11:00 -08:00
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Henry
268a2c2427
Merged from master
2015-11-25 09:04:11 -08:00
Victor Woeltjen
0635e7c38e
[Timeline] Disambiguate datetime control
...
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
2015-11-20 17:26:43 -08:00
Charles Hacskaylo
fd3059b380
[Frontend] Final cleanups, tweaks; Refactored s-icon-btn
...
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
2015-11-20 16:47:04 -08:00
Charles Hacskaylo
5a7349117a
[Frontend] Cleanups to Timeline tabular label elements
...
open #208
Colors normalized for theming;
2015-11-20 16:27:26 -08:00
Charles Hacskaylo
3854df27d8
[Frontend] Styling on Timeline zoom buttons
...
open #208
Fixed in both themes;
2015-11-20 15:42:08 -08:00
Charles Hacskaylo
fc53dbd8a4
[Frontend] Themes added to Timelines
...
open #208
Espresso and Snow now supported; bulk of
work done except for minor cleanups, like zoom
buttons; Dragging not working currently in Timelines;
2015-11-20 15:23:08 -08:00
Charles Hacskaylo
de59f191b8
[Frontend] Relocating files
...
open #208
Moving initial files into new positions, based
on Victor's work in #242 ;
2015-11-20 09:14:07 -08:00
Charles Hacskaylo
3d3b250536
Merge remote-tracking branch 'github/master' into open208
2015-11-20 08:38:19 -08:00
Victor Woeltjen
5274923c49
[Licenses] Add license headers
...
...to sources for Clocks/Timers and Timelines, as noted in
review nasa/openmctweb#207
2015-11-05 12:45:51 -08:00
Charles Hacskaylo
7cd255670e
[Frontend] Committing removed files
...
open #208
2015-11-03 14:59:41 -08:00
Charles Hacskaylo
eabde6b2d0
[Frontend] Integrate Timeline into open; themes
...
open #208
Copied SASS styles from /warp and created
new platform/features/timeline/themes/espresso;
Styling looks complete, but Timeline itself has
functional issues;
TO-DO: remove styles from /warp/.../sass/ as needed;
2015-11-03 14:58:58 -08:00
Charles Hacskaylo
37f466705a
[Frontend] IN-PROGRESS stubbing in files ported from /warp
...
open #208
Moving files from /warp; stuff will NOT compile
at this point;
2015-11-02 18:22:13 -08:00
Victor Woeltjen
fffe07e7e6
[Timeline] Remove namespacing from specs
2015-10-23 14:06:55 -07:00
Victor Woeltjen
26db524f0e
[Timelines] Rename bundle
2015-10-23 13:57:15 -07:00
Victor Woeltjen
4fcef33c58
[Timelines] De-namespace timeline's DateTimeController
2015-10-23 13:56:34 -07:00
Victor Woeltjen
dc9369c0f1
[Timelines] Remove namespacing from controllers
...
WTD-1239
2015-10-23 13:54:19 -07:00
Victor Woeltjen
c5b786e5e0
[Timeline] De-namespace capabilities
...
WTD-1239.
2015-10-23 13:52:48 -07:00
Victor Woeltjen
3e0534c4c3
[Timeline] Update namespacing in templates
...
WTD-1239
2015-10-23 13:49:46 -07:00
Victor Woeltjen
19ad4c8174
[Timelines] Change namespacing for directives
...
WTD-1239
2015-10-23 13:48:07 -07:00
Victor Woeltjen
8159c365b5
[Timeline] Remove namespacing from README
...
WTD-1239
2015-10-23 13:45:54 -07:00
Victor Woeltjen
8ce8080253
[Timelines] Begin removing namespacing
...
Begin de-namespacing timelines/activities for inclusion
in open source. WTD-1239
2015-09-15 08:34:15 -07:00
Victor Woeltjen
c932e953bc
[Plugins] Bring over timeline, clock plugins
...
WTD-1239
2015-09-14 16:45:41 -07:00