ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 13:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,038 Commits 989 Branches 212 Tags 191 MiB
85432af187
Commit Graph

3384 Commits

Author SHA1 Message Date
Victor Woeltjen
85432af187 [Timeline] Don't store zoom configuration 
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
 2016-05-24 11:53:27 -07:00
Victor Woeltjen
9a5209f7c2 [Timeline] Add zoom-to-fit button 2016-05-23 16:06:10 -07:00
Victor Woeltjen
0818a7cda0 [Timeline] Increase maximum zoom level 
#936
 2016-05-23 15:36:26 -07:00
Victor Woeltjen
f35947361c [Timeline] Remain centered during zoom 
#936
 2016-05-23 15:32:48 -07:00
Henry
fd9d766913 Defer resolution of scope in DropGesture 2016-05-20 15:15:18 -07:00
Henry
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
Andrew Henry
25a2321578 Merge pull request #927 from nasa/jscs-rebase-142 
[Code Style] Enforce code style
 2016-05-20 14:03:27 -07:00
Andrew Henry
6fb36374f6 Merge pull request #942 from nasa/persist-graph-toggles-908 
[Timeline] Persist resource graph toggles
 2016-05-20 13:27:41 -07:00
Victor Woeltjen
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
Victor Woeltjen
bce5643994 Merge branch 'master' into jscs-rebase-142 
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js
 2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
1419ff86e8 Merge pull request #946 from nasa/open636 
[New Edit Mode] #636 Removed edit concerns from DropGesture
 2016-05-20 10:52:11 -07:00
Henry
601bc03ba2 [New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic 2016-05-20 10:42:17 -07:00
Henry
776586ae25 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-19 17:09:56 -07:00
Victor Woeltjen
2a4004fd5b [Timeline] Test mct-representation ordering 
Verify that a configuration object has been added to scope before
changing templates. #908
 2016-05-19 15:09:57 -07:00
Victor Woeltjen
b5229d7786 [Timeline] Commit changes on toggle 
#908
 2016-05-19 15:06:06 -07:00
Victor Woeltjen
20ecf168f2 [Timeline] Change ordering in mct-representation 
...such that the configuration property is available in scope
when a view is first instantiated. #908
 2016-05-19 15:00:12 -07:00
Victor Woeltjen
f9631ff4c5 [Code Style] Fix style missed by gulp fixstyle 
...and remove an unnecessary comment, too.
 2016-05-19 11:29:41 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Victor Woeltjen
de43aa81be Merge pull request #838 from nasa/open824_rebase 
[Edit] #824 - Remove EditableDomainObject
 2016-05-18 17:01:24 -07:00
Charles Hacskaylo
a729edd399 [Frontend] Label context arrows now always visible 
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
 2016-05-16 12:00:29 -07:00
Henry
54a0de4a08 [New Edit Mode] #636 Removed edit concerns from DropGesture 2016-05-13 17:59:43 -07:00
Henry
a11dba88b2 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-12 20:23:33 -07:00
Henry
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
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
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
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
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
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
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
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