summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4407 from kzys/7601-img-altVlad Ureche2015-03-272-17/+36
|\
| * SI-7601 Scaladoc: img elements must have an "alt" attributeKato Kazuyoshi2015-03-262-17/+36
* | Merge pull request #4355 from soc/SI-9173-either-product-serializableLukas Rytz2015-03-261-1/+1
|\ \
| * | SI-9173 Either extends Product with SerializableSimon Ochsenreither2015-02-231-1/+1
* | | Merge pull request #4405 from soc/SI-9174Lukas Rytz2015-03-261-1/+1
|\ \ \
| * | | SI-9174 Try extends Product with SerializableSimon Ochsenreither2015-03-261-1/+1
| | |/ | |/|
* | | Merge pull request #4374 from retronym/ticket/9200Lukas Rytz2015-03-263-2/+20
|\ \ \ | |/ / |/| |
| * | SI-9200 Fix Java generic signatures for refined typesJason Zaugg2015-03-053-2/+20
* | | Merge pull request #4396 from retronym/ticket/9074-2.12Lukas Rytz2015-03-247-23/+48
|\ \ \
| * | | SI-9074 Fix generic substitution with package objects, overloadingJason Zaugg2015-03-247-23/+48
* | | | Merge pull request #4352 from som-snytt/issue/9167-2.12Jason Zaugg2015-03-244-31/+65
|\ \ \ \ | |/ / / |/| | |
| * | | SI-9167 Clarify ScalaVersion parsingSom Snytt2015-02-204-31/+65
| | |/ | |/|
* | | Merge pull request #4302 from som-snytt/issue/deprecate-named-paramLukas Rytz2015-03-236-71/+93
|\ \ \
| * | | SI-9140 Minor refactor for readabilitySom Snytt2015-02-091-58/+56
| * | | SI-9140 Allow omitting pleonastic parameter nameSom Snytt2015-02-095-26/+37
| * | | SI-9140 Allow deprecating current parameter nameSom Snytt2015-02-084-30/+43
| |/ /
* | | Merge pull request #4301 from som-snytt/issue/8918-deferredLukas Rytz2015-03-232-5/+66
|\ \ \
| * | | SI-8918 Unary ids are plain idsSom Snytt2015-02-082-5/+66
| |/ /
* | | Merge pull request #4300 from CodeMettle/FiniteDuration.toCoarsestLukas Rytz2015-03-232-2/+5
|\ \ \
| * | | Declare FiniteDuration.toCoarsest to return a FiniteDurationSteven Scott2015-02-062-2/+5
| |/ /
* | | Merge pull request #4372 from som-snytt/issue/7775-tweakLukas Rytz2015-03-235-6/+58
|\ \ \
| * | | SI-7775 Exclude nulls when iterating sys propsSom Snytt2015-03-025-6/+58
| |/ /
* | | Merge pull request #4241 from kanielc/SI-6778Lukas Rytz2015-03-233-4/+11
|\ \ \
| * | | SI-6778 scala.math.random should have parenthesisDenton Cockburn2015-01-103-4/+11
* | | | Merge pull request #4368 from som-snytt/review/7784Lukas Rytz2015-03-233-2/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | SI-7784 Extend test with enum constantSom Snytt2015-02-281-0/+4
| * | | SI-7784 Allow a singleton type over a constant value defn.Jason Zaugg2015-02-283-2/+11
|/ / /
* | | Merge pull request #4362 from ms-tg/SI-9134Adriaan Moors2015-02-261-0/+25
|\ \ \
| * | | SI-9134 Verify Stream#withFilter#map lazy in tailMarc Siegel2015-02-251-0/+25
* | | | Merge pull request #4363 from retronym/topic/t8575-check-initJason Zaugg2015-02-261-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | SI-8575 Avoid use of unitialized field in a test.Jason Zaugg2015-02-261-3/+2
|/ / /
* | | Merge pull request #4284 from ms-tg/SI-8990-rebase-on-2.12-squashedAdriaan Moors2015-02-232-52/+92
|\ \ \
| * | | SI-8990 Allow GC during lazy evaluation of Stream#withFilterMarc Siegel2015-02-202-52/+92
| | |/ | |/|
* | | Merge pull request #4343 from adriaanm/reword-4267Adriaan Moors2015-02-233-36/+334
|\ \ \
| * | | SI-9113 Converting `null` collection Java<->Scala yields `null`Roman Hargrave2015-02-183-36/+334
| |/ /
* | | Merge pull request #4323 from axel22/t-concurrent-map-get-2.12.xAdriaan Moors2015-02-232-0/+87
|\ \ \
| * | | Fix SI-9147 Override `getOrElseUpdate` in `concurrent.Map`.Aleksandar Prokopec2015-02-122-0/+87
| |/ /
* | | Merge pull request #4286 from retronym/ticket/9131Adriaan Moors2015-02-233-18/+14
|\ \ \ | |/ / |/| |
| * | SI-9131 Fix use of apply syntactic sugar with by-name paramJason Zaugg2015-02-033-18/+14
|/ /
* | Merge pull request #4287 from adriaanm/ci-2.12-ide-nopAdriaan Moors2015-02-021-0/+3
|\ \
| * | Punt on IDE validation in 2.12.x...Adriaan Moors2015-02-021-0/+3
|/ /
* | Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-02-02702-3421/+13507
|\ \
| * | Refer to 2.12 in new release scriptsJason Zaugg2015-01-291-2/+2
| * | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-01-29204-579/+3368
| |\ \
| | * \ 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
| | |/ /
| | * | Merge pull request #4268 from adriaanm/new-ci-validationAdriaan Moors2015-01-285-71/+249
| | |\ \
| | | * | IDE validation: run on last commitAdriaan Moors2015-01-271-0/+32
| | | * | New PR validationAdriaan Moors2015-01-214-71/+217