Merge remote-tracking branch 'upstream/master'

Author: soohira-gy

.npmignore

@@ -6,6 +6,8 @@ nuget/
 doc/
 examples/
 tests/
+logos/
+modules/
 .git*
 .jshint*
 .npmignore

.travis.yml

@@ -9,3 +9,9 @@ env:
     - secure: "BVYlZy3vIt21bhrzKPgQzRlbwGCBrdBtRPRvX/qCGi1jYAoAtrT0bYllZpNqduPLouW3LaJDwOJx9zLDmZDwKDvPgTinpVwmkhZYRFl1kNweku3ZfeHR5ejOVYvdQEqVU4rOtTBLk6emItEPTuFtC9SPSYQZQtjnZAjHTg0jqLU="
 notifications:
   slack: reactivex:e424dAgQ2W9kuRMe6ngxHQbv
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/8f1482d7420d95b647ce
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

Gruntfile.js

@@ -1,60 +1,13 @@
 {
   "name": "rxjs",
-  "version": "2.5.2",
-  "main": [
-    "dist/rx.all.js",
-    "dist/rx.all.map",
-    "dist/rx.all.min.js",
-    "dist/rx.all.compat.js",
-    "dist/rx.all.compat.map",
-    "dist/rx.all.compat.min.js",
-    "dist/rx.js",
-    "dist/rx.map",
-    "dist/rx.min.js",
-    "dist/rx.compat.js",
-    "dist/rx.compat.map",
-    "dist/rx.compat.min.js",
-    "dist/rx.aggregates.js",
-    "dist/rx.aggregates.map",
-    "dist/rx.aggregates.min.js",
-    "dist/rx.async.js",
-    "dist/rx.async.map",
-    "dist/rx.async.min.js",
-    "dist/rx.async.compat.js",
-    "dist/rx.async.compat.map",
-    "dist/rx.async.compat.min.js",
-    "dist/rx.backpressure.js",
-    "dist/rx.backpressure.map",
-    "dist/rx.backpressure.min.js",
-    "dist/rx.binding.js",
-    "dist/rx.binding.map",
-    "dist/rx.binding.min.js",
-    "dist/rx.coincidence.js",
-    "dist/rx.coincidence.map",
-    "dist/rx.coincidence.min.js",
-    "dist/rx.experimental.js",
-    "dist/rx.experimental.map",
-    "dist/rx.experimental.min.js",
-    "dist/rx.lite.js",
-    "dist/rx.lite.map",
-    "dist/rx.lite.min.js",
-    "dist/rx.lite.compat.js",
-    "dist/rx.lite.compat.map",
-    "dist/rx.lite.compat.min.js",
-    "dist/rx.joinpatterns.js",
-    "dist/rx.joinpatterns.map",
-    "dist/rx.joinpatterns.min.js",
-    "dist/rx.testing.js",
-    "dist/rx.testing.map",
-    "dist/rx.testing.min.js",
-    "dist/rx.time.js",
-    "dist/rx.time.map",
-    "dist/rx.time.min.js",
-    "dist/rx.virtualtime.js",
-    "dist/rx.virtualtime.map",
-    "dist/rx.virtualtime.min.js"
-  ],
+  "main": "dist/rx.all.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Reactive-Extensions/RxJS.git"
+  },
+  "license": "Apache-2.0",
   "ignore": [
+    ".sh",
     ".*",
     "*.bat",
     "*.md",

bower.json

@@ -0,0 +1,12 @@
+# Code of Conduct #
+
+[_Adapted from the Rust Code of Conduct_](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct)
+
+We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
+- On any communication medium, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
+- Please be kind and courteous. There's no need to be mean or rude.
+- Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
+- Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
+- We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
+- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one the RxJS team immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
+- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.

code-of-conduct.md

@@ -1,3 +1,5 @@
+# Contributing to RxJS #
+
 Want to contribute to the Reactive Extensions for JavaScript (RxJS)?  There are many ways of helping whether contributing code, documentation, examples, podcasts, videos and presentations.
 
 # Get Involved!
@@ -13,19 +15,6 @@ To make a pull request, you will need a GitHub account; if you're unclear on thi
 
 Pull requests will be treated as "review requests", and we will give feedback we expect to see corrected on style and substance before pulling. Changes contributed via pull request should focus on a single issue at a time, like any other. We will not look kindly on pull-requests that try to "sneak" unrelated changes in.  Note for bug fixes, regression tests should be included, denoted by Issue Number so that we have full traceability.  
 
-# Code of Conduct
-
-[_Adapted from the Rust Code of Conduct_](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct)
-
-We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
-- On any communication medium, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
-- Please be kind and courteous. There's no need to be mean or rude.
-- Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
-- Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
-- We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
-- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one the RxJS team immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
-- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
-
 # What Are We Looking For?
 
 For documentation, we are looking for the following: