summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | TypeHistory's toString time travels consistentlyAdriaan Moors2016-03-261-1/+4
| * | | sbt build targets build/Adriaan Moors2016-03-261-5/+5
| | |/ | |/|
* | | Merge pull request #5066 from acjay/cleanup_scaladoc_hoverAdriaan Moors2016-03-301-3/+3
|\ \ \
| * | | minor style updates for Scaladoc formattingAlan Johnson2016-03-281-3/+3
| |/ /
* | | Merge pull request #5033 from szeiger/issue/9623-2.12Adriaan Moors2016-03-301-44/+46
|\ \ \
| * | | Replace JoinIterator & improve ConcatIteratorStefan Zeiger2016-03-111-44/+46
* | | | Merge pull request #5062 from felixmulder/topic/scaladoc-search-historySeth Tisue2016-03-301-0/+24
|\ \ \ \
| * | | | Add search history for ScaladocFelix Mulder2016-03-301-0/+24
* | | | | Merge pull request #5069 from felixmulder/topic/scaladoc-search-types-and-cla...Vlad Ureche2016-03-302-14/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add type and class/trait member search, fixes SI-9721 and SI-9722Felix Mulder2016-03-302-14/+29
|/ / / /
* | | | Merge pull request #5058 from lrytz/newTraitsInlinerLukas Rytz2016-03-307-61/+58
|\ \ \ \
| * | | | Inline super calls, as they are statically resolvedLukas Rytz2016-03-237-61/+58
| | |_|/ | |/| |
* | | | Merge pull request #5060 from scala/DarkDimius-patch-1Lukas Rytz2016-03-291-2/+2
|\ \ \ \
| * | | | Fix a bug in multi-dimensional array creationDmitry Petrashko2016-03-231-2/+2
| |/ / /
* | | | Merge pull request #5008 from janekdb/2.12.x-remove-Predef-errorSeth Tisue2016-03-293-9/+3
|\ \ \ \
| * | | | Remove deprecated Predef.errorJanek Bogucki2016-03-263-9/+3
| | |_|/ | |/| |
* | | | Merge pull request #5021 from szeiger/wip/remove-deprecationsSeth Tisue2016-03-2920-250/+216
|\ \ \ \ | |/ / / |/| | |
| * | | Make some collection classes final or sealedStefan Zeiger2016-03-2318-249/+206
| * | | Add a `genprod` command to the sbt buildStefan Zeiger2016-03-172-1/+10
* | | | Merge pull request #5050 from code-star/topic/2.12.x-scaladoc-Auto-expandVlad Ureche2016-03-252-26/+31
|\ \ \ \
| * | | | scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| * | | | Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
|/ / / /
* | | | Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21Adriaan Moors2016-03-2327-230/+533
|\ \ \ \
| * \ \ \ Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-231-29/+33
| |\ \ \ \
| | * \ \ \ Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2327-236/+507
| | |\ \ \ \
| | | * | | | Cleanup IntelliJ integration based on review feedbackLukas Rytz2016-03-221-31/+35
| * | | | | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-230-0/+0
| |\| | | | |
| | * | | | | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√Lukas Rytz2016-03-234-2/+34
| | |\ \ \ \ \
| | | * | | | | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-224-2/+34
| | * | | | | | Merge pull request #5026 from SethTisue/scala-xml-version-bumpLukas Rytz2016-03-221-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge branch '2.11.x' into scala-xml-version-bumpSeth Tisue2016-03-094-5/+5
| | | |\ \ \ \ \
| | | * | | | | | upgrade to latest scala-xml (namely 1.0.5)Seth Tisue2016-03-081-1/+1
| * | | | | | | | Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-213-34/+41
| * | | | | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-2127-230/+522
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| | |/ / / / / /
| * | | | | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-210-0/+0
| |\| | | | | |
| | * | | | | | Merge pull request #5030 from SethTisue/newer-akkaAdriaan Moors2016-03-151-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch '2.11.x' into newer-akkaSeth Tisue2016-03-094-5/+5
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
| | | |/ / / /
* | | | | | | Merge pull request #5051 from kmizu/improve-api-docsAdriaan Moors2016-03-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add scaladoc comment about the case when Exception will be thrown by invocati...Kota Mizushima2016-03-241-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5053 from som-snytt/issue/9314Lukas Rytz2016-03-233-20/+57
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | SI-9314 No warn on ${nonid}Som Snytt2016-03-233-13/+36
| * | | | | | SI-9314 Ignore "${}"Som Snytt2016-03-202-3/+7
| * | | | | | SI-9314 Don't warn on "$pkg"Som Snytt2016-03-203-9/+19
| |/ / / / /
* | | | | | Merge pull request #5057 from lrytz/flatClasspathLukas Rytz2016-03-2318-230/+384
|\ \ \ \ \ \
| * | | | | | Support :require when using the flat classpath representation.Lukas Rytz2016-03-229-110/+221
| * | | | | | Enable flat classpath by defaultLukas Rytz2016-03-2210-120/+163
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5047 from kmizu/resolve-several-warningsAdriaan Moors2016-03-226-12/+12
|\ \ \ \ \ \
| * | | | | | Resolve warnings related to SyncVar#setKota Mizushima2016-03-183-9/+9