Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/facebook/react
Browse files Browse the repository at this point in the history
  • Loading branch information
gicappa committed Jan 15, 2015
2 parents fff640f + 8d5838a commit e92e9be
Show file tree
Hide file tree
Showing 624 changed files with 20,431 additions and 16,472 deletions.
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# We can probably lint these later but not important at this point
src/vendor
src/vendor_deprecated
# estraverse stumbles on XJSSpreadAttribute so just ignore tests for now
src/**/__tests__/**
# This should be enabled but that folder has too much in it that doesn't belong
src/test
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ build/
docs/code
docs/_site
docs/.sass-cache
docs/css/react.css
docs/js/*
docs/downloads
examples/shared/*.js
Expand Down
3 changes: 0 additions & 3 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
"newcap": false,
"noempty": true,
"nonstandard": true,
"onecase": true,
"sub": true,
"regexdash": true,
"trailing": true,
"undef": true,
"unused": "vars"
}
21 changes: 21 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
Andres Suarez <[email protected]>
Ben Alpert <[email protected]> <[email protected]>
Ben Newman <[email protected]> <[email protected]>
Bill Fisher <[email protected]>
Cheng Lou <[email protected]> <[email protected]>
Christoph Pojer <[email protected]>
Christoph Pojer <[email protected]> <[email protected]>
Connor McSheffrey <[email protected]> <[email protected]>
Dan Schafer <[email protected]>
Daniel Gasienica <[email protected]> <[email protected]>
Daniel Gasienica <[email protected]> <[email protected]>
Daniel Lo Nigro <[email protected]> <[email protected]>
Evan Coonrod <[email protected]>
Fabio M. Costa <[email protected]> <[email protected]>
Felix Kling <[email protected]> <[email protected]>
François-Xavier Bois <[email protected]>
Geert Pasteels <[email protected]>
George A Sisco III <[email protected]>
Harry Hull <[email protected]>
Hendrik Swanepoel <[email protected]>
Ingvar Stepanyan <[email protected]> <[email protected]>
Irae Carvalho <[email protected]>
Ivan Vergiliev <[email protected]>
Jaime Mingo <[email protected]>
James Brantly <[email protected]>
Jan Hancic <[email protected]> <[email protected]>
Jan Kassens <[email protected]> <[email protected]>
Jason Bonta <[email protected]> <[email protected]>
Jason Trill <[email protected]>
Jeff Morrison <[email protected]> <[email protected]>
Expand All @@ -24,6 +39,7 @@ Keito Uchiyama <[email protected]> <[email protected]>
Kunal Mehta <[email protected]> <[email protected]>
Laurence Rowe <[email protected]> <[email protected]>
Martin Andert <[email protected]>
Mathieu M-Gosselin <[email protected]> <[email protected]>
Michal Srb <[email protected]> xixixao <[email protected]>
Nick Gavalas <[email protected]>
Nick Thompson <[email protected]> <[email protected]>
Expand All @@ -34,13 +50,18 @@ Pete Hunt <[email protected]> <[email protected]>
Pete Hunt <[email protected]> <[email protected]>
Pete Hunt <[email protected]> <[email protected]>
Petri Lievonen <[email protected]>
Petri Lievonen <[email protected]> <[email protected]>
Pieter Vanderwerff <[email protected]> <[email protected]>
Ray <[email protected]>
Richard Feldman <[email protected]> <[email protected]>
Richard Livesey <[email protected]>
Rob Arnold <[email protected]>
Sander Spies <[email protected]>
Sebastian Markbåge <[email protected]> <[email protected]>
Stoyan Stefanov <[email protected]>
Thomas Aylott <[email protected]> <[email protected]>
Timothy Yung <[email protected]> <[email protected]>
Vjeux <[email protected]>
Vjeux <[email protected]> <[email protected]>
Volkan Unsal <[email protected]>
Zach Bruggeman <[email protected]> <[email protected]>
20 changes: 11 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@
language: node_js
node_js:
- '0.10'
sudo: false
cache:
directories:
- node_modules
before_install:
- |
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
PR_FIRST=$(curl -s https://github.com/${TRAVIS_REPO_SLUG}/pull/${TRAVIS_PULL_REQUEST}.patch | head -1 | grep -o -E '\b[0-9a-f]{40}\b' | tr -d '\n')
TRAVIS_COMMIT_RANGE=$PR_FIRST^..$TRAVIS_COMMIT
fi
git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs|examples))/' || {
echo "Only docs were updated, stopping build process."
exit
}
script:
- |
grunt $TEST_TYPE
Expand All @@ -31,15 +42,7 @@ env:
matrix:
- TEST_TYPE=test
- TEST_TYPE=lint
- TEST_TYPE=perf:full
- TEST_TYPE=test:coverage
- TEST_TYPE=test:webdriver:saucelabs:modern
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
- TEST_TYPE=test:webdriver:saucelabs:ios
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
global:
# SERVER
- secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
Expand All @@ -48,7 +51,6 @@ env:
matrix:
fast_finish: true
allow_failures:
- env: TEST_TYPE=lint
- env: TEST_TYPE=test:coverage
- env: TEST_TYPE=perf:full
- env: TEST_TYPE=test:webdriver:saucelabs:modern
Expand Down
136 changes: 129 additions & 7 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,97 +1,186 @@
Adam Krebs <[email protected]>
Adam Mark <[email protected]>
Adam Solove <[email protected]>
Alan deLevie <[email protected]>
Alex Zelenskiy <[email protected]>
Alexander Solovyov <[email protected]>
Alexey Raspopov <[email protected]>
Andre Z Sanchez <[email protected]>
Andreas Svensson <[email protected]>
Andres Suarez <[email protected]>
Andrew Davey <[email protected]>
Andrew Rasmussen <[email protected]>
Andrew Zich <[email protected]>
Andrey Popp <[email protected]>
Anthony van der Hoorn <[email protected]>
Areeb Malik <[email protected]>
Ayman Osman <[email protected]>
Ben Alpert <[email protected]>
Ben Alpert <[email protected]>
Ben Foxall <[email protected]>
Ben Newman <[email protected]>
Ben Ripkens <[email protected]>
Bill Fisher <[email protected]>
Bob Eagan <[email protected]>
Bojan Mihelac <[email protected]>
Brandon Bloom <[email protected]>
Brandon Tilley <[email protected]>
Brian Cooke <[email protected]>
Brian Kim <[email protected]>
Brian Reavis <[email protected]>
Brian Rue <[email protected]>
Cam Spiers <[email protected]>
Cassus Adam Banko <[email protected]>
Cat Chen <[email protected]>
Charles Marsh <[email protected]>
Cheng Lou <[email protected]>
Chris Sciolla <[email protected]>
Christian Alfoni <[email protected]>
Christian Roman <[email protected]>
Christoph Pojer <[email protected]>
Christopher Monsanto <[email protected]>
Clay Allsopp <[email protected]>
Connor McSheffrey <[email protected]>
Cotton Hou <[email protected]>
Dan Abramov <[email protected]>
Dan Schafer <[email protected]>
Daniel Gasienica <[email protected]>
Daniel Lo Nigro <[email protected]>
Daniel Gasienica <[email protected]>
Daniel Lo Nigro <[email protected]>
Daniel Miladinov <[email protected]>
Daniel Schonfeld <[email protected]>
Danny Ben-David <[email protected]>
Daryl Lau <[email protected]>
David Hellsing <[email protected]>
David Hu <[email protected]>
Devon Blandin <[email protected]>
Dmitrii Abramov <[email protected]>
Dmitry Mazuro <[email protected]>
Dustin Getz <[email protected]>
Enguerran <[email protected]>
Eric Clemmons <[email protected]>
Eric Florenzano <[email protected]>
Eric Schoffstall <[email protected]>
Evan Coonrod <[email protected]>
Fabio M. Costa <[email protected]>
Felipe Oliveira Carvalho <[email protected]>
Felix Kling <[email protected]>
Felix Gnass <[email protected]>
Felix Kling <[email protected]>
Fernando Correia <[email protected]>
François-Xavier Bois <[email protected]>
Fred Zhao <[email protected]>
G Scott Olson <[email protected]>
Garren Smith <[email protected]>
Geert Pasteels <[email protected]>
Geert-Jan Brits <[email protected]>
George A Sisco III <[email protected]>
Gilbert <[email protected]>
Glen Mailer <[email protected]>
Greg Hurrell <[email protected]>
Greg Roodt <[email protected]>
Guangqiang Dong <[email protected]>
Guido Bouman <[email protected]>
Harry Hull <[email protected]>
Harshad Sabne <[email protected]>
Hendrik Swanepoel <[email protected]>
Hugo Jobling <[email protected]>
Ian Obermiller <[email protected]>
Ingvar Stepanyan <[email protected]>
Irae Carvalho <[email protected]>
Isaac Salier-Hellendag <[email protected]>
Ivan Kozik <[email protected]>
Ivan Vergiliev <[email protected]>
Jacob Gable <[email protected]>
Jacob Greenleaf <[email protected]>
Jaime Mingo <[email protected]>
Jakub Malinowski <[email protected]>
James Brantly <[email protected]>
James Ide <[email protected]>
James Seppi <[email protected]>
Jamie Wong <[email protected]>
Jamison Dance <[email protected]>
Jan Kassens <[email protected]>
Jan Hancic <[email protected]>
Jan Kassens <[email protected]>
Jared Forsyth <[email protected]>
Jason Bonta <[email protected]>
Jason Trill <[email protected]>
Jean Lauliac <[email protected]>
Jed Watson <[email protected]>
Jeff Barczewski <[email protected]>
Jeff Carpenter <[email protected]>
Jeff Chan <[email protected]>
Jeff Morrison <[email protected]>
Jeff Welch <[email protected]>
Jeffrey Lin <[email protected]>
Jesse Skinner <[email protected]>
Jignesh Kakadiya <[email protected]>
Jim OBrien <[email protected]>
Jimmy Jea <[email protected]>
Jing Chen <[email protected]>
Johannes Baiter <[email protected]>
Johannes Emerich <[email protected]>
John Watson <[email protected]>
Jon Beebe <[email protected]>
Jonas Enlund <[email protected]>
Jonas Gebhardt <[email protected]>
Jonathan Hsu <[email protected]>
Jordan Walke <[email protected]>
Josh Bassett <[email protected]>
Josh Duck <[email protected]>
Josh Yudaken <[email protected]>
Joshua Ma <[email protected]>
Julen Ruiz Aizpuru <[email protected]>
Julien Bordellier <[email protected]>
Jun Wu <[email protected]>
Juraj Dudak <[email protected]>
Justin Jaffray <[email protected]>
Karl Mikkelsen <[email protected]>
Karpich Dmitry <[email protected]>
Keito Uchiyama <[email protected]>
Kit Randel <[email protected]>
Kunal Mehta <[email protected]>
Kyle Mathews <[email protected]>
Laurence Rowe <[email protected]>
Lee Byron <[email protected]>
Levi McCallum <[email protected]>
Lily <[email protected]>
Logan Allen <[email protected]>
Luigy Leon <[email protected]>
Marcin Kwiatkowski <[email protected]>
Marcin Szczepanski <[email protected]>
Mariano Desanze <[email protected]>
Mark Anderson <[email protected]>
Mark Hintz <[email protected]>
Mark IJbema <[email protected]>
Mark Richardson <[email protected]>
Marshall Roch <[email protected]>
Martin Andert <[email protected]>
Martin Konicek <[email protected]>
Mathieu M-Gosselin <[email protected]>
Matt Harrison <[email protected]>
Matthew Dapena-Tretter <[email protected]>
Matti Nelimarkka <[email protected]>
Max F. Albrecht <[email protected]>
Michael Chan <[email protected]>
Michael Randers-Pehrson <[email protected]>
Michal Srb <[email protected]>
Mike D Pilsbury <[email protected]>
Miorel Palii <[email protected]>
Mouad Debbar <[email protected]>
Nadeesha Cabral <[email protected]>
Naman Goel <[email protected]>
Nate Hunzaker <[email protected]>
Nathan White <[email protected]>
Nicholas Bergson-Shilcock <[email protected]>
Nick Fitzgerald <[email protected]>
Nick Gavalas <[email protected]>
Nick Merwin <[email protected]>
Nick Thompson <[email protected]>
Nick Williams <[email protected]>
Niklas Boström <[email protected]>
Oleg <[email protected]>
Oleksii Markhovskyi <[email protected]>
Oliver Zeigermann <[email protected]>
Owen Coutts <[email protected]>
Pablo Lacerda de Miranda <[email protected]>
Pascal Hartig <[email protected]>
Paul O’Shannessy <[email protected]>
Paul Seiffert <[email protected]>
Expand All @@ -100,22 +189,55 @@ Pete Hunt <[email protected]>
Peter Cottle <[email protected]>
Petri Lievonen <[email protected]>
Pieter Vanderwerff <[email protected]>
Rajiv Tirumalareddy <[email protected]>
Randall Randall <[email protected]>
Ray <[email protected]>
Richard D. Worth <[email protected]>
Richard Feldman <[email protected]>
Richard Livesey <[email protected]>
Rick Beerendonk <[email protected]>
Rob Arnold <[email protected]>
Ryan Seddon <[email protected]>
Sahat Yalkabov <[email protected]>
Sam Selikoff <[email protected]>
Sander Spies <[email protected]>
Sean Kinsey <[email protected]>
Sebastian Markbåge <[email protected]>
Sergey Generalov <[email protected]>
Shane O'Sullivan <[email protected]>
Shaun Trennery <[email protected]>
Sheraz <[email protected]>
Shripad K <[email protected]>
Simon Højberg <[email protected]>
Simon Welsh <[email protected]>
Stefan Dombrowski <[email protected]>
Stephen Murphy <[email protected]>
Stoyan Stefanov <[email protected]>
Sundeep Malladi <[email protected]>
Sunny Juneja <[email protected]>
Sven Helmberger <[email protected]>
Sébastien Lorber <[email protected]>
Thomas Aylott <[email protected]>
Thomas Boyt <[email protected]>
Thomas Shaddox <[email protected]>
Thomas Shafer <[email protected]>
ThomasCrvsr <[email protected]>
Timothy Yung <[email protected]>
Tom Haggie <[email protected]>
Tom Hauburger <[email protected]>
Tom MacWright <[email protected]>
Tom Occhino <[email protected]>
Ville Immonen <[email protected]>
Vjeux <[email protected]>
Volkan Unsal <[email protected]>
Wayne Larsen <[email protected]>
WickyNilliams <WickyNilliams@MBA>
Wincent Colaiuta <[email protected]>
Zach Bruggeman <[email protected]>
fxbois <[email protected]>
XuefengWu <[email protected]>
Yuriy Dybskiy <[email protected]>
Yuval Dekel <[email protected]>
Zach Bruggeman <[email protected]>
cutbko <[email protected]>
davidxi <[email protected]>
imagentleman <[email protected]>
jon madison <[email protected]>
Loading

0 comments on commit e92e9be

Please sign in to comment.