ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 09:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,964 Commits 988 Branches 212 Tags 191 MiB
f3b265bdd5
Commit Graph

56 Commits

Author SHA1 Message Date
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Victor Woeltjen
de2703ee48 [Branding] Remove Web from name at top-level 
Per #816, change Open MCT Web to Open MCT in all top-level files.
 2016-05-04 10:08:55 -07:00
Victor Woeltjen
0ccb696ee2 [Build] Bump version number, add -SNAPSHOT 
...to begin sprint Herbert,
https://github.com/nasa/openmct/milestones/Herbert
 2016-04-22 10:51:12 -07:00
Victor Woeltjen
d385e55e76 [Build] Remove snapshot suffix 
Closes sprint Heinlein,
https://github.com/nasa/openmct/milestones/Heinlein
 2016-04-22 10:46:07 -07:00
Victor Woeltjen
1d78af8f1d [Build] Fix build on Windows 
* In the prepublish step, run bower and gulp via node, instead of
  relying on shebang interpretation. (Forward-slash path separators
  appear to get normalized by node itself before executing the scripts.)
* In the gulp build, replace hard-coded *nix-style separators with
  path.sep; this allows stylesheets to be output to expected locations
  when building on Windows.

Addresses #827.
 2016-04-12 13:02:48 -07:00
Victor Woeltjen
5e44bfc6c7 Merge branch 'master' into open671 
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
 2016-04-08 16:08:19 -07:00
Victor Woeltjen
73012233b8 [Build] Bump version number 
...to begin sprint Heinlein,
https://github.com/nasa/openmct/milestones/Heinlein
 2016-04-04 09:33:58 -07:00
Victor Woeltjen
339916ccd4 [Build] Remove SNAPSHOT status 
...to tag end of release Gibson,
https://github.com/nasa/openmct/milestones/Gibson
 2016-04-04 09:32:21 -07:00
Pete Richards
b0476edb8c [Package] Specify require minor version 
Specify requirejs minor version of 2.1, as 2.2 is not compatible
with karma-requirejs.

Fixes build problems that appeared after latest requirejs version bump.
 2016-03-17 14:28:22 -07:00
Victor Woeltjen
ff5f37dfbe [Build] Bump version number 
...and add SNAPSHOT status, to begin sprint Gibson.
https://github.com/nasa/openmctweb/milestones/Gibson
 2016-03-04 13:59:41 -08:00
Victor Woeltjen
7c2ddf3926 [Build] Remove snapshot status 
...to close sprint Ellison,
https://github.com/nasa/openmctweb/milestones/Ellison
 2016-03-04 13:48:31 -08:00
Victor Woeltjen
c7f199a59e [Build] Also lint specs 
...with additional tolerance declared for Jasmine variables.
 2016-03-04 12:01:11 -08:00
Pete Richards
b9e0a77655 [CI] Run JSHINT after tests 2016-03-01 13:07:16 -08:00
Pete Richards
d9b2034550 [Tests] Add jUnit reporter 
Add jUnit reporter to allow CircleCI to store test results.
 2016-03-01 12:53:32 -08:00
Henry
402512a461 Merged from master to resolve conflict 2016-02-26 15:15:22 -08:00
Victor Woeltjen
a73f1ebbbd Merge pull request #637 from nasa/rems_data 
[Examples] Rems data integration
 2016-02-26 14:21:30 -08:00
Henry
4674918b4b [Examples] #359 Updated to attempt connection to remote data source and fallback to local if unavailable 
Minor change to readme

Fixed JSLint errors

More JSLint errors

[Example] Rems data integration - disabled bundle by default.

[Examples] REMS data integration - added newlines at end of files

[Example] Added time conductor support to REMS data integration

Added caching of results

[Examples] Added domain format to REMS data #359

[Example] #637 Added local proxy to app.js to allow cross-origin requests

Updated readme
 2016-02-26 14:03:10 -08:00
Pete Richards
bd7ad85bd7 [Build] Remove unused dependency 
https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:28:45 -08:00
Pete Richards
0a71835687 [Build] Switch compass to bourbon 
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:02:16 -08:00
Pete Richards
5f81e95c87 [Build] Add Gemfile, use bundle exec 
Add a Gemfile to specify ruby dependencies and update gulp-compass to use
bundle exec to execute compass.

Addresses comments in https://github.com/nasa/openmctweb/pull/693
 2016-02-22 10:37:30 -08:00
Pete Richards
6fee4f340f [Build] Start 0.9.2-SNAPSHOT 2016-02-12 12:34:54 -08:00
Pete Richards
3de094e311 [Version] Remove snapshot for tag 
Update the version in advance of tagging a release.
 2016-02-12 11:17:11 -08:00
Victor Woeltjen
b40ac6f44f Merge remote-tracking branch 'origin/master' into open649 2016-02-08 12:25:25 -08:00
Victor Woeltjen
3adc5f1e26 [CSV Export] Upgrade to phantomjs launcher 1.0.0 2016-02-05 16:56:26 -08:00
Victor Woeltjen
215008253d [Build] Prevent accidental publish 2016-02-05 15:57:54 -08:00
Victor Woeltjen
54c67b891c [CSV Export] Update PhantomJS version 
Use version 2.1+ for availability of Linux binaries;
incidentally addresses #258.
 2016-02-05 13:59:03 -08:00
Victor Woeltjen
750a5648d2 [CSV Export] Upgrade PhantomJS 
...for Blob support.
 2016-02-05 13:31:08 -08:00
Victor Woeltjen
bb7f4239f6 [Build] Just install during prepublish 
Don't run verifications (tests, lint, etc)
 2016-01-29 16:56:29 -08:00
Victor Woeltjen
5081e89590 [Build] Add spaces in description 2016-01-29 12:43:36 -08:00
Victor Woeltjen
d2a7e04b44 [Build] Unhyphenate name 
...for consistency with GitHub repo name
 2016-01-29 12:43:10 -08:00
Victor Woeltjen
fcb23b42a4 [Build] Trigger bower during prepublish 2016-01-29 12:42:46 -08:00
Victor Woeltjen
6b585d175b [Build] Move build back to prepublish 2016-01-29 12:30:22 -08:00
Victor Woeltjen
6b32db778a [Build] Trigger gulp install at postinstall time 2016-01-29 12:24:33 -08:00
Victor Woeltjen
924a4026ff [Build] Trigger gulp from prepublish 2016-01-29 11:54:18 -08:00
Victor Woeltjen
0a546cd50c [Build] Run bower as a postinstall step 2016-01-29 10:17:44 -08:00
Victor Woeltjen
df94d31cf3 [Build] Generate build info for About dialog 2016-01-28 17:16:44 -08:00
Victor Woeltjen
c3f819fa8c [Build] Begin adding build info 2016-01-28 17:08:02 -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
fc7bd36dba [Build] Begin integrating compass 
Convert SCSS to CSS as a build step.
 2016-01-28 10:36:01 -08:00
Victor Woeltjen
406fdd5efc [Build] Run karma tests from gulp 2016-01-27 14:30:07 -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
e83b19c84b [Build] Add gulp dependency 
Add dependency on gulp to begin modifying build, per
#460
 2016-01-27 13:00:20 -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
Henry
3e7eb11d84 Regenerated bundles 2016-01-14 17:08:19 -08:00
Henry
6200ceddf8 [Documentation] Add text to main page #228 2015-12-11 11:12:42 -08:00
Victor Woeltjen
21739fffd9 [Documentation] Add table of contents 
Add table of contents to generated documents, without
modifying document sources; nasa/openmctweb#189.
 2015-10-20 15:58:57 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
5ab26df4c9 [Scripts] Add script to run karma continuously 
Add a script (to be executed with `npm run-script watch`) that
runs karma and watches for changes; rerunning tests whenever a
file is changed.  Useful for local development.
 2015-08-06 15:04:05 -07:00