ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 01:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,365 Commits 988 Branches 212 Tags 191 MiB
ae39343b76
Commit Graph

4365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
ffacf6e1ae Resolved residual merge issue 2016-05-12 16:18:48 -07:00
Henry
69c4c3a2c8 Added tests 2016-05-12 16:14:42 -07:00
Henry
c305fba0a7 Modified dirty function 2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
5bf750c90c Fixed creation 2016-05-12 16:11:57 -07:00
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -07:00
Henry
1753a5473c Resolved merge conflicts 2016-05-12 16:11:52 -07:00
Henry
d00e13e4ee Resolved merge conflicts 2016-05-12 16:09:53 -07:00
Henry
4b786d3536 Removed sysouts 2016-05-12 16:09:08 -07:00
Henry
e6bbc3442b Resolved merge conflicts 2016-05-12 16:09:02 -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
Henry
bd686790dc Resolved merge conflicts 2016-05-12 16:03:19 -07:00
Henry
e5ef7c0c22 Resovled merge conflicts 2016-05-12 15:58:17 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
a39ce566d1 Merge pull request #920 from nasa/open909 
Review and integrate open909: fix for Timeline Resource Graph labels
 2016-05-11 13:38:45 -07:00
Henry
671ba66354 [Examples] #921 changed text in event generator example 2016-05-11 12:35:44 -07:00
Henry
a5ba72582c [Examples] #921 changed text in event generator example 2016-05-11 12:24:24 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
7c82e31b66 Merge branch 'master' into open889 2016-05-10 23:09:59 -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
Charles Hacskaylo
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
Andrew Henry
3727b287a1 Merge pull request #902 from nasa/open898 
[documentation] #898 updated stylesheet reference
 2016-05-10 18:27:09 -07:00
Even Stensberg
677b65d124 Optional indent removed 
removed whitespace
 2016-05-11 00:39:16 +02:00
Victor Woeltjen
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
Even Stensberg
31d31d7819 Removed indents 
Removed unnecessary indentations
 2016-05-11 00:14:52 +02:00
Charles Hacskaylo
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
Charles Hacskaylo
8788523c25 [Frontend] Tweaks to slider knobs 
open #889
- Knob size increased;
- Knob grippies added;
 2016-05-10 14:28:23 -07:00
Even Stensberg
d32ef4bc3d Last indentation fix 2016-05-10 22:03:07 +02:00
Even Stensberg
b4faf8991d Indentation Fixes 2016-05-10 22:02:19 +02:00
Even Stensberg
0564759481 Swapped order of license 
Swaped license order with name
 2016-05-10 21:48:24 +02:00
Even Stensberg
24e391edf7 [Branding] Added Apache license to README.md 
Added Apache license
 2016-05-10 21:44:10 +02:00
Even Stensberg
cf295105d4 [Functionality] Log app instance to the console 
Added logging statement, so the user knows when the app is up and running.
 2016-05-10 21:06:04 +02:00
Charles Hacskaylo
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
Andrew Henry
46e1347dc8 Merge pull request #906 from nasa/use-heroku-integration 
[Build] Use Circle's heroku integration for deploy
 2016-05-09 10:53:28 -07:00
Pete Richards
f5539ec678 [Build] Use Circle's heroku integration for deploy 
Use circle's heroku integration to deploy to ensure that we deploy
a full clone of the repo and not a shallow clone, prevents build
failure in master branch.
 2016-05-09 10:46:17 -07:00
Charles Hacskaylo
2e8604e18d [Frontend] Layout and positioning fixes for TC controls 
open #889
 2016-05-09 10:38:18 -07:00
Victor Woeltjen
9ed28a4a37 Merge pull request #900 from nasa/open899 
#899 updated circle.yml to deploy to live_demo and remove doc generation
 2016-05-09 10:37:47 -07:00
Pete Richards
3ca9d21bbd Merge remote-tracking branch 'origin/open663' 2016-05-09 10:33:39 -07:00
Pete Richards
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
Pete Richards
4c74391137 Merge remote-tracking branch 'origin/open836' 2016-05-09 10:25:25 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Charles Hacskaylo
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
pacozaa
bcd5f1ee24 add shortcut for see the app quickly 2016-05-09 03:05:21 +07:00
Henry
ab6ef22363 #898 updated stylesheet reference 2016-05-08 10:46:59 -07:00
Henry
09d1c2cd4b #899 updated circle.yml to deploy to live_demo and remove doc generation 2016-05-06 19:44:26 -07:00
Victor Woeltjen
d6aa31e4aa Merge pull request #893 from nasa/open885 
#885 added command line option --directory -D to specify base directory
 2016-05-06 10:19:44 -07:00
Victor Woeltjen
3efaa3b1cb Merge pull request #894 from nasa/open892 
#892 Removed browser warning
 2016-05-06 09:51:36 -07:00
Victor Woeltjen
2fe9698ea8 Merge pull request #891 from nasa/fix-clickaway-888 
[General] remove dupe, debounce inputs
 2016-05-06 09:49:13 -07:00