Henry
b7cfaf6b63
Fixed failed circle.yml command
2016-05-19 13:52:58 -07:00
Victor Woeltjen
34d5bc4f28
Merge pull request #939 from nasa/openmct-website
...
[Website] #901 Automate build process
2016-05-19 13:24:22 -07:00
Henry
e4b192001f
Changed circle.yml to go back to command-based deployment to heroku as cannot use 'heroku' deployment support and commands in the same deployment descriptor
2016-05-19 12:14:42 -07:00
Henry
516b8c9e38
[Website] #901 Automate build process - Updated build SHA
2016-05-19 11:39:08 -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
f12b9704d9
Merge branch 'master' into jscs-rebase-142
2016-05-19 11:28:16 -07:00
Henry
edb158f2d3
[Website] Added push to website repo
2016-05-19 10:44:58 -07:00
Henry
b2c6db6207
Changed circleci.yml
2016-05-19 10:44:58 -07:00
Henry
bcdd835275
[Website] Automate site build process
2016-05-19 10:44:57 -07:00
Victor Woeltjen
5b4952d4c6
Merge pull request #923 from nasa/open921
...
[Examples] #921 changed text in event generator example
2016-05-18 17:12:06 -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
Henry
5eff4e45c9
[Tutorials] #907 Updated tutorials to use new bundle registration mechanism
2016-05-17 17:24:32 -07:00
Henry
70a13a75d5
Updating tutorials
2016-05-17 13:22:15 -07:00
Andrew Henry
dcf26d3863
Merge pull request #937 from nasa/open929
...
R&I open929: Label context arrow always visible; frame dragging in label area
2016-05-16 16:10:33 -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
Victor Woeltjen
69cc1086df
Merge pull request #924 from nasa/open889b
...
[Popup] Add method to jqlite mocks
2016-05-16 10:14:52 -07:00
Victor Woeltjen
18fa9aeaf6
[Build] Bump version number, add -SNAPSHOT
...
...to begin sprint Huxley,
https://github.com/nasa/openmct/milestones/Huxley
2016-05-16 09:36:59 -07:00
Victor Woeltjen
96892722a4
[Build] Remove SNAPSHOT status
...
...to close sprint https://github.com/nasa/openmct/milestones/Herbert
2016-05-16 09:27:24 -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
Victor Woeltjen
031a46aa8e
[Code Style] Add JSHint rules
...
Add JSHint rules to complement allowing multiple var statements,
https://github.com/nasa/openmct/issues/142#issuecomment-212187972
[Code Style] Require one decl per var
[Code Style] Don't require separate var decls
...but allow them (for compatibility with existing code style)
[Code Style] Allow var decl after start of scope
[Code Style] Enforce codestyle during verify task
2016-05-12 16:32:17 -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
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
