summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* IntelliJ project file fixLukas Rytz2015-02-071-0/+1
* Fix InnerClass / EnclosingMethod for closures nested in value classesLukas Rytz2015-02-0710-38/+189
* Fix InnerClass/EnclosingMethod for trait impl and specialized classesLukas Rytz2015-02-077-41/+214
* SI-9124 fix EnclosingMethod of classes nested in implOnly trait defsLukas Rytz2015-02-073-1/+53
* SI-9105 Fix EnclosingMethod for classes defined in lambdasLukas Rytz2015-02-0712-43/+286
* Merge pull request #4298 from adriaanm/contribAdriaan Moors2015-02-063-71/+187
|\
| * IDE setup sectionAdriaan Moors2015-02-063-23/+27
| * Load balance across CONTRIBUTING/READMEAdriaan Moors2015-02-062-37/+139
| * Rewrite contrib guidelines: shorter & friendlierAdriaan Moors2015-02-051-42/+52
* | Merge pull request #4213 from soc/topic/scala-partest-1.0.3Adriaan Moors2015-02-051-1/+1
|\ \
| * | Update scala-partest dependency to 1.0.3Simon Ochsenreither2014-12-161-1/+1
* | | Merge pull request #4293 from BartoszJanota/patch-1Lukas Rytz2015-02-051-1/+2
|\ \ \
| * | | Scala doc update (sliding method). Added info about default step set to 1. Re...BartekJanota2015-02-041-1/+2
* | | | Merge pull request #4295 from retronym/ticket/9135Grzegorz Kossakowski2015-02-052-1/+17
|\ \ \ \
| * | | | SI-9135 Fix NPE, a regression in the pattern matcherJason Zaugg2015-02-052-1/+17
* | | | | Merge pull request #4251 from retronym/ticket/6502Jason Zaugg2015-02-054-39/+64
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9 from som-snytt/review/6502Jason Zaugg2015-01-212-29/+25
| |\ \ \ \ \
| | * | | | | SI-6502 Convert test to assertsSom Snytt2015-01-202-29/+25
| |/ / / / /
| * | | | | REPL: Tread EOF a "no" in the "yes"/"no" prompt.Jason Zaugg2015-01-161-0/+1
| * | | | | SI-6502 More robust REPL :requireJason Zaugg2015-01-162-11/+39
* | | | | | Merge pull request #4248 from retronym/ticket/9086Jason Zaugg2015-02-052-1/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | SI-9086 Fix regression in implicit searchJason Zaugg2015-01-292-1/+13
* | | | | | Merge pull request #4133 from som-snytt/issue/8976Ichoran2015-02-045-9/+127
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | SI-8976 MutableList.tail.iterator.size is lengthSom Snytt2014-12-065-9/+127
* | | | | | Merge pull request #4204 from mpociecha/correct-decimal-marks-in-testsGrzegorz Kossakowski2015-02-031-3/+12
|\ \ \ \ \ \
| * | | | | | Fix problems with a locale-dependent decimal mark in StringContextTestmpociecha2014-12-141-3/+12
* | | | | | | Merge pull request #4233 from kanielc/SI-7770Lukas Rytz2015-02-034-2/+6
|\ \ \ \ \ \ \
| * | | | | | | SI-7770 mutable.BitSet.toImmutable isn't immutableDenton Cockburn2015-01-074-2/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #4260 from retronym/ticket/9093Lukas Rytz2015-02-033-1/+12
|\ \ \ \ \ \ \
| * | | | | | | SI-9093 Fix value discarding / multiple param list crasherJason Zaugg2015-01-203-1/+12
* | | | | | | | Merge pull request #4252 from retronym/ticket/9050Lukas Rytz2015-02-032-1/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-9050 Fix crasher with value classes, recursionJason Zaugg2015-01-162-1/+32
* | | | | | | | | Merge pull request #4245 from dickwall/doc/scaladoc-concurrent-packageLukas Rytz2015-02-031-0/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added package scaladoc for the concurrent package.dickwall2015-01-121-0/+74
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4292 from retronym/ticket/9133Grzegorz Kossakowski2015-02-033-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Silence a feature warning in JUnit test code.Jason Zaugg2015-02-031-0/+1
| * | | | | | | | | SI-9133 Harden against infinite loop in NoSymbol.ownerJason Zaugg2015-02-032-1/+10
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4216 from som-snytt/issue/7623Lukas Rytz2015-02-035-6/+71
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | SI-7623 Trailing sequence wildcard warningSom Snytt2015-01-215-6/+71
* | | | | | | | | Merge pull request #4259 from mzitnik/2.11.xIchoran2015-01-302-1/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-9072 Vector ++ concatenation of parallel collection cause inconsistent res...Mark Zitnik2015-01-182-1/+21
* | | | | | | | | | Merge pull request #4276 from romanowski/2.11.xAdriaan Moors2015-01-302-8/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix intellij 14 setup script to read scala version from version.propertiesKrzysztof Romanowski2015-01-302-8/+11
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4257 from 193s/2.11.xAdriaan Moors2015-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix definition of TRY in the language specIkumi Shimizu2015-01-171-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4226 from jhegedus42/patch-1Adriaan Moors2015-01-301-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update 03-types.mdjhegedus422014-12-301-2/+2
* | | | | | | | | | Merge pull request #4271 from retronym/ticket/8642Adriaan Moors2015-01-283-3/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-8642 Enable OSGi tests under Java 8Jason Zaugg2015-01-281-1/+1
| * | | | | | | | | | Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-283-2/+27
|/ / / / / / / / / /