Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Refactor. Extract mkLiteralUnit and mkUnitBlock | Adriaan Moors | 2016-03-26 | 2 | -5/+8 | |
| * | | | Remove dead code now that `genBCodeActive` is always true. | Adriaan Moors | 2016-03-26 | 6 | -347/+57 | |
| * | | | TypeHistory's toString time travels consistently | Adriaan Moors | 2016-03-26 | 1 | -1/+4 | |
| * | | | sbt build targets build/ | Adriaan Moors | 2016-03-26 | 1 | -5/+5 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #5066 from acjay/cleanup_scaladoc_hover | Adriaan Moors | 2016-03-30 | 1 | -3/+3 | |
|\ \ \ | ||||||
| * | | | minor style updates for Scaladoc formatting | Alan Johnson | 2016-03-28 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | Merge pull request #5033 from szeiger/issue/9623-2.12 | Adriaan Moors | 2016-03-30 | 1 | -44/+46 | |
|\ \ \ | ||||||
| * | | | Replace JoinIterator & improve ConcatIterator | Stefan Zeiger | 2016-03-11 | 1 | -44/+46 | |
* | | | | Merge pull request #5062 from felixmulder/topic/scaladoc-search-history | Seth Tisue | 2016-03-30 | 1 | -0/+24 | |
|\ \ \ \ | ||||||
| * | | | | Add search history for Scaladoc | Felix Mulder | 2016-03-30 | 1 | -0/+24 | |
* | | | | | Merge pull request #5069 from felixmulder/topic/scaladoc-search-types-and-cla... | Vlad Ureche | 2016-03-30 | 2 | -14/+29 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add type and class/trait member search, fixes SI-9721 and SI-9722 | Felix Mulder | 2016-03-30 | 2 | -14/+29 | |
|/ / / / | ||||||
* | | | | Merge pull request #5058 from lrytz/newTraitsInliner | Lukas Rytz | 2016-03-30 | 7 | -61/+58 | |
|\ \ \ \ | ||||||
| * | | | | Inline super calls, as they are statically resolved | Lukas Rytz | 2016-03-23 | 7 | -61/+58 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #5060 from scala/DarkDimius-patch-1 | Lukas Rytz | 2016-03-29 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fix a bug in multi-dimensional array creation | Dmitry Petrashko | 2016-03-23 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #5008 from janekdb/2.12.x-remove-Predef-error | Seth Tisue | 2016-03-29 | 3 | -9/+3 | |
|\ \ \ \ | ||||||
| * | | | | Remove deprecated Predef.error | Janek Bogucki | 2016-03-26 | 3 | -9/+3 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #5021 from szeiger/wip/remove-deprecations | Seth Tisue | 2016-03-29 | 20 | -250/+216 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Make some collection classes final or sealed | Stefan Zeiger | 2016-03-23 | 18 | -249/+206 | |
| * | | | Add a `genprod` command to the sbt build | Stefan Zeiger | 2016-03-17 | 2 | -1/+10 | |
* | | | | Merge pull request #5050 from code-star/topic/2.12.x-scaladoc-Auto-expand | Vlad Ureche | 2016-03-25 | 2 | -26/+31 | |
|\ \ \ \ | ||||||
| * | | | | scaladoc fix permalinks | David Hoepelman | 2016-03-25 | 1 | -25/+30 | |
| * | | | | Fixed Typo in scaladoc scheduler.js | Pim Verkerk | 2016-03-25 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21 | Adriaan Moors | 2016-03-23 | 27 | -230/+533 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-23 | 1 | -29/+33 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #5054 from lrytz/intellij-2.112.11.x | Lukas Rytz | 2016-03-23 | 27 | -236/+507 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Cleanup IntelliJ integration based on review feedback | Lukas Rytz | 2016-03-22 | 1 | -31/+35 | |
| * | | | | | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-23 | 0 | -0/+0 | |
| |\| | | | | | ||||||
| | * | | | | | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√ | Lukas Rytz | 2016-03-23 | 4 | -2/+34 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | SI-9488 - adds the same default toString format to Scala Futures as 2.12.x | Viktor Klang | 2016-03-22 | 4 | -2/+34 | |
| | * | | | | | | Merge pull request #5026 from SethTisue/scala-xml-version-bump | Lukas Rytz | 2016-03-22 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | Merge branch '2.11.x' into scala-xml-version-bump | Seth Tisue | 2016-03-09 | 4 | -5/+5 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | upgrade to latest scala-xml (namely 1.0.5) | Seth Tisue | 2016-03-08 | 1 | -1/+1 | |
| * | | | | | | | | Updates to IntelliJ files for 2.12.x | Lukas Rytz | 2016-03-21 | 3 | -34/+41 | |
| * | | | | | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-21 | 27 | -230/+522 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Update IntelliJ build for use with sbt | Lukas Rytz | 2016-03-21 | 27 | -236/+503 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-21 | 0 | -0/+0 | |
| |\| | | | | | | ||||||
| | * | | | | | | Merge pull request #5030 from SethTisue/newer-akka | Adriaan Moors | 2016-03-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | Merge branch '2.11.x' into newer-akka | Seth Tisue | 2016-03-09 | 4 | -5/+5 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | bundle a newer Akka actors jar | Seth Tisue | 2016-03-09 | 1 | -1/+1 | |
| | | |/ / / / | ||||||
* | | | | | | | Merge pull request #5051 from kmizu/improve-api-docs | Adriaan Moors | 2016-03-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add scaladoc comment about the case when Exception will be thrown by invocati... | Kota Mizushima | 2016-03-24 | 1 | -0/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5053 from som-snytt/issue/9314 | Lukas Rytz | 2016-03-23 | 3 | -20/+57 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | SI-9314 No warn on ${nonid} | Som Snytt | 2016-03-23 | 3 | -13/+36 | |
| * | | | | | | SI-9314 Ignore "${}" | Som Snytt | 2016-03-20 | 2 | -3/+7 | |
| * | | | | | | SI-9314 Don't warn on "$pkg" | Som Snytt | 2016-03-20 | 3 | -9/+19 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #5057 from lrytz/flatClasspath | Lukas Rytz | 2016-03-23 | 18 | -230/+384 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Support :require when using the flat classpath representation. | Lukas Rytz | 2016-03-22 | 9 | -110/+221 | |
| * | | | | | | Enable flat classpath by default | Lukas Rytz | 2016-03-22 | 10 | -120/+163 | |
| | |/ / / / | |/| | | | |