ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 17:38:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,696 Commits 988 Branches 212 Tags 191 MiB
5920533637
Commit Graph

3696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
d67ffa8401 [Build] Add fixstyle step 2016-01-28 14:39:14 -08:00
Victor Woeltjen
fd2f4128a0 [Build] Add code style checks 2016-01-28 14:33:57 -08:00
Victor Woeltjen
814fb3b513 [Build] Add lint step 2016-01-28 13:44:18 -08:00
Victor Woeltjen
e0fbaa83b0 [Build] Add compatibility with text plugin 
Allow templates to be loaded via the text plugin, which
in turn will allow these to be built into the final JS
artifact.
 2016-01-28 11:41:14 -08:00
Victor Woeltjen
967f8c9151 [Build] Update remaining library references 2016-01-28 11:25:44 -08:00
Victor Woeltjen
84ecfd3527 [Build] Remove remaining files in libs 2016-01-28 11:21:08 -08:00
Victor Woeltjen
3a4f6a7229 [Build] Update dependency references 
...to reflect movement of third-party libraries to
bower_components.
 2016-01-28 11:18:57 -08:00
Victor Woeltjen
7a160a0a98 [Build] Remove third-party libraries 2016-01-28 11:13:11 -08:00
Victor Woeltjen
cf15b6eed7 [Build] Add additional run-time dependencies 2016-01-28 11:12:18 -08:00
Victor Woeltjen
452b05eb7b [Build] Update RequireJS config 
...to use bower_components paths
 2016-01-28 10:55:22 -08:00
Victor Woeltjen
82261dfabc [Build] Add bower.json 
...to declare front-end dependencies, to allow these to be
removed from repository.
 2016-01-28 10:51:52 -08:00
Victor Woeltjen
fc7bd36dba [Build] Begin integrating compass 
Convert SCSS to CSS as a build step.
 2016-01-28 10:36:01 -08:00
Victor Woeltjen
918c667496 [Build] Update code coverage report path 2016-01-27 15:00:59 -08:00
Victor Woeltjen
7c23f803e8 Merge pull request #477 from nasa/open337 
Review and integrate open337
 2016-01-27 14:33:37 -08:00
Victor Woeltjen
97c69799b4 [Build] Use spaces instead of tabs 2016-01-27 14:30:40 -08:00
Victor Woeltjen
406fdd5efc [Build] Run karma tests from gulp 2016-01-27 14:30:07 -08:00
Victor Woeltjen
f334be8f23 [Build] Externalize source maps 2016-01-27 14:01:09 -08:00
Victor Woeltjen
e1b7f2af30 [Build] Add initial gulp task 
Add initial gulp task (r.js optimization)
 2016-01-27 13:23:17 -08:00
Victor Woeltjen
ad63b9ff1b [Build] Ignore dist 2016-01-27 13:03:08 -08:00
Victor Woeltjen
e83b19c84b [Build] Add gulp dependency 
Add dependency on gulp to begin modifying build, per
#460
 2016-01-27 13:00:20 -08:00
Victor Woeltjen
dbf196e014 Merge remote-tracking branch 'github/master' into open477 
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2016-01-27 12:53:46 -08:00
Victor Woeltjen
b5c8ecc85f Merge pull request #475 from nasa/open325b 
[Time Conductor] Update validation logic
 2016-01-27 12:44:14 -08:00
Victor Woeltjen
9e6da94878 [Time Conductor] Reformat expression in template 
...to use less line width, and to exhibit more normal
indentation, per code review feedback from #475
 2016-01-22 15:24:27 -08:00
Victor Woeltjen
3a26c864b8 [Time Conductor] Fix comment text 
Per code review feedback, #475
 2016-01-22 15:22:54 -08:00
Pete Richards
be7827d6f8 Merge remote-tracking branch 'open/open445' into open-master 2016-01-22 11:47:05 -08:00
Henry
b8b5fdcabf [Copy] #497 Removed extraenuous persist call 2016-01-22 11:32:20 -08:00
Henry
c091063b83 [Examples] #359 Cleaned up REMS data integration example. 2016-01-22 10:49:40 -08:00
Victor Woeltjen ★
45276183b9 Merge pull request #496 from nasa/open492 
[Documentation] #492 Amended CircleCI configuration to add missing dependency
 2016-01-22 09:30:27 -08:00
Henry
54653f3914 [Create] #491 Locator is not visible when creating a new object where selected object does not have location 
Added additional test for default context

Fixed JSLint error
 2016-01-21 16:35:18 -08:00
Henry
cd2b19eb1e [New Edit Mode] Fixed failing tests, and added new test in CreateWizard 
[New Edit Mode] #480 fixed JSLint errors

[New Edit Mode] #480 do not show locator for sub objects

[New Edit Mode] Modified persistence in SaveAction

Removed redundant variable

Fixed Failing Test

Fixed JSLint errors

Improved some documentation
 2016-01-21 12:01:38 -08:00
Henry
3850db268a [Documentation] #492 Added missing dependency for CircleCI 2016-01-21 10:54:49 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Victor Woeltjen ★
fcae3fd7a9 Merge pull request #487 from nasa/open486 
Review and integrate open486
 2016-01-19 11:38:50 -08:00
Victor Woeltjen ★
83dd23cd4b Merge pull request #490 from nasa/nem-build-fixes 
NEM build fixes
 2016-01-19 11:37:25 -08:00
Pete Richards
26c155da3b Merge branch 'open483' into open-master 2016-01-18 14:09:30 -08:00
Pete Richards
db7560c31f [Test] Use PhantomJS to run tests 
Switch Karma to use PhantomJS to run tests.  CI machines no longer
need to have Chrome installed.

Implemented after changes to build process due to imperative registration.

https://github.com/nasa/openmctweb/issues/450
 2016-01-18 13:57:32 -08:00
Pete Richards
6fc028e112 [Docs] remove dependencies for building docs 
Remove depencendies necessary to build docs from package.json and
specify them in the readme.  Due to difficulty managing dependencies
for nomnoml on different platforms, this reduces dependency requirements
to only those needed for building the package.
 2016-01-18 13:54:33 -08:00
Charles Hacskaylo
2d44cf78f9 [Frontend] Fixed HTML and CSS for grid-item 
open #486
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
 2016-01-15 15:33:10 -08:00
Victor Woeltjen ★
9b6f3bff85 Merge pull request #485 from nasa/open337-filters 
[Plot] Use filters to reverse tick labels
 2016-01-15 13:30:41 -08:00
Victor Woeltjen
c2207fe7ce [Plot] Use reverse filter for range ticks too 2016-01-15 13:14:33 -08:00
Victor Woeltjen
119429bc42 [Plot] Test reverse filter 2016-01-15 13:13:08 -08:00
Victor Woeltjen
a94e99af70 [Plot] Use reverse filter for plot ticks 
...to remove CSS-related reversal from scripts
 2016-01-15 13:09:05 -08:00
Victor Woeltjen
96dc055f02 [Plot] Add reverse filter 2016-01-15 13:06:56 -08:00
Victor Woeltjen
a50410f8ed [Plot] Allow filters to be registered 
https://github.com/nasa/openmctweb/pull/477/files#r49903975
 2016-01-15 13:00:24 -08:00
Victor Woeltjen
0dc715199d [Build] Include examples in build 2016-01-15 11:44:26 -08:00
Victor Woeltjen
aab53c4ae1 [Build] Exclude target from build 2016-01-15 11:41:50 -08:00
Victor Woeltjen
b63812111d [Build] Include bundle.js files 
https://github.com/nasa/openmctweb/issues/483
 2016-01-15 11:34:58 -08:00
Henry
193c7e3db2 [New Edit Mode] Fixed failing Time Conductor Test 2016-01-14 19:57:06 -08:00
Henry
a023b0e19c Fixed failing MCTToolbarSpec 2016-01-14 19:22:33 -08:00
Henry
66e827de2e Fixed Outstanding issues from merge 2016-01-14 18:51:53 -08:00