433dd87e51
Resolved merge conflicts
2016-05-12 16:07:39 -07:00
cf9eb3f602
Resolved Merge conflicts, removed previously deleted files
2016-05-12 16:05:27 -07:00
bd686790dc
Resolved merge conflicts
2016-05-12 16:03:19 -07:00
e5ef7c0c22
Resovled merge conflicts
2016-05-12 15:58:17 -07:00
3d891073da
[Popup] Add method to jqlite mocks
...
...to resolve build failure preventing merge,
https://github.com/nasa/openmct/pull/922#issuecomment-218588876
2016-05-11 14:25:23 -07:00
116c6e57ed
Merge pull request #918 from nasa/rt-updates-910
...
[Table] Remove length check when updating visible rows
2016-05-11 14:07:27 -07:00
73c2c01def
[Frontend] Layout and styling of Time Conductor
...
open #889
open #298
Fixes for mobile;
Moved popup z-index def into sass;
Datetime picker compressed for
better fit in mobile phone;
Removed hours selector from datetime
picker to enable better fit in mobile;
2016-05-11 11:32:39 -07:00
7c82e31b66
Merge branch 'master' into open889
2016-05-10 23:09:59 -07:00
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
2829b8d495
[Frontend] Time Conductor mobile
...
open #889
- Major refactoring of mobile approach,
leveraging flex-box layout change;
2016-05-10 19:52:11 -07:00
c448753bab
[Table] Remove length check when updating visible rows
...
While the number of visible rows may not have changed, their
contents may have; returning early here results in #910 .
2016-05-10 15:20:22 -07:00
7ade873365
[Frontend] Flex; Tweaks to slider knobs
...
open #889
- Converted TC elements to use flex
layout instead of abs pos;
- Knob size increased;
- Knob grippies added;
2016-05-10 15:12:50 -07:00
8788523c25
[Frontend] Tweaks to slider knobs
...
open #889
- Knob size increased;
- Knob grippies added;
2016-05-10 14:28:23 -07:00
c301523156
[Frontend] Layout and positioning fixes for TC controls
...
open #889
IN PROGRESS
- Smaller font used on range value;
- More space allocated to left and right
for slider range values;
- Style tweaks to slider look;
- Layout and style of datetime inputs
fixed;
- Input error colors fixed, moved to
theme constants;
2016-05-09 17:56:50 -07:00
2e8604e18d
[Frontend] Layout and positioning fixes for TC controls
...
open #889
2016-05-09 10:38:18 -07:00
3ca9d21bbd
Merge remote-tracking branch 'origin/open663'
2016-05-09 10:33:39 -07:00
61683800cc
[Style] Update style to reflect new jshint config
...
Update style to match new jshint config
https://github.com/nasa/openmct/issues/671
2016-05-09 10:33:26 -07:00
4c74391137
Merge remote-tracking branch 'origin/open836'
2016-05-09 10:25:25 -07:00
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
cae85f3e30
[Frontend] Mods to slider .range-value elems
...
open #889
- Text smaller, line breaks;
- Height adjustments
- Increased with of slider area;
2016-05-09 10:16:54 -07:00
3efaa3b1cb
Merge pull request #894 from nasa/open892
...
#892 Removed browser warning
2016-05-06 09:51:36 -07:00
2fe9698ea8
Merge pull request #891 from nasa/fix-clickaway-888
...
[General] remove dupe, debounce inputs
2016-05-06 09:49:13 -07:00
00433f02bc
#892 Removed browser warning
2016-05-05 21:45:18 -07:00
7fad4e9ea1
[General] remove dupe, debounce inputs
...
Remove duplicate ClickAwayController implementation that was obscuring actual
implementation. Debounce clickaway action in case toggle is invoked in a
click handler.
Resolves https://github.com/nasa/openmct/issues/888
2016-05-05 18:25:37 -07:00
c6d326bbbc
Merge pull request #879 from nasa/table-headers-809
...
[Table] Fix headers in firefox
2016-05-05 13:29:03 -07:00
1c6ef28b80
[Table] Fix headers in firefox
...
Don't use table-cell displays for cells, resolves issues with zero-sized
tbody causing thead to be 100% of table size.
Fixes https://github.com/nasa/openmct/issues/809
2016-05-04 11:13:12 -07:00
5279c842f5
[Branding] Change title of about dialog
2016-05-04 10:17:23 -07:00
ff36d9ee80
[Frontend] Removed bullets from ol, ul
...
open #869
- This should be cherry-picked into main
branches as well.
(cherry picked from commit 4c97413
2016-04-29 10:54:28 -07:00
0390f46460
[Frontend] z-index added to .object-top-bar .left element
...
#836
2016-04-25 09:55:21 -07:00
6bf1ef5bcc
Revert "Revert "[Tables] Fix to correct sorting in realtime tables""
2016-04-22 09:44:34 -07:00
11cfb6e1b8
[Edit] Elements pool filtering displays more consistent results
2016-04-21 10:42:50 -07:00
06436c488a
[Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types
2016-04-18 19:05:46 -07:00
f16a107105
[Timeline] Inject resources into CSV action
2016-04-15 08:51:22 -07:00
f683ca44a2
[Timeline] Read resource utilizations during CSV export
2016-04-15 08:45:42 -07:00
546cde56a8
[Timeline] Expose internal resource utilization
...
...to allow this to be exported for CSV, #751
2016-04-15 08:32:34 -07:00
6cb9619fbe
Merge pull request #829 from nasa/open630
...
[Edit mode] Simplify SaveAction
2016-04-14 16:11:49 -07:00
8c3616da32
Addressed code review points
2016-04-14 16:04:15 -07:00
ffd5faf9a2
[Persistence] Remove obsolete caching decorator
...
#831
2016-04-14 10:15:40 -07:00
b682cf8340
[Style] Remove outdated comments
2016-04-13 17:41:24 -07:00
22a5122ab7
[Conductor] Style for Phone and Tablet
...
Specify styles for time conductor on phone an tablet to hide the slider and
utilize space better.
https://github.com/nasa/openmct/issues/318
2016-04-13 17:17:52 -07:00
7a7877d7c4
[Conductor] Add basic style for phone
...
Add styling for time conductor on mobile that removes slider and rearranges
inputs to utilize space more effectively.
https://github.com/nasa/openmct/issues/318
2016-04-13 16:17:17 -07:00
69c059c943
[Conductor] Update inner bound on blur
...
The time conductor updates the inner and outer bounds when the input is
blurred, which results in the query updating without dragging.
Also allows time conductor to be utilized on mobile devices by entering
dates directly.
https://github.com/nasa/openmct/issues/318
User request:
https://github.jpl.nasa.gov/MissionControl/vista/issues/175
2016-04-13 13:49:23 -07:00
6d58f23c0c
[Style] Switch to prototype
...
Switch TimeRangeController to prototype style, and update tests
and template to utilize new style.
2016-04-13 13:23:33 -07:00
26e368f52d
[Edit mode] Simplify SaveAction
2016-04-12 14:40:19 -07:00
519a9333ab
Updated tests
2016-04-11 17:10:35 -07:00
2fe7ba982f
Added 'Open in New Tab' to context menu in edit mode
2016-04-11 17:06:37 -07:00
7f108c3b24
[Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture
2016-04-11 15:39:35 -07:00
934eb13813
[Build] Remove obsolete jslint tags
...
ES5 mode is enabled by default in JSHint, tags no longer necessary per
https://github.com/nasa/openmct/pull/724#discussion_r55095722
2016-04-08 16:54:01 -07:00
9351285182
[Build] Remove obsolete argument from spec
...
...to reflect changes associated with JSHint configuration,
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
2016-04-08 16:31:01 -07:00
aa45e53440
[Build] Revert setTimeout changes
...
Restore usage of setTimeout (instead of the Angular-wrapped version) per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
2016-04-08 16:29:49 -07:00
