Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3182 from soc/SI-7999 | Adriaan Moors | 2013-11-22 | 2 | -5/+3 |
|\ | |||||
| * | SI-7999 s.u.c.NonFatal: StackOverflowError is fatal | Simon Ochsenreither | 2013-11-22 | 2 | -5/+3 |
* | | Merge pull request #3160 from retronym/ticket/7983 | Adriaan Moors | 2013-11-22 | 2 | -17/+43 |
|\ \ | |||||
| * | | Account for a variation of package types in Implicit Divergence. | Jason Zaugg | 2013-11-19 | 1 | -0/+1 |
| * | | Code reformatting in Implicits | Jason Zaugg | 2013-11-19 | 1 | -16/+10 |
| * | | SI-7983 Fix regression in implicit divergence checking | Jason Zaugg | 2013-11-19 | 2 | -1/+32 |
* | | | Merge pull request #3171 from adriaanm/starr-m7 | Adriaan Moors | 2013-11-22 | 2 | -8/+9 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 2.11.0-M7 starr, 1.11.1 scalacheck, bump modules. | Adriaan Moors | 2013-11-20 | 2 | -8/+9 |
* | | | Merge pull request #3162 from retronym/ticket/7985 | Jason Zaugg | 2013-11-22 | 3 | -3/+13 |
|\ \ \ | |||||
| * | | | SI-7985 Refactor parsing of pattern type args | Jason Zaugg | 2013-11-19 | 1 | -3/+5 |
| * | | | SI-7985 Allow projection of lower-cased prefix as pattern type arg | Jason Zaugg | 2013-11-19 | 2 | -1/+6 |
| * | | | SI-7985 Allow qualified type argument in patterns | Jason Zaugg | 2013-11-19 | 2 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #3154 from huitseeker/issue/SI-7221-PR | Jason Zaugg | 2013-11-22 | 1 | -72/+79 |
|\ \ \ | |||||
| * | | | SI-7221 rewrites pollForWork non-recursively | François Garillot | 2013-11-20 | 1 | -72/+79 |
* | | | | Merge pull request #3134 from xeno-by/topic/is-term-macro | Jason Zaugg | 2013-11-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | more precise isMacroApplication check | Eugene Burmako | 2013-11-13 | 1 | -1/+1 |
* | | | | | Merge pull request #3156 from JamesIry/remove_deprecated_migration_constructor | Jason Zaugg | 2013-11-22 | 1 | -4/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove deprecated constructor from the migration annotation | James Iry | 2013-11-18 | 1 | -4/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3138 from densh/pr/fresh-name-extractor | Jason Zaugg | 2013-11-22 | 7 | -33/+96 |
|\ \ \ \ \ | |||||
| * | | | | | use more specific cake dependencies | Den Shabalin | 2013-11-20 | 1 | -1/+1 |
| * | | | | | refactor out fresh name prefix extraction logic | Den Shabalin | 2013-11-17 | 7 | -33/+96 |
* | | | | | | Merge pull request #3152 from paulp/pr/deprecations | Jason Zaugg | 2013-11-22 | 25 | -657/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removing deprecated code. | Paul Phillips | 2013-11-18 | 25 | -657/+35 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3131 from densh/pr/deprecate-pair-and-triple | Jason Zaugg | 2013-11-22 | 80 | -462/+468 |
|\ \ \ \ \ \ | |||||
| * | | | | | | deprecate Pair and Triple | Den Shabalin | 2013-11-20 | 80 | -462/+468 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3175 from retronym/ticket/6229 | Eugene Burmako | 2013-11-22 | 4 | -0/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-6329 Graduation day for pending tests for tag materialization | Jason Zaugg | 2013-11-21 | 4 | -0/+20 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3172 from retronym/ticket/7987 | Eugene Burmako | 2013-11-22 | 2 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7987 Test case for "macro not expanded" error with implicits | Jason Zaugg | 2013-11-21 | 2 | -0/+18 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3176 from densh/pr/deprecate-responder | Adriaan Moors | 2013-11-21 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | deprecate scala.Responder | Den Shabalin | 2013-11-21 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #3173 from retronym/topic/classOf-type-apply | Grzegorz Kossakowski | 2013-11-21 | 3 | -1/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Handle TypeApply(fun, ...) for symbol-less funs | Jason Zaugg | 2013-11-21 | 3 | -1/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #3170 from adriaanm/scalacheck-1.11 | Adriaan Moors | 2013-11-20 | 7 | -31/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Prepare upgrade to scalacheck 1.11. | Adriaan Moors | 2013-11-20 | 7 | -31/+9 |
| |/ / / / | |||||
* | | | | | Merge pull request #3163 from adriaanm/merge-2.10 | Grzegorz Kossakowski | 2013-11-20 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | No-op merge of 2.10.x into master | Adriaan Moors | 2013-11-19 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge pull request #3128 from adriaanm/pax-url-aether-1.6 | James Iry | 2013-11-18 | 2 | -3/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | Upgrade pax-url-aether to 1.6.0. | Adriaan Moors | 2013-11-11 | 2 | -3/+6 |
| | |/ / / / | |||||
* | | | | | | Merge pull request #3167 from skyluc/issue/unneccesary-method-7280 | Jason Zaugg | 2013-11-20 | 1 | -3/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-7280 Remove unneccesary method | Luc Bourlier | 2013-11-20 | 1 | -3/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #3153 from misfo/patch-1v2.11.0-M7 | James Iry | 2013-11-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix a typo in the `scala` man page | Trent Ogren | 2013-11-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #3140 from skyluc/issue/completion-import-object-7280 | Jason Zaugg | 2013-11-18 | 30 | -57/+1037 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7280 Scope completion not returning members provided by imports | Luc Bourlier | 2013-11-15 | 4 | -24/+248 |
| * | | | | | | Adds test cases for scope completion | Luc Bourlier | 2013-11-15 | 12 | -0/+707 |
| * | | | | | | Test infrastructure for scope completion | Jason Zaugg | 2013-11-15 | 14 | -33/+82 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #3136 from dotta/issue/si-7915 | Jason Zaugg | 2013-11-18 | 4 | -3/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7915 Corrected range positions created during default args expansion | Mirco Dotta | 2013-11-15 | 4 | -3/+34 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #3119 from Ichoran/issue/5263 | James Iry | 2013-11-18 | 4 | -0/+1179 |
|\ \ \ \ \ \ |