ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 22:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,630 Commits 989 Branches 212 Tags 191 MiB
086307ba3a
Commit Graph

4630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
086307ba3a Fixed scrolling behavior with TOI 2016-10-11 17:16:51 -07:00
Henry
938bf3c4df Merge branch 'open1182' into open1193 2016-10-11 13:26:20 -07:00
Henry
8b2047ca32 Fixed issue with setting deltas 2016-10-11 13:25:24 -07:00
Henry
3910437033 Merged changes to zoom 2016-10-11 12:48:37 -07:00
Henry
02c543fddc Fixed zoom in real-time mode 2016-10-11 12:45:18 -07:00
Henry
70c4ce24e4 Added support for clicking row to set TOI 2016-10-07 17:57:14 -07:00
Henry
b995a8b87b Merged from open1182 2016-10-07 16:11:59 -07:00
Henry
b384e84872 Merge branch 'open933' into open1182 2016-10-07 15:02:41 -07:00
Henry
07140b179f Merge branch 'master' into open933 2016-10-07 14:54:18 -07:00
Henry
51a95575f7 [Time Conductor] Refactored time of interest as optional generic behavior of MctTable 2016-10-07 14:51:59 -07:00
Victor Woeltjen
cbd001e280 Merge pull request #1232 from nasa/open1216 
[Tables] Fixed table scroll by modifying selection of scrollable element. Fixes #1216
 2016-10-06 17:41:54 -07:00
Henry
dfbbc3b0c5 alt-click to select TOI from table 2016-10-06 10:23:42 -07:00
Henry
3e9c0eb7a5 Merged from master to resolve build issues 2016-10-05 12:25:04 -07:00
Henry
f1d2072bb9 Added license information 2016-10-05 11:17:22 -07:00
Henry
430645b1f2 TOI working in time conductor 2016-10-05 09:04:13 -07:00
Henry
bff4e120a7 [Tables] Modified selection of scrollable element. Fixes #1216 2016-10-04 19:14:47 -07:00
Charles Hacskaylo
47a0aba601 [Frontend] TOI sass and markup sanding 
Fixes #933
Fixes #1193
Color tweaks; Cleanups, commented
 code removal, etc.; tightened up
 tabular padding and font sizes;
 2016-10-04 18:12:01 -07:00
Victor Woeltjen
8a0018177a Merge pull request #1204 from BogdanAlexandru/mct1198 
[Edit] Switch other edit actions to mct-control
 2016-10-04 18:09:16 -07:00
Victor Woeltjen
c9c8998fa2 Merge pull request #1196 from hudsonfoo/open1185 
[Timeline] Add battery starting state-of-charge
 2016-10-04 18:06:50 -07:00
Charles Hacskaylo
0ed0a48a8c [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
Tabular styling for TOI;
 2016-10-04 15:49:18 -07:00
Charles Hacskaylo
1650aae518 [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
WIP: Tabular styling for TOI;
TODO: make bottom border work
 2016-10-03 15:56:56 -07:00
Charles Hacskaylo
d3bf6c5857 [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
WIP: Markup and CSS for plots and TC near complete;
TODO: revised styling in tabular views;
 2016-10-03 15:15:56 -07:00
Victor Woeltjen
5b0fa90e39 Merge pull request #1220 from nasa/hasta-la-vista-jspdf 
[export] remove pdf export
 2016-09-30 17:01:23 -07:00
Pete Richards
ae6f6565fa [export] remove pdf export 
Remove pdf export with extreme prejudice due to issues with build process.

Fixes https://github.com/nasa/openmct/issues/1217
 2016-09-30 16:54:42 -07:00
Victor Woeltjen
c27c0c5b8c Merge pull request #1215 from nasa/fix-jspdf-version-1214 
[Bower] specify jspdf minor version
 2016-09-30 14:45:59 -07:00
Pete Richards
ed102492e5 [Bower] specify jspdf minor version 
Specify jsPDF minor version to avoid updating to v1.3.0, which appears to
have problems with requirejs bundling.

Fixes https://github.com/nasa/openmct/issues/1214
 2016-09-30 12:49:02 -07:00
Henry
5cd0c8a4fa [Time Conductor] merged from open1182 2016-09-30 12:41:14 -07:00
David Hudson
e077f9ee18 [Timeline] Fix logic error 
Issue #1185. Also removed direct modification of domain object.
 2016-09-30 21:34:03 +02:00
David Hudson
e9f4db7719 Merge branch 'master' of github.com:nasa/openmct into open1185 2016-09-30 21:25:36 +02:00
Henry
5babf7274d [Time Conductor] Tweaked the break points for zoom level indicator 2016-09-29 11:21:11 -07:00
Charles Hacskaylo
22da34870d [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
WIP: Markup and CSS revisions for updated UX approach;
TODO: cosmetic CSS
 2016-09-29 10:41:21 -07:00
Pete Richards
7439d949c4 Merge pull request #1209 from nasa/jspdf-1208b 
[Build] Fix jsPDF dependency
 2016-09-28 09:30:50 -07:00
Charles Hacskaylo
99253a5904 [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
WIP: Markup and CSS revisions for updated UX approach
 2016-09-27 20:42:33 -07:00
Victor Woeltjen
e1276e464d [Build] Restore version identifier 2016-09-27 16:49:09 -07:00
Victor Woeltjen
d248dfe346 [Build] Remove SNAPSHOT status 
...to tag a build which addresses release blocker #1208
 2016-09-27 16:48:38 -07:00
Victor Woeltjen
91b63f78eb [Build] Depend on non-minified jsPDF 
Fixes #1208 (for some reason)
 2016-09-27 16:47:42 -07:00
Victor Woeltjen
754d7b3cd7 [Build] Restore SNAPSHOT status 
... for a patch build related to #1208
 2016-09-27 16:47:35 -07:00
Victor Woeltjen
7d950d067c Merge pull request #1194 from hudsonfoo/open1184 
[Frontend] Add notes property to all item types
 2016-09-27 15:28:49 -07:00
Alex M
a34e89d56a [Edit] Bind action to .perform() inside mct-button 2016-09-27 21:19:25 +03:00
Alex M
4b51e604a7 [Edit] Switch other edit actions to mct-control 2016-09-24 20:43:35 +03:00
Henry
2db4aa6235 [Time Conductor] Added zoom level label 2016-09-23 13:06:22 -07:00
Charles Hacskaylo
bb2ae2f8d1 [Frontend] Styling for TOI element 
Fixes #933
Fixes #1193
Finalized TOI in plots, table and TC
 2016-09-23 11:07:06 -07:00
Andrew Henry
e3e7bd27e9 Merge pull request #1203 from nasa/open1202 
[Frontend] Removed Export buttons from objects when in a Layout
 2016-09-23 10:20:47 -07:00
Andrew Henry
f6ed0e8ab6 Merge pull request #1178 from hudsonfoo/open1168 
[Frontend] Delay visibility of progress bar
 2016-09-23 10:10:09 -07:00
Charles Hacskaylo
0cf4c92555 [Frontend] Styling for TOI element in tables 
Fixes #933
Fixes #1193
WIP: styling in tabular mostly done, needs more unit testing
TODO: fix hide/show for pinned TOI in plots - don't
show pinned TOI on hover when not .active
 2016-09-22 19:15:10 -07:00
Henry
c179d9e759 Merge branch 'BogdanAlexandru-mct588comm' 2016-09-22 17:45:41 -07:00
Henry
98f387b605 [Edit Mode] Renamed function from EditAction.cancel() to EditAction.finish() 2016-09-22 17:34:53 -07:00
Henry
275dda820b Merge branch 'mct588comm' of https://github.com/BogdanAlexandru/openmct into BogdanAlexandru-mct588comm 2016-09-22 17:33:42 -07:00
Henry
3c95c095f1 [Time Conductor] Refactored out use of angular event bus in favor of making TimeConductorViewService an event emitter. 2016-09-22 17:22:25 -07:00
Victor Woeltjen
43c32c2c7b Merge pull request #1201 from nasa/open1080 
[Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation
 2016-09-22 16:23:49 -07:00