ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,288 Commits 989 Branches 212 Tags 191 MiB
4091e9cdf4
Commit Graph

4288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Henry
4091e9cdf4 Merge pull request #1125 from medinae/patch-1 
Suppress commented code on the github repository
 2016-08-25 15:22:39 +01:00
Victor Woeltjen
b165322ba3 Merge pull request #1142 from BogdanAlexandru/tutorial-formatting-fix 
[Documentation] Fix code formatting
 2016-08-24 16:04:44 -07:00
Alex M
30750e63aa [Documentation] Code block spacing now consistent 2016-08-24 23:23:57 +03:00
Alex M
2cb636b050 [Documentation] Switch Step 2 to fenced 2016-08-24 22:56:43 +03:00
Alex M
5161205a06 [Documentation] Switch Step 1 to fenced 2016-08-24 22:45:55 +03:00
Alex M
79c5895f2f [Documentation] Fix code formatting 2016-08-24 21:07:11 +03:00
Victor Woeltjen
44f8c2f49f Merge pull request #1106 from nasa/search1093-b 
Minor Search enhancements
 2016-08-22 15:27:12 -07:00
Victor Woeltjen
eb3b6e5eca Merge pull request #1129 from nasa/open1128 
[Documentation] Updated docs build script to push documentation to the correct directory on the website
 2016-08-19 12:44:11 -07:00
Henry
ccc32096ea [Documentation] Updated docs build script to push documentation to the correct directory on the website 2016-08-16 18:57:18 -07:00
AbdelKader Bouadjadja
2167c061a2 No commented code on the github repository 2016-08-13 14:25:41 +04:00
Victor Woeltjen
2100c5717e [Build] Restore SNAPSHOT status 
...to open sprint Orwell,
https://github.com/nasa/openmct/milestones/Orwell
 2016-08-12 16:06:09 -07:00
Victor Woeltjen
acc1b8e207 [Build] Remove SNAPSHOT status 
...to close sprint Niven,
https://github.com/nasa/openmct/milestones/Niven
 2016-08-12 16:01:43 -07:00
Charles Hacskaylo
f3bd88837f Merge remote-tracking branch 'origin/master' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-08 17:51:39 -07:00
Charles Hacskaylo
8105a7edb8 Merge remote-tracking branch 'origin/master' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-08 17:51:25 -07:00
Victor Woeltjen
c8931f8535 [Tree] Simplify synchronization (#1100) 
Simplify synchronization of selection in tree with state
passed-in, letting Angular deal with more of the specifics.
Fixes #1008.
 2016-08-05 16:30:55 -07:00
Andrew Henry
0274490b68 [search] Reverted previous change to ClickAwayController and introduced a custom fix to search menu. Fixes #888 (#1109) 2016-08-05 16:30:20 -07:00
Charles Hacskaylo
06f2c74444 [Frontend] Minor search enhancements 
Fixes #1093
Finessed and cleaned up filters display
element; added '# results found' element;
 2016-08-02 15:57:43 -07:00
Victor Woeltjen
4d89de7068 Merge pull request #1105 from nasa/readme-new-api 
[Documentation] Add mention of new API to README
 2016-08-02 15:04:32 -07:00
Charles Hacskaylo
2d50a63ca4 Merge remote-tracking branch 'origin/search1093' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-02 15:03:48 -07:00
Andrew Henry
54dcccb472 [Documentation] Add mention of new API to README 
Added two paragraphs to the readme mentioning the ongoing API work with a link to the tracking task. The website will also link to this.
 2016-08-02 14:37:32 -07:00
Victor Woeltjen
d1e1ba1c66 [Frontend] Refactor glyphs to classes 
Squashes #1103, fixes #1047.

Squashed commit of the following:

commit 0e060f174d
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Fri Jul 29 14:55:34 2016 -0700

    [Frontend] Added button to .s-button

    Fixes #1047

commit 9f74395a79
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Fri Jul 29 14:43:36 2016 -0700

    [Frontend] Fixing problems from circleci

    Fixes #1047

commit 7278c9534c
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Fri Jul 29 14:37:21 2016 -0700

    [Frontend] CSS fixes for s-status classes

    Fixes #1047
    Fixed .s-status-editing and s-status-pending;

commit 4606d617d1
Merge: d5bff55 59436f7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Fri Jul 29 13:58:51 2016 -0700

    Merge remote-tracking branch 'origin/master' into frontend-1047

commit d5bff555e0
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 19:09:33 2016 -0700

    [Frontend] Updated glyphs used by plot view switcher

    Fixes #1047

commit b72d82baef
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 19:09:00 2016 -0700

    [Frontend] Tree styles in left pane and selector-list

    Fixes #1047

commit af36b9996d
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 18:32:34 2016 -0700

    [Frontend] Form validation styling

    Fixes #1047
    <mct-form> must now include class
    'validates'  to display validation glyph icons;
    removed 'no-validate' from markup; cleaned
    up validation scss;

commit 69dc893b4b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 17:11:52 2016 -0700

    [Frontend] Glyphs to classes, mobile

    Fixes #1047
    Fixes and enhancements for mobile,
    particularly in tree;  Removed
    `display: inline-block` from containerSubtle
    mixin;

commit 7bca18b186
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 11:36:19 2016 -0700

    [Frontend] Rename .s-menu-btn, remove unused

    Fixes #1047
    .s-menu-btn > .s-menu-button;
    .create-btn > .create-button;
    removed unused l-btn, t-btn,
    t-btns-zoom from markup

commit 5d229198b7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 11:25:36 2016 -0700

    [Frontend] Rename .s-clickable-icon to .s-icon-button

    Fixes #1047

commit 36479e2e8b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 11:20:30 2016 -0700

    [Frontend] Rename .s-btn to .s-button

    Fixes #1047

commit 89e4f06de9
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 11:12:07 2016 -0700

    [Frontend] Apply clickable-icon class

    Fixes #1047

commit e65ca1cb8b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Thu Jul 28 10:52:35 2016 -0700

    [Frontend] Updated icons

    Fixes #1047
    - Clock, timer, plots updated

commit 3e7eb98ac2
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Wed Jul 27 18:05:06 2016 -0700

    [Frontend] Standardizing styles

    Fixes #1047
    - Finessing mini-tab and making able to
    control per theme; s-clickable and s-toggle-icon
    classes cleaned up

commit 18e08074a8
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Wed Jul 27 16:33:25 2016 -0700

    [Frontend] Tweaks to sass code

    Fixes #1047
    - Splitter and mini-tab-icon elements

commit 44fda8d68f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Wed Jul 27 09:24:53 2016 -0700

    [Frontend] Multiple UI fixes and tweaks

    Fixes #1047
    mini-tabs, splitters and bg-splash updated;
    moved position of Inspector collapse mini-tab
    to allow position transition;
    splitter-sm class added for Timelines;

commit 2aee8bc0d8
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jul 26 15:53:32 2016 -0700

    [Frontend] Updated splash image

    Fixes #1047

commit 624f09777f
Merge: ce7591f 4d2f159
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jul 26 15:02:55 2016 -0700

    Merge remote-tracking branch 'origin/master' into frontend-1047

commit ce7591f642
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jul 26 11:22:23 2016 -0700

    [Frontend] Fixed clock indicator

    Fixes #1047
    Restored no-collapse and float-right
    properties;

commit 5324c8edba
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 18:14:38 2016 -0700

    [Frontend] New font and project file

    Fixes #1047
    New font files that were missed in
    last commit; updated icomoon proj
    file; fixed missing char codes in
    glyphs.scss;

commit a3b2628883
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 17:54:00 2016 -0700

    [Frontend] Revised and new icon art

    Fixes #1047
    New icons for overlay and stacked plots;
    revised art and new description for
    Fixed Position object;

commit 8a41c6dbc7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 17:52:41 2016 -0700

    [Frontend] Removing glyph definitions

    Fixes #1047
    Updated comment

commit eb293b21eb
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 11:56:18 2016 -0700

    [Frontend] Removing glyph definitions

    Fixes #1047
    Removed commented code

commit d8b1fb7781
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 11:17:45 2016 -0700

    [Frontend] Removing glyph definitions; updating tests

    Fixes #1047
    Search and removal of "glyph" definitions in bundle
    and other JS files; updating tests accordingly;

commit 650fbcc921
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 25 10:20:33 2016 -0700

    [Frontend] Removing glyph definitions; updating tests

    Fixes #1047
    Search and removal of "glyph" definitions in bundle
    and other JS files; updating tests accordingly;

commit 574b8bd5c1
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Fri Jul 22 19:11:56 2016 -0700

    [Frontend] Updated tests for glyph refactoring

    Fixes #1047
    Fixing test cases

commit dd84177441
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Fri Jul 22 18:47:45 2016 -0700

    [Frontend] Updated tests and examples for glyph refactoring

    Fixes #1047
    WIP: Fixing test cases: fixed test in Timers that was expecting
    glyph return;

commit 2231f8e124
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 17:45:20 2016 -0700

    [Frontend] Updated tests for glyph refactoring

    Fixes #1047
    Fixing test cases: fixed test in Timers that was expecting
    glyph return;

commit ae59ecfa97
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 17:38:45 2016 -0700

    [Frontend] Fixed style

    Fixes #1047
    WIP: fixed line-height issue for t-item-icon class

commit d43bff1445
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 17:07:49 2016 -0700

    [Frontend] Fixed colors

    Fixes #1047
    WIP: fixed colors  and style defs related to clickable
    icons

commit c2db6f8805
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 16:32:17 2016 -0700

    [Frontend] Fixed colors

    Fixes #1047
    WIP: fixed colors related to changes to
    btnSubtle mixin; new constants for clickable
    icons

commit a4753c44d1
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 15:23:58 2016 -0700

    [Frontend] Added new icon-brackets to symbols font

    Fixes #1047
    WIP

commit 2704640b94
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 15:11:28 2016 -0700

    [Frontend] Normalize color constants

    Fixes #1047
    Normalize color constant values for themes; consolidated
    and cleaned up btn-related mixins; fixed hover color issues

commit 421286c7e4
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 14:10:13 2016 -0700

    [Frontend] Convert new Fixed Position Display from glyphs

    Fixes #1047
    WIP

commit a4111f3855
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 14:07:38 2016 -0700

    [Frontend] Refactoring Timeline glyphs, s-btn fixes

    Fixes #1047
    WIP: Timeline-related glyph refactoring; s-btn
    styles and hover color fixes

commit 883f999215
Merge: 9d9cabb 14f1a1f
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jul 21 08:53:23 2016 -0700

    Merge remote-tracking branch 'origin/master' into frontend-1047

commit 9d9cabb760
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jul 19 16:20:20 2016 -0700

    [Frontend] Glyph refactoring

    Fixes #1047
    WIP: search, toolbar buttons; mods
    to flex archetypes

commit 28b663ce41
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 18 14:58:40 2016 -0700

    [Frontend] Glyph-related style changes to toolbars and buttons

    Fixes #1047
    Glyph refactoring  WIP for toolbar buttons;
    Timeline glyph refactoring continued

commit a9326f572f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 18 13:36:45 2016 -0700

    [Frontend] Glyph-related style changes to Timelines

    Fixes #1047
    Timeline glyph refactoring; Resource Graph icons
    in swimlanes now display grayed-out version when not
    added to the Resource Graph; minor color tweaks

commit d6e1737803
Merge: 88054e5 6176ca2
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Mon Jul 18 10:29:32 2016 -0700

    [Frontend] Merge master into frontend-1047

    Fixes #1047
    Resolved conflict in icomoon.json file

commit 88054e5e8e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 30 16:55:40 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress: significant mods to pane collapse/expand
    buttons and symbols, minor tweaks to splitter look,
    limits glyph definitions

commit 7c47343f5c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 30 16:52:21 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress: updated font files glyphs, mostly
    for pane collapse icons

commit fd00bdce54
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 30 12:20:55 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress: search menu

commit 272b4b649e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 30 12:11:25 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress: moved limits classes out
    of _contants and into _glyphs;
    timers, entanglement context menu items,
    form validation, date picker.

commit 95d26e6fe7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Wed Jun 29 14:18:12 2016 -0700

    [Frontend] Refactoring glyphs to classes

    Fixes #1047
    In-progress; limits

commit 26b30d96db
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 28 17:16:18 2016 -0700

    [Frontend] Refactoring glyphs to classes

    Fixes #1047
    In-progress; overlay close, search inputs,
    messages and message banners,
    ui-symbol removal in-progress.

commit 4e2a01ad85
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 28 16:21:05 2016 -0700

    [Frontend] Refactoring glyphs to classes

    Fixes #1047
    In-progress; .labeled added  to .s-btn,
    removed .s-icon-btn

commit 521db3c3fe
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 28 16:10:54 2016 -0700

    [Frontend] Refactoring glyphs to classes

    Fixes #1047
    In-progress; plot options, imagery buttons,
    cleanups in buttons.scss, edit-action buttons,
    .s-btn .no-label class added.

commit 8bb8db69e6
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 28 14:47:52 2016 -0700

    [Frontend] Refactoring glyphs to classes

    Fixes #1047
    In-progress; indicators, notifications, actions,
    tests

commit 53ed0bfb22
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 17:01:45 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress, really: view icons, timer/clock

commit 47dc7f2f6b
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 16:13:31 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In progress: grid items

commit 2bd34f71be
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 15:00:46 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    Context menus and associated actions,
    custom checkboxes, tree item being edited

commit b561d4f60e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 14:27:56 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In-progess: glyphs.scss now uses $vars to
    allow other scss to use a var instead of string
    literals;

commit 0cf4089620
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 14:13:59 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In-progess: tree-labels, unknown objects, object
    header

commit 46cae10905
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 11:41:06 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In-progess, menus and Create menu fixes

commit fe3097707f
Merge: 7d69ae4 652a50c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Mon Jun 27 11:20:55 2016 -0700

    Merge remote-tracking branch 'origin/master' into frontend-1047

commit 7d69ae401b
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 23 15:59:56 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In-progress, converting types, mods to
    Create Menu template

commit 18d9f3d6b2
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 23 15:14:22 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    Very much In-progess: convert some controls;

commit e93a90a782
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 23 11:28:07 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    Very much In-progess, classes for all symbols
    added to glyphs.scss; .menu cleaned up;

commit dc670b22a6
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Thu Jun 23 08:55:27 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    Very much In-progess, "icon-" selector,
    browse bar buttons

commit 8b29ccf3af
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Wed Jun 22 23:15:24 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    Very much In-progess, s-btn and
    s-btn-menu refactoring

commit f574ffed16
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Wed Jun 22 14:37:34 2016 -0700

    [Frontend] Refactoring glyphs to classes

    fixes #1047
    In-progess, e900 > e904

commit bc62ee4565
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Wed Jun 22 13:28:15 2016 -0700

    [Frontend] Complete revamp of unicodes

    fixes #1047
    New font files; no re-mapping yet in the app.

commit 614f0c6e9f
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date:   Wed Jun 22 13:23:18 2016 -0700

    [Frontend] Complete revamp of unicodes

    fixes #1047
    Moved all glyphs into PUA area of font, and
    re-organized by category.

commit 47bd4031d5
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 21 18:39:48 2016 -0700

    [Frontend] Renaming symbols font files

    Fixes #1047
    - Modified sass to point to renamed font files;
    - Added new 12px symbols font files to sass;

commit 22a51d6bbb
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 21 18:22:33 2016 -0700

    [Frontend] Updating Icomoon project files

    Fixes #1047
    - Renamed main project file;
    - Added new 12px symbols project file;

commit 13ded2fd84
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 21 18:19:27 2016 -0700

    [Frontend] Added new 12px symbols font files

    Fixes #1047

commit aef5660dfd
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date:   Tue Jun 21 18:16:56 2016 -0700

    [Frontend] Renaming symbols font files

    Fixes #1047
 2016-08-01 14:33:25 -07:00
Victor Woeltjen
59436f7b45 [Tests] Load all sources (#1098) 
Load all source files when running Karma's test suite; this
ensures that code coverage metrics are not invalidated by
missing files. Fixes #1090.
 2016-07-28 10:45:38 -07:00
Victor Woeltjen
4d2f159dd8 [Build] Bump version number 
...and restore SNAPSHOT status to open sprint Niven,
https://github.com/nasa/openmct/milestone/15
 2016-07-25 12:07:41 -07:00
Victor Woeltjen
26a9d53f3b [Build] Remove SNAPSHOT Status 
To close sprint Le Guin,
https://github.com/nasa/openmct/milestone/14
 2016-07-25 11:46:40 -07:00
Charles Hacskaylo
9fa6184b0a [Frontend] Markup / Angular mods to Search 
Fixes #1093
WIP: markup changes. Needs CSS mods effected in
#1047 as well.
 2016-07-19 15:23:22 -07:00
Pete Richards
14f1a1f740 Merge remote-tracking branch 'origin/open1031' 2016-07-18 11:43:55 -07:00
Pete Richards
5a6c209369 Merge branch 'jesusprubio-open1036' 2016-07-18 11:39:04 -07:00
Pete Richards
8c2ce81b76 Merge branch 'open1036' of https://github.com/jesusprubio/openmct into jesusprubio-open1036 2016-07-18 11:37:00 -07:00
Pete Richards
99ec188813 Merge remote-tracking branch 'origin/open254' 2016-07-18 11:35:43 -07:00
Pete Richards
41d0089e53 Merge remote-tracking branch 'origin/open1065' 2016-07-18 11:19:55 -07:00
Pete Richards
8ed9f51008 Merge remote-tracking branch 'origin/open1075-fixed' 2016-07-18 11:17:05 -07:00
Andrew Henry
6176ca2260 Merge pull request #1084 from nasa/transaction-clearing-1059 
[Persistence] Clear transactions selectively
 2016-07-15 16:20:19 -07:00
Victor Woeltjen
eb6ddb5e45 [Persistence] Use ids from TransactionManager API 
Recommended during code review,
https://github.com/nasa/openmct/pull/1084#discussion_r71021889
 2016-07-15 12:26:35 -07:00
Andrew Henry
c5041db1d1 Merge pull request #1083 from nasa/contextualize-624 
[Context] Remove excessive warnings
 2016-07-15 11:05:52 -07:00
Henry
307b678707 [Fixed] Create new object type based on Telemetry Panel 'Fixed' view. Fixes #1075 2016-07-14 17:00:13 -07:00
Victor Woeltjen
550e60455b [Persistence] Fix code style 2016-07-14 16:49:31 -07:00
Victor Woeltjen
d263b80810 [Persistence] Add TransactionManager JSDoc 
Fixes #1059 (or, rather, concludes work on said fix)
 2016-07-14 16:47:36 -07:00
Victor Woeltjen
99227d2e42 [Persistence] Finish testing TransactionManager 2016-07-14 16:39:50 -07:00
Victor Woeltjen
31264aadda [Persistence] Begin testing TransactionManager 2016-07-14 16:28:27 -07:00
Victor Woeltjen
11a2fbacb4 [Persistence] Add test cases 
Adds test cases for TransactionalPersistenceCapability which brings
coverage up to 100%.
 2016-07-14 16:22:25 -07:00
Victor Woeltjen
7c865f87be [Persistence] Update transactional persistence spec 
...to account for changes to separate out transaction management,
including removal of specs made obsolete (as tested behavior has
been moved to TransactionManager or was already redundant to
behavior from the undecorated PersistenceCapability)
 2016-07-14 16:20:29 -07:00
Victor Woeltjen
86fcf19066 [Persistence] Update Save As spec 
...to account for asynchrony in test case due to usage of
Promise.all
 2016-07-14 16:14:20 -07:00
Victor Woeltjen
1f7cece8ec [Persistence] Remove unused variable 2016-07-14 15:05:43 -07:00
Victor Woeltjen
a731c35ad6 [Persistence] Refactor out transaction management 2016-07-14 13:43:55 -07:00
Victor Woeltjen
c7529dd56b [Persistence] Share transaction clearing functions 2016-07-14 12:53:58 -07:00
Victor Woeltjen
00fff52529 [Persistence] Track persist-pending state globally 2016-07-14 12:50:36 -07:00
Victor Woeltjen
4c7ad6d93a Merge branch 'undirty-on-refresh-1046' into transaction-clearing-1059 
Conflicts:
	platform/commonUI/edit/src/actions/SaveAsAction.js
 2016-07-14 11:53:39 -07:00
Victor Woeltjen
eb5493e37b [Persistence] Revert quick-fix for persistence clearing 
Revert "Squashed commit of the following:"

This reverts commit d1c01d3c86.
 2016-07-14 11:51:59 -07:00
Victor Woeltjen
1fb18c7919 [Context] Add test, tweak logic 
Add test to verify that warnings are not shown based on
composition/location inconsistencies when editing.
 2016-07-14 11:16:07 -07:00
Victor Woeltjen
1c2378b3b4 [Context] Suppress warnings while editing 
Don't expect consistency between composition and location fields
while an object is being edited; this avoids benign warnings
being logged. Fixes #624
 2016-07-14 11:10:15 -07:00