Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #4008 from gourlaysama/wip/junit-2 | Jason Zaugg | 2014-10-01 | 13 | -7/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Better ant / junit interaction | Antoine Gourlay | 2014-09-29 | 13 | -7/+4 | |
* | | | | | | | | | Merge pull request #4010 from lrytz/t8087 | Jason Zaugg | 2014-10-01 | 2 | -5/+24 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | SI-8087 keep annotations on mixed-in private[this] fields | Lukas Rytz | 2014-09-30 | 2 | -5/+24 | |
* | | | | | | | | | Merge pull request #4018 from retronym/ticket/8774-concurrent-modification | Lukas Rytz | 2014-09-30 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Don't remove elements from a map during iteration. | Jason Zaugg | 2014-09-30 | 1 | -2/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4011 from lrytz/t8445-6622 | Jason Zaugg | 2014-09-30 | 4 | -0/+72 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | SI-8445, SI-6622 test cases, already fixed | Lukas Rytz | 2014-09-29 | 4 | -0/+72 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #4013 from retronym/ticket/8868 | Lukas Rytz | 2014-09-30 | 7 | -2/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | SI-8868 Fix unpickling of local dummy symbols | Jason Zaugg | 2014-09-30 | 7 | -2/+34 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #3996 from gourlaysama/wip/spec | Jason Zaugg | 2014-09-29 | 14 | -11/+690 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | spec: a header that links to the index, with a scala logo | Antoine Gourlay | 2014-09-23 | 6 | -5/+60 | |
| * | | | | | | | | spec: a print stylesheet to remove the TOC when printing | Antoine Gourlay | 2014-09-23 | 2 | -0/+16 | |
| * | | | | | | | | spec: generated TOC with linkable headers | Antoine Gourlay | 2014-09-22 | 9 | -7/+615 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #4009 from gourlaysama/wip/test-flags | Jason Zaugg | 2014-09-29 | 4 | -4/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Cleanup a few flags in test/files/ | Antoine Gourlay | 2014-09-29 | 4 | -4/+0 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #4007 from retronym/topic/bump-timeout | Grzegorz Kossakowski | 2014-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Bump timeout in interactive tests from 10s -> 30s. | Jason Zaugg | 2014-09-29 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4006 from retronym/topic/defragility | Jason Zaugg | 2014-09-28 | 2 | -3/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Avoid test fragility to changes in Predef | Jason Zaugg | 2014-09-28 | 2 | -3/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #4002 from retronym/merge/2.10.x-to-2.11.x-20140925 | Jason Zaugg | 2014-09-25 | 0 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.11.x-2014... | Jason Zaugg | 2014-09-25 | 0 | -0/+0 | |
|/| | | | | | | ||||||
| * | | | | | | Merge pull request #3998 from retronym/backport/7756 | Grzegorz Kossakowski | 2014-09-24 | 8 | -8/+69 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | [backport] SI-7756 Uncripple refchecks in case bodies | Jason Zaugg | 2014-09-23 | 8 | -8/+69 | |
* | | | | | | | | Merge pull request #3999 from mpociecha/classpath-findSourceFile-method-renaming | Grzegorz Kossakowski | 2014-09-24 | 4 | -5/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Get rid of Platform.doLoad method. | Grzegorz Kossakowski | 2014-09-24 | 1 | -1/+0 | |
| * | | | | | | | | Rename ClassPath.findSourceFile to ClassPath.findClassFile | Grzegorz Kossakowski | 2014-09-24 | 3 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #3994 from puffnfresh/feature/system-compiler-properties | Grzegorz Kossakowski | 2014-09-24 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make compiler.properties fall back to prefixed | Brian McKenna | 2014-09-22 | 2 | -4/+4 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3997 from krystiannowak/patch-1 | Jason Zaugg | 2014-09-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | HasSet to HashSet typo fix | Krystian Nowak | 2014-09-22 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3990 from som-snytt/issue/spec-overload-title | Jason Zaugg | 2014-09-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Particular formatting improvement in the spec | Som Snytt | 2014-09-19 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3984 from gourlaysama/wip/spec | Jason Zaugg | 2014-09-19 | 20 | -773/+656 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | spec: fix broken links and anchors, including examples | Antoine Gourlay | 2014-09-17 | 6 | -15/+16 | |
| * | | | | | spec: remove trailing whitespace everywhere | Antoine Gourlay | 2014-09-17 | 16 | -660/+497 | |
| * | | | | | spec: fix latex formatting all over the place | Antoine Gourlay | 2014-09-17 | 9 | -101/+104 | |
| * | | | | | spec: add syntax highlighting for scala code with highlight.js | Antoine Gourlay | 2014-09-17 | 3 | -0/+42 | |
| * | | | | | spec: use the yaml title as the HTML title | Antoine Gourlay | 2014-09-15 | 2 | -4/+4 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #3988 from ghik/issue/8459 | Jason Zaugg | 2014-09-18 | 4 | -1/+32 | |
|\ \ \ \ \ | ||||||
| * | | | | | SI-8459 fix incorrect positions for incomplete selection trees | ghik | 2014-09-17 | 4 | -1/+32 | |
* | | | | | | Merge pull request #3989 from retronym/ticket/8852 | Grzegorz Kossakowski | 2014-09-18 | 2 | -2/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SI-8852 Support joint compilation of Java interfaces w. statics | Jason Zaugg | 2014-09-18 | 2 | -2/+37 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #3974 from xeno-by/topic/buffer-pattern-expander-errors | Grzegorz Kossakowski | 2014-09-18 | 7 | -12/+44 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | This ensures that typechecking custom unapplications in silent mode | Eugene Burmako | 2014-09-11 | 7 | -12/+44 | |
* | | | | | | Merge pull request #3980 from retronym/ticket/8844 | Lukas Rytz | 2014-09-17 | 2 | -1/+5 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | SI-8844 Fix regression with existentials + type aliases | Jason Zaugg | 2014-09-13 | 2 | -1/+5 | |
* | | | | | | Merge pull request #3848 from Ichoran/issue/8680 | Lukas Rytz | 2014-09-16 | 4 | -14/+198 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SI-8680 Stream.addString is too eager | Rex Kerr | 2014-09-12 | 4 | -14/+198 | |
* | | | | | | | Merge pull request #3941 from Ichoran/issue/8815 | Lukas Rytz | 2014-09-16 | 2 | -27/+26 | |
|\ \ \ \ \ \ \ |