Henry
776586ae25
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-19 17:09:56 -07:00
Victor Woeltjen
dc348f33c5
Merge pull request #940 from nasa/openmct-website
...
[Website] Fixed failed circle.yml command
2016-05-19 14:18:55 -07:00
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
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
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
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
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
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
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
