Kanchalai Tanglertsampan
|
1200f753d6
|
Merge branch 'master' into types-2.0
# Conflicts:
# .gitignore
# ajv/ajv.d.ts
# angular-material/angular-material.d.ts
# angular-protractor/angular-protractor.d.ts
# angularjs/angular-tests.ts
# angularjs/angular.d.ts
# aws-sdk/aws-sdk.d.ts
# electron-devtools-installer/electron-devtools-installer-tests.ts
# electron-json-storage/electron-json-storage-tests.ts
# electron-notifications/electron-notifications.d.ts
# electron-notify/electron-notify.d.ts
# electron-window-state/electron-window-state.d.ts
# electron/electron-prebuilt.d.ts
# enzyme/enzyme.d.ts
# eventemitter3/eventemitter3-tests.ts
# eventemitter3/eventemitter3.d.ts
# graphql/graphql.d.ts
# highcharts/highcharts.d.ts
# immutable/immutable.d.ts
# inquirer/inquirer.d.ts
# jasmine/jasmine.d.ts
# joi/joi.d.ts
# jquery.dataTables/jquery.dataTables-tests.ts
# jquery.dataTables/jquery.dataTables.d.ts
# kafka-node/kafka-node.d.ts
# kefir/kefir.d.ts
# kendo-ui/kendo-ui.d.ts
# koa/koa.d.ts
# leaflet/leaflet.d.ts
# lodash/lodash.d.ts
# mapbox-gl/mapbox-gl.d.ts
# material-ui/material-ui.d.ts
# menubar/menubar.d.ts
# mongodb/mongodb.d.ts
# needle/needle-tests.ts
# needle/needle.d.ts
# noble/noble.d.ts
# node/node.d.ts
# pegjs/pegjs.d.ts
# pixi.js/pixi.js.d.ts
# polymer/polymer.d.ts
# quill/quill-tests.ts
# quill/quill.d.ts
# react-bootstrap/react-bootstrap.d.ts
# react-fa/react-fa-tests.tsx
# react-fa/react-fa.d.ts
# react-native/react-native.d.ts
# react-select/react-select.d.ts
# react/react.d.ts
# threejs/three-vrcontrols.d.ts
# threejs/three-vreffect.d.ts
# toastr/toastr.d.ts
# validator/validator.d.ts
# webpack/webpack.d.ts
# winston/winston.d.ts
|
2016-11-09 17:20:41 -08:00 |
|
zhengbli
|
2f4b18f28f
|
stage changes to index.d.ts
|
2016-10-24 22:52:02 -07:00 |
|
Andy Hanson
|
89d6358b54
|
Merge remote-tracking branch 'origin/master' into merge_24sep
Conflicts:
angular-material/angular-material.d.ts
bookshelf/bookshelf.d.ts
react-widgets/react-widgets.d.ts
vinyl/vinyl.d.ts
|
2016-09-24 16:40:57 -07:00 |
|
Andy Hanson
|
04b4272974
|
Merge remote-tracking branch 'origin/master' into merge_23sep
|
2016-09-23 07:24:23 -07:00 |
|
Andy Hanson
|
91d1d6d60f
|
Merge remote-tracking branch 'origin/master' into merge_21sep
|
2016-09-21 09:45:05 -07:00 |
|
zhengbli
|
c2a54db3e9
|
Merge branch 'master' into types-2.0
# Conflicts:
# amcharts/AmCharts.d.ts
# angular-gettext/angular-gettext.d.ts
# angular-jwt/angular-jwt.d.ts
# angular-material/angular-material.d.ts
# angularjs/angular.d.ts
# auth0-js/auth0-js.d.ts
# aws-lambda/aws-lambda.d.ts
# aws-sdk/aws-sdk.d.ts
# azure-mobile-apps/azure-mobile-apps.d.ts
# azure-mobile-services-client/AzureMobileServicesClient.d.ts
# blessed/blessed-tests.ts
# blessed/blessed.d.ts
# bootbox/bootbox.d.ts
# bowser/bowser.d.ts
# cache-manager/cache-manager.d.ts
# chai-things/chai-things.d.ts
# colors/colors.d.ts
# cordova/cordova-tests.ts
# cordova/plugins/Contacts.d.ts
# cordova/plugins/FileSystem.d.ts
# couchbase/couchbase.d.ts
# cucumber/cucumber-tests.ts
# cucumber/cucumber.d.ts
# d3/d3.d.ts
# dojo/dojo.d.ts
# dustjs-linkedin/dustjs-linkedin.d.ts
# esprima/esprima.d.ts
# express-serve-static-core/express-serve-static-core.d.ts
# express-session/express-session.d.ts
# fetch-mock/fetch-mock.d.ts
# fs-extra/fs-extra.d.ts
# fullCalendar/fullCalendar.d.ts
# github-electron/github-electron.d.ts
# gulp-uglify/gulp-uglify.d.ts
# gulp/gulp.d.ts
# highcharts/highcharts.d.ts
# imap/imap.d.ts
# incremental-dom/incremental-dom.d.ts
# inversify/inversify.d.ts
# ionic/ionic.d.ts
# ioredis/ioredis.d.ts
# isomorphic-fetch/isomorphic-fetch-tests.ts
# jake/jake.d.ts
# joi/joi.d.ts
# jquery-mockjax/jquery-mockjax.d.ts
# jquery/jquery.d.ts
# js-data-http/js-data-http-tests.ts
# js-data-http/js-data-http.d.ts
# js-data/js-data.d.ts
# jsdom/jsdom.d.ts
# jsts/jsts-tests.ts
# knex/knex.d.ts
# koa-favicon/koa-favicon.d.ts
# koa-router/koa-router-tests.ts
# koa-router/koa-router.d.ts
# lodash/lodash.d.ts
# mailparser/mailparser.d.ts
# maquette/maquette.d.ts
# material-ui/material-ui.d.ts
# matter-js/matter-js.d.ts
# moment/moment.d.ts
# mongoose-promise/mongoose-promise-tests.ts
# mongoose/mongoose-tests.ts
# mongoose/mongoose.d.ts
# multer/multer.d.ts
# ncp/ncp.d.ts
# nock/nock.d.ts
# node/node-tests.ts
# node/node.d.ts
# nvd3/nvd3.d.ts
# object-assign/object-assign.d.ts
# openlayers/openlayers.d.ts
# parse/parse.d.ts
# pdf/pdf.d.ts
# pdfkit/pdfkit.d.ts
# pg/pg.d.ts
# pixi.js/pixi.js.d.ts
# progress/progress.d.ts
# pusher-js/pusher-js.d.ts
# quill/quill-tests.ts
# quill/quill.d.ts
# radium/radium.d.ts
# ravenjs/ravenjs-tests.ts
# react-dropzone/react-dropzone.d.ts
# react-mdl/react-mdl.d.ts
# react-native/react-native.d.ts
# react-notification-system/react-notification-system.d.ts
# react-router/history-tests.ts
# react-router/react-router-tests.tsx
# react-router/react-router.d.ts
# react-select/react-select-tests.tsx
# react-select/react-select.d.ts
# react/react.d.ts
# redux-form/redux-form.d.ts
# request-promise/request-promise.d.ts
# resolve-from/resolve-from.d.ts
# riot-api-nodejs/riot-api-nodejs.d.ts
# sanitize-html/sanitize-html.d.ts
# segment-analytics/segment-analytics.d.ts
# simple-assign/simple-assign-tests.ts
# simple-assign/simple-assign.d.ts
# slate-irc/slate-irc.d.ts
# soap/soap.d.ts
# socket.io/socket.io.d.ts
# sql.js/sql.js-tests.ts
# sql.js/sql.js.d.ts
# steam/steam.d.ts
# stylus/stylus.d.ts
# swiper/swiper.d.ts
# tedious/tedious.d.ts
# threejs/three.d.ts
# twilio/twilio.d.ts
# underscore/underscore.d.ts
# ws/ws.d.ts
# yeoman-generator/yeoman-generator.d.ts
|
2016-09-14 18:44:24 -07:00 |
|
Nathan Shively-Sanders
|
9019823501
|
Merge branch 'master' into types-2.0-2016-08-10
|
2016-08-10 16:17:43 -07:00 |
|
Mine Yalcinalp Starks
|
8252b2118a
|
Merge remote-tracking branch 'upstream/master' into minestarks-types2.0
|
2016-08-03 15:19:03 -07:00 |
|
Ryan Cavanaugh
|
b488f3cb5f
|
Merge remote-tracking branch 'upstream/master' into merge_7_25
|
2016-07-27 10:57:46 -07:00 |
|
Ryan Cavanaugh
|
a4f5ae3098
|
Merge commit 'upstream/master~250' into merge_7_25
|
2016-07-26 18:03:56 -07:00 |
|
Ryan Cavanaugh
|
e9a0d98125
|
Merge commit 'upstream/master~300' into merge_7_25
|
2016-07-26 17:45:17 -07:00 |
|
Ryan Cavanaugh
|
b9245fba39
|
Merge commit 'upstream/master~350' into merge_7_25
|
2016-07-26 17:24:39 -07:00 |
|
Ryan Cavanaugh
|
5d004be8ba
|
Merge commit 'upstream/master~600' into merge_7_25
|
2016-07-26 00:22:12 -07:00 |
|
Mohamed Hegazy
|
61fa2391a4
|
Replace references to angularjs with angular to match package name
|
2016-07-07 17:39:27 -07:00 |
|
Mohamed Hegazy
|
a5d477d085
|
Replace references to angularjs with angular to match package name
|
2016-07-07 15:12:24 -07:00 |
|
Raghav Katyal
|
89cb02de7d
|
Fixing test failures
|
2016-06-27 17:40:37 -07:00 |
|
Ryan Cavanaugh
|
50387d4046
|
Change relative reference paths to types references. Errors incoming...
|
2016-05-09 18:06:27 -07:00 |
|
Ryan Cavanaugh
|
49b1ac6a38
|
Rename all entry points to index.d.ts and explicitify all file lists
|
2016-05-09 17:29:10 -07:00 |
|