ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-27 00:31:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,987 Commits 989 Branches 212 Tags 191 MiB
1753a5473c
Commit Graph

3987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Andrew Henry
3727b287a1 Merge pull request #902 from nasa/open898 
[documentation] #898 updated stylesheet reference
 2016-05-10 18:27:09 -07: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
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
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
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
Henry
1cdeccc7a7 #885 added command line option --directory -D to specify base directory 2016-05-05 21:58:31 -07:00
Henry
00433f02bc #892 Removed browser warning 2016-05-05 21:45:18 -07:00
Pete Richards
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
Andrew Henry
c6d326bbbc Merge pull request #879 from nasa/table-headers-809 
[Table] Fix headers in firefox
 2016-05-05 13:29:03 -07:00
Andrew Henry
d60bc08843 Merge pull request #878 from nasa/open-mct-not-web-816 
[Branding] Change name to Open MCT in docs
 2016-05-05 13:21:13 -07:00
Andrew Henry
3d62cba1b3 Merge pull request #859 from nasa/remove-examples-825 
[Examples] Move examples out of main.js
 2016-05-05 13:05:41 -07:00
Pete Richards
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
Victor Woeltjen
00706558f5 [Branding] Restore missing space 2016-05-04 10:42:46 -07:00
Victor Woeltjen
5279c842f5 [Branding] Change title of about dialog 2016-05-04 10:17:23 -07:00
Victor Woeltjen
431b836568 [Branding] Change name in docs hierarchy 
...from Open MCT Web to plain-old Open MCT.
 2016-05-04 10:13:09 -07:00
Victor Woeltjen
de2703ee48 [Branding] Remove Web from name at top-level 
Per #816, change Open MCT Web to Open MCT in all top-level files.
 2016-05-04 10:08:55 -07:00
Andrew Henry
01f290dc45 Merge pull request #873 from nasa/open871 
Review and integrate open871
 2016-05-03 14:20:56 -07:00
Charles Hacskaylo
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
Victor Woeltjen
a13d0b7fab [Examples] Move examples out of main.js 
...such that they are not compiled into the Open MCT that
is used as the basis for non-example applications.

Addresses #835
 2016-04-26 15:52:09 -07:00
Charles Hacskaylo
0390f46460 [Frontend] z-index added to .object-top-bar .left element 
#836
 2016-04-25 09:55:21 -07:00
Pete Richards
9e5689f7dd Merge remote-tracking branch 'origin/revert-839-revert-822-open769' 2016-04-22 13:02:39 -07:00
Victor Woeltjen
0ccb696ee2 [Build] Bump version number, add -SNAPSHOT 
...to begin sprint Herbert,
https://github.com/nasa/openmct/milestones/Herbert
 2016-04-22 10:51:12 -07:00
Victor Woeltjen
d385e55e76 [Build] Remove snapshot suffix 
Closes sprint Heinlein,
https://github.com/nasa/openmct/milestones/Heinlein
 2016-04-22 10:46:07 -07:00
Andrew Henry
6bf1ef5bcc Revert "Revert "[Tables] Fix to correct sorting in realtime tables"" 2016-04-22 09:44:34 -07:00
Victor Woeltjen
abb511521b Merge pull request #837 from nasa/open794_fix 
[Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types
 2016-04-21 12:23:45 -07:00
Henry
11cfb6e1b8 [Edit] Elements pool filtering displays more consistent results 2016-04-21 10:42:50 -07:00
Victor Woeltjen
3a9b1ee901 Merge pull request #839 from nasa/revert-822-open769 
Revert "[Tables] Fix to correct sorting in realtime tables"
 2016-04-21 09:21:12 -07:00
Andrew Henry
8b390e7fb9 Revert "[Tables] Fix to correct sorting in realtime tables" 2016-04-20 19:31:54 -07:00
Andrew Henry
29bce69eea Merge pull request #822 from nasa/open769 
[Tables] Fix to correct sorting in realtime tables
 2016-04-20 19:30:04 -07:00
Henry
aac5a6d250 #769 - Removed empty code block and addressed some excessive guard code 2016-04-20 19:18:27 -07:00