Paul van Brenk
68eea6297d
Merge branch 'master' into types-2.0-20160816
...
# Conflicts:
# acl/index.d.ts
# anydb-sql-migrations/anydb-sql-migrations.d.ts
# asana/asana.d.ts
# blue-tape/blue-tape-tests.ts
# bluebird-retry/bluebird-retry-tests.ts
# bluebird-retry/bluebird-retry.d.ts
# bluebird/index.d.ts
# bookshelf/bookshelf.d.ts
# consolidate/consolidate.d.ts
# documentdb/documentdb.d.ts
# fs-extra-promise/fs-extra-promise.d.ts
# graphene-pk11/graphene-pk11.d.ts
# inline-css/inline-css.d.ts
# inversify/index.d.ts
# java/java-tests.ts
# karma/karma.d.ts
# knex/knex.d.ts
# koa-router/koa-router.d.ts
# libxmljs/libxmljs-tests.ts
# lru-cache/lru-cache.d.ts
# mz/index.d.ts
# node-mysql-wrapper/node-mysql-wrapper-tests.ts
# node-mysql-wrapper/node-mysql-wrapper.d.ts
# nodemailer/nodemailer.d.ts
# pify/pify-tests.ts
# project-oxford/project-oxford-tests.ts
# project-oxford/project-oxford.d.ts
# react-router/react-router-tests.tsx
# react-scroll/react-scroll.d.ts
# redlock/redlock.d.ts
# request-promise/index.d.ts
# rethinkdb/rethinkdb.d.ts
# sequelize/sequelize.d.ts
# stamplay-js-sdk/index.d.ts
# stripe-node/stripe-node.d.ts
# umzug/umzug.d.ts
2016-08-16 13:56:22 -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
639b88af6a
Get more tests passing
2016-07-26 15:03:04 -07:00
Ryan Cavanaugh
e94e9a8630
Merge commit 'upstream/master~450' into merge_7_25
2016-07-26 13:40:56 -07:00
Ryan Cavanaugh
11d624e656
Merge commit 'upstream/master~500' into merge_7_25
2016-07-26 12:17:32 -07:00
Ryan Cavanaugh
ede3f0a99c
Merge commit 'upstream/master~550' into merge_7_25
2016-07-26 11:29:27 -07:00
Ryan Cavanaugh
5d004be8ba
Merge commit 'upstream/master~600' into merge_7_25
2016-07-26 00:22:12 -07:00
Ryan Cavanaugh
5e9440c8ad
Merge commit 'upstream/master~700' into merge_7_25
...
# Conflicts:
# angular-ui-router/angular-ui-router.d.ts
# bookshelf/bookshelf-tests.ts
# bookshelf/bookshelf.d.ts
# enzyme/enzyme-tests.tsx
# enzyme/enzyme.d.ts
# escodegen/escodegen-tests.ts
# helmet/helmet.d.ts
# joi/joi.d.ts
# knex/knex-tests.ts
# moment/index.d.ts
# mongoose/index.d.ts
# pg/pg.d.ts
# react-select/react-select-tests.tsx
# soap/index.d.ts
# ssh2/ssh2.d.ts
# turf/turf-tests.ts
# underscore.string/underscore.string.d.ts
2016-07-25 16:10:34 -07:00
Ryan Cavanaugh
35075752ec
Merge commit 'upstream/master~750' into merge_7_25
2016-07-25 14:51:03 -07:00
Mohamed Hegazy
4e78cb2edd
Angular sub packages ( #10170 )
...
* move angular-animate.d.ts to its own folder
* Make angular-animate a module, and use module augmentation to update the angular module
* Move angular-cookies.d.ts to its own folder
* Make angular-cookies a module, and use module augmentation to update the angular module
* Remove outdated readme
* Move angular-mocks.d.ts to its own folder
* Make angular-mocks a module, and use module augmentation to update the angular module
* Move angular-resource.d.ts to its own folder
* Make angular-resource a module, and use module augmentation to update the angular module
* Move angular-route.d.ts to its own folder
* Make angular-route a module, and use module augmentation to update the angular module
* Move angular-santize.d.ts to its own folder
* Make angular-sanitize a module, and use module augmentation to update the angular module
2016-07-18 15:36:53 -07:00
Ryan Cavanaugh
9d7d5a209a
Getting types-2.0 passing CI
2016-07-14 18:13:43 -07:00
Ryan Cavanaugh
dbf24a4f17
Fix angular tsconfig
2016-07-14 14:06:10 -07:00
Mohamed Hegazy
89f7ea7005
Fix #10082 : remove angular package dependency on itself ( #10086 )
...
* Fix #10082 : Remove dependency of angular on itself
* Disable forceConsistentCasingInFileNames for now
2016-07-13 12:00:16 -07:00
Ryan Cavanaugh
a5f4d50ccc
Fix tsconfig files for new option name / behavior.
...
Also fixes some inconsistent whitespace.
2016-07-12 13:54:56 -07:00
Mohamed Hegazy
426c89520d
Rename module from angularjs to angular
2016-07-01 11:54:37 -07:00
Mohamed Hegazy
4ee9330d67
Fix https://github.com/Microsoft/TypeScript/issues/9395 : Rename angularjs to angular
2016-07-01 11:49:42 -07:00
