Skip to content

Commit

Permalink
Merge branch 'release-1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
glasser committed Mar 17, 2015
2 parents 7d9afa3 + 7bf8665 commit 8ea5618
Show file tree
Hide file tree
Showing 657 changed files with 38,361 additions and 11,172 deletions.
10 changes: 10 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
android_bundle/
dev_bundle/
docs/
examples/
packages/
scripts/

tools/
!tools/*.js
tools/warehouse.js
18 changes: 17 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,33 @@
# (Note that this script always outputs GITHUB so you should manually
# check to see if they are an MDG employee!)

GITHUB: 0a- <[email protected]>
GITHUB: adnissen <[email protected]>
GITHUB: aldeed <[email protected]>
GITHUB: AlexeyMK <[email protected]>
GITHUB: andylash <[email protected]>
GITHUB: ansman <[email protected]>
GITHUB: anstarovoyt <[email protected]>
GITHUB: apendua <[email protected]>
GITHUB: awatson1978 <[email protected]>
GITHUB: awwx <[email protected]>
GITHUB: babenzele <[email protected]>
GITHUB: benweissmann <[email protected]>
GITHUB: bwhitty <[email protected]>
GITHUB: Cangit <[email protected]>
GITHUB: chrisbridgett <[email protected]>
GITHUB: christianbundy <[email protected]>
GITHUB: cmather <[email protected]>
GITHUB: codeinthehole <[email protected]>
GITHUB: colllin <[email protected]>
GITHUB: cryptoquick <[email protected]>
GITHUB: d4nyll <[email protected]>
GITHUB: dandv <[email protected]>
GITHUB: DanielDent <[email protected]>
GITHUB: DanielDent <[email protected]>
GITHUB: DanielDornhardt <[email protected]>
GITHUB: davegonzalez <[email protected]>
GITHUB: DenisGorbachev <[email protected]>
GITHUB: DenisGorbachev <[email protected]>
GITHUB: ducdigital <[email protected]>
GITHUB: duckspeaker <[email protected]>
Expand All @@ -46,9 +53,12 @@ GITHUB: FooBarWidget <[email protected]>
GITHUB: FredericoC <[email protected]>
GITHUB: Gaelan <[email protected]>
GITHUB: graemian <[email protected]>
GITHUB: gsuess <[email protected]>
GITHUB: hwillson <[email protected]>
GITHUB: icellan <[email protected]>
GITHUB: ImtiazMajeed <[email protected]>
GITHUB: jacott <[email protected]>
GITHUB: jakozaur <[email protected]>
GITHUB: JamesLefrere <[email protected]>
GITHUB: jbruni <[email protected]>
GITHUB: jfhamlin <[email protected]>
Expand All @@ -73,8 +83,9 @@ GITHUB: mquandalle <[email protected]>
GITHUB: musically-ut <[email protected]>
GITHUB: nathan-muir <[email protected]>
GITHUB: Neftedollar <[email protected]>
GITHUB: ograycode <jason@theograys.com>
GITHUB: netanelgilad <netanelgilad@gmail.com>
GITHUB: ogourment <[email protected]>
GITHUB: ograycode <[email protected]>
GITHUB: OyoKooN <[email protected]>
GITHUB: paulswartz <[email protected]>
GITHUB: pcjpcj2 <[email protected]>
Expand All @@ -86,6 +97,7 @@ GITHUB: prapicault <[email protected]>
GITHUB: Primigenus <[email protected]>
GITHUB: pscanf <[email protected]>
GITHUB: queso <[email protected]>
GITHUB: rbabayoff <[email protected]>
GITHUB: rcy <[email protected]>
GITHUB: rdickert <[email protected]>
GITHUB: restebanez <[email protected]>
Expand All @@ -96,10 +108,12 @@ GITHUB: richguan <[email protected]>
GITHUB: rick-golden-healthagen <[email protected]>
GITHUB: rissem <[email protected]>
GITHUB: RobertLowe <[email protected]>
GITHUB: romanzolotarev <[email protected]>
GITHUB: rosh93 <[email protected]>
GITHUB: ryw <[email protected]>
GITHUB: rzymek <[email protected]>
GITHUB: sdarnell <[email protected]>
GITHUB: Siilwyn <[email protected]>
GITHUB: smallhelm <[email protected]>
GITHUB: subhog <[email protected]>
GITHUB: svda <[email protected]>
Expand Down Expand Up @@ -139,5 +153,7 @@ METEOR: sixolet <[email protected]>
METEOR: Slava <[email protected]>
METEOR: Slava <[email protected]>
METEOR: stubailo <[email protected]>
METEOR: stubailo <[email protected]>
METEOR: stubailo <[email protected]>
METEOR: stubailo <[email protected]>
METEOR: yyx990803 <[email protected]>
2 changes: 2 additions & 0 deletions .reviewboardrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REVIEWBOARD_URL = 'https://rbcommons.com/s/meteor/'
REPOSITORY = 'Meteor framework'
8 changes: 6 additions & 2 deletions Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

Thank you for contributing to the Meteor project!

Before you file a bug or pull request, please read our
# Read the link below or your issue will probably be closed without a helpful resolution

**Before you file a bug or pull request, please read our
[contributing guidelines](https://github.com/meteor/meteor/wiki/Contributing-to-Meteor)
on GitHub for more details on how to file a bug report or submit a
pull request.
pull request.**



*Please do not file security issues in the GitHub issue tracker.* If
the issue you've found
Expand Down
Loading

0 comments on commit 8ea5618

Please sign in to comment.