Commit Graph

40898 Commits

Author SHA1 Message Date
Stephen Halter c9a1d4000f Merge branch 'release' into dev 2016-04-13 12:51:56 -07:00
Eilon Lipton 0cf9a4b7f2 Merge branch 'release' into dev 2016-04-13 12:10:53 -07:00
Eilon Lipton 4f24339740 Fix package metadata 2016-04-13 12:07:04 -07:00
ryanbrandenburg 19325a6cce Add logging to 'business' events 2016-04-13 11:39:22 -07:00
moozzyk adf98e0685 Merge branch 'release' into dev 2016-04-13 10:58:44 -07:00
moozzyk e054eac3bd Fixing tests to use the package that was just built
Disabling parallel run to prevent random issues
Adding additional details that should help diagnose failures
2016-04-13 10:57:53 -07:00
John Luo 55fe28286b Merge branch 'release' into dev 2016-04-13 10:24:35 -07:00
John Luo be4d6bc07c Limit parallelism in ci-pull 2016-04-13 10:23:43 -07:00
Victor Hurdugaci 298bc2bcbf Merge branch 'release' into dev 2016-04-13 09:57:41 -07:00
moozzyk 8f1f3c0772 Add a polling watcher 2016-04-13 09:52:55 -07:00
SteveSandersonMS 39a8a4a128 Update to current versions of React/Redux/etc. 2016-04-13 15:34:23 +01:00
David Fowler 5354005a1a Remove support for DNX on osx on mono
- Remove mono osx specific PInvokes
- Use PlatformAbstractions to detect darwin instead of direct pinvoke

#742
2016-04-12 23:47:36 -07:00
Eilon Lipton 78d3428eb7 Fix package metadata 2016-04-12 19:06:55 -07:00
Eilon Lipton 795fc36cde Fix package metadata 2016-04-12 18:47:35 -07:00
Cesar Blum Silveira b9c2b29152 Merge branch 'release' into dev 2016-04-12 15:06:42 -07:00
ryanbrandenburg 05d740076b Allow collapse and expand of source code 2016-04-12 14:25:36 -07:00
Cesar Blum Silveira 7b63846357 Prevent crash when aborting connection before Frame is created (#738). 2016-04-12 14:18:41 -07:00
Sebastien Ros 946d895114 Merge branch 'release' into dev 2016-04-12 11:41:11 -07:00
Sébastien Ros f30f61f7bb Fixing functional test random failure (#4452) 2016-04-12 10:44:26 -07:00
moozzyk ed2fc54d2c Merge branch 'release' into dev 2016-04-12 09:53:59 -07:00
moozzyk 46d4c6edcb Updating dotnet-watch to netstandard 2016-04-12 09:46:12 -07:00
Cesar Blum Silveira 7dfa305032 Merge branch 'release' into dev 2016-04-11 16:38:39 -07:00
Cesar Blum Silveira 2235b79a8d Only reset repos that were cloned. 2016-04-11 16:35:45 -07:00
Cesar Blum Silveira 295a5ee349 Properly set commits file location after caching Coherence. 2016-04-11 16:35:05 -07:00
Ryan Nowak 84caf6968d Merge branch 'release' into dev 2016-04-11 15:50:26 -07:00
Ryan Nowak 9cd3fe34a5 Improve tests for catch-all + defaults/nulls 2016-04-11 15:17:07 -07:00
Ryan Nowak 3ec60a0181 Fix #4447 - Teach MVC to understand defaults
The wireup for defaults in attribute routes was missing
2016-04-11 14:38:29 -07:00
Ryan Nowak 171f4452e3 Repair failing functional test
I recently consolidated some code in routing that made the behavior for
attribute routes and conventional routes more consistent. So now, a
catch-all will add a null value to the RVD if it doesn't capture any text,
but will NOT trounce an existing value in the RVD.

This test depended on the behavior where attribute routes didn't ever add
a null value for a catch-all. The fix is to just add a default to the
catch-all.
2016-04-11 12:07:51 -07:00
Cesar Blum Silveira c0d3adc927 Merge branch 'cesarbs/only-sync-cloned-repos' into dev 2016-04-11 12:00:35 -07:00
John Luo ec33ef9a38 Merge branch 'release' into dev 2016-04-11 11:51:01 -07:00
Cesar Blum Silveira 88829cc7d6 Only reset repos that were cloned. 2016-04-11 11:50:42 -07:00
John Luo 300b9cd90f Fix typo when migrating to ANCM 2016-04-11 11:48:44 -07:00
Pranav K b1d6909935 Branching needs to account for libuv
Fixes #434
2016-04-11 11:10:16 -07:00
Cesar Blum Silveira 7f38b7967b Properly set commits file location after caching Coherence. 2016-04-11 11:02:59 -07:00
Stephen Halter 97dcfbfbe1 Merge branch 'release' into dev 2016-04-11 10:38:52 -07:00
John Luo 9818214c5c Merge branch 'release' into dev 2016-04-11 10:22:54 -07:00
John Luo ff46985cbd Move web.config 2016-04-11 10:21:51 -07:00
John Luo 92455b6d9c Merge branch 'release' into dev 2016-04-11 10:19:59 -07:00
John Luo 07263aa92e Move web.config and use ANCM 2016-04-11 10:19:32 -07:00
John Luo dfe35bbef7 Merge branch 'release' into dev 2016-04-11 10:19:02 -07:00
John Luo e0c0617185 Move web.config and use ANCM 2016-04-11 10:17:53 -07:00
John Luo 00875cf2df Merge branch 'release' into dev 2016-04-11 10:15:01 -07:00
John Luo 921af14e1f Move web.config and use ANCM 2016-04-11 10:14:07 -07:00
John Luo b26dd10e31 Merge branch 'release' into dev 2016-04-11 10:13:10 -07:00
John Luo ff536cc868 Move web.config and use ANCM 2016-04-11 10:12:20 -07:00
John Luo a4f5d8d11f Merge branch 'release' into dev 2016-04-11 10:08:44 -07:00
John Luo dfc2e71d7f Moving web.config and use ANCM 2016-04-11 10:08:14 -07:00
John Luo 7ef624756c Merge branch 'release' into dev 2016-04-11 10:04:58 -07:00
John Luo c9d53ad14b Move web.config and use ANCM 2016-04-11 10:04:14 -07:00
John Luo dfca01d2b7 Merge branch 'release' into dev 2016-04-11 10:03:08 -07:00