Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915 | Jason Zaugg | 2014-09-16 | 36 | -297/+691 |
|\ | |||||
| * | Merge pull request #3967 from retronym/topic/mathjax | Grzegorz Kossakowski | 2014-09-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix broken URL for MathJAX Javascript dependency. | Jason Zaugg | 2014-09-08 | 1 | -1/+1 |
| * | | Merge pull request #3946 from gourlaysama/wip/t5254 | Grzegorz Kossakowski | 2014-09-09 | 2 | -11/+46 |
| |\ \ | |||||
| | * | | SI-5254 running an empty scala script should succeed | Antoine Gourlay | 2014-08-26 | 2 | -11/+46 |
| * | | | Merge pull request #3801 from Ichoran/issue/8474 | Grzegorz Kossakowski | 2014-09-09 | 2 | -16/+47 |
| |\ \ \ | |||||
| | * | | | SI-8474 Inconsistent behavior of patch method | Rex Kerr | 2014-08-24 | 2 | -16/+47 |
| * | | | | Merge pull request #3939 from lrytz/ystats | Lukas Rytz | 2014-09-08 | 15 | -209/+416 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Make MultiChoiceSetting.compute easier to understand | Lukas Rytz | 2014-09-08 | 1 | -18/+11 |
| | * | | | Address PR feedback, fix MultiChoiceSetting.contains | Lukas Rytz | 2014-09-08 | 3 | -22/+20 |
| | * | | | Use Enumeration for MultiChoiceSetting | Som Snytt | 2014-09-05 | 8 | -168/+288 |
| | * | | | -Ystatistics accepts a list of phases, cleanups in MultiChoiceSetting | Lukas Rytz | 2014-09-02 | 10 | -164/+254 |
| | * | | | Fix assertThrows, and the behaviors that it shadowed | Lukas Rytz | 2014-09-02 | 4 | -6/+12 |
| * | | | | Merge pull request #3935 from lrytz/t8803 | Jason Zaugg | 2014-09-05 | 4 | -5/+90 |
| |\ \ \ \ | |||||
| | * | | | | SI-8803 generate super accessor for super[A], if A is outer superclass | Lukas Rytz | 2014-08-20 | 4 | -5/+90 |
| * | | | | | Merge pull request #3961 from lrytz/t8786-disable-test | Jason Zaugg | 2014-09-04 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-8786 disable part of test that's failing the jdk8 build | Lukas Rytz | 2014-09-04 | 1 | -1/+3 |
| * | | | | | | Merge pull request #3932 from gourlaysama/wip/t8498 | Jason Zaugg | 2014-09-04 | 3 | -5/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8498 @compileTimeOnly should be aware of bridge methods. | Antoine Gourlay | 2014-08-21 | 3 | -5/+9 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3951 from pawel-wiejacha/2.11.x_SI-8810_fix | Grzegorz Kossakowski | 2014-09-03 | 3 | -45/+18 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8810 scaladoc: fixed code block indentation normalization | Paweł Wiejacha | 2014-09-03 | 3 | -45/+18 |
| * | | | | | | | Merge pull request #3960 from gourlaysama/wip/t8113 | Vlad Ureche | 2014-09-03 | 3 | -2/+43 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | SI-8113 allow a newline between a link target and title | Antoine Gourlay | 2014-09-03 | 3 | -2/+43 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #3955 from som-snytt/issue/8410 | Grzegorz Kossakowski | 2014-09-03 | 3 | -2/+18 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8410 Summarize if warnings and not disabled | Som Snytt | 2014-09-01 | 1 | -5/+2 |
| | * | | | | | | SI-8410 Don't warn fatally on disabled flag | Som Snytt | 2014-09-01 | 3 | -3/+22 |
| * | | | | | | | Merge pull request #3958 from lrytz/merge/2.10-to-2.11-sept-2 | Jason Zaugg | 2014-09-03 | 3 | -1/+25 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge pull request #3965 from retronym/topic/list-serializable | Grzegorz Kossakowski | 2014-09-10 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prefer scala.Serializable to j.io.Serializable | Jason Zaugg | 2014-09-06 | 5 | -7/+7 |
* | | | | | | | | | | Merge pull request #3969 from huitseeker/scaladoc-upheaval | Grzegorz Kossakowski | 2014-09-10 | 11 | -30/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Change Synchronized(Set|Map) to Java concurrency | François Garillot | 2014-09-09 | 1 | -6/+7 |
| * | | | | | | | | | | Removing deprecations | François Garillot | 2014-09-09 | 8 | -19/+19 |
| * | | | | | | | | | | Bump versions for Eclipse .classpath. | François Garillot | 2014-09-09 | 3 | -5/+4 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3970 from gourlaysama/wip/t8764-product-case-class | Grzegorz Kossakowski | 2014-09-09 | 1 | -21/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | SI-8764 remove Xexperimental special Product members for case classes | Antoine Gourlay | 2014-09-08 | 1 | -21/+3 |
* | | | | | | | | | | Merge pull request #3959 from lrytz/merge/2.11-to-2.12-is-it-really-sept-2-al... | Jason Zaugg | 2014-09-03 | 327 | -10664/+5264 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'merge/2.10-to-2.11-sept-2' into merge/2.11-to-2.12-is-it-really... | Lukas Rytz | 2014-09-02 | 54 | -1813/+2703 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge branch '2.10.x' into merge/2.10-to-2.11-sept-2 | Lukas Rytz | 2014-09-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge pull request #3937 from som-snytt/issue/8787-doc-backport | Grzegorz Kossakowski | 2014-09-02 | 1 | -186/+291 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | [backport] SI-8787 Backport Regex doc | Som Snytt | 2014-08-26 | 1 | -186/+291 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge pull request #3865 from xeno-by/topic/extractor-macros-210x | Grzegorz Kossakowski | 2014-08-19 | 5 | -42/+114 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | [backport] transformers no longer ignore UnApply.fun | Eugene Burmako | 2014-07-03 | 5 | -42/+114 |
| | | * | | | | | | | | | | Merge pull request #3860 from gourlaysama/wip/t7710-backport | Grzegorz Kossakowski | 2014-08-19 | 3 | -3/+39 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | [backport] SI-7710 fix memory performance of RegexParsers in jdk7u6+ | Antoine Gourlay | 2014-08-12 | 3 | -3/+39 |
| | | | |/ / / / / / / / / | |||||
| | * | | | / / / / / / / | Merge commit 'b5759ef' into merge/2.10-to-2.11-sept-2 | Lukas Rytz | 2014-09-02 | 3 | -1/+25 |
| | |\| | | | | | | | | | | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Merge pull request #3904 from kzys/jira-8314-2.10.x | Grzegorz Kossakowski | 2014-08-07 | 2 | -0/+19 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Prevent SI-8314 by adding a test | Kato Kazuyoshi | 2014-07-31 | 2 | -0/+19 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge pull request #3752 from jeroentervoorde/SI_8589 | Adriaan Moors | 2014-07-04 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | SI-8589 Performance improvement for ArrayCharSequence.toString | Jeroen ter Voorde | 2014-06-19 | 1 | -1/+6 |
| | | |/ / / / / / / / | |||||
| | * | | | | | | | | | Merge pull request #3952 from gourlaysama/wip/t8828-lint-innacessible | Grzegorz Kossakowski | 2014-09-02 | 3 | -1/+22 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | |