Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Joas Schilling | 2015-06-14 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'prep-release-3.1.5' into 3.1.x | Joas Schilling | 2015-06-14 | 1 | -2/+2 |
| |\ | |||||
| | * | [prep-release-3.1.5] Update version for final 3.1.5 release | Joas Schilling | 2015-06-14 | 1 | -2/+2 |
| * | | [3.1.x] Update dev version to 3.1.6-RC1 | Joas Schilling | 2015-06-11 | 1 | -2/+2 |
| * | | Merge branch 'prep-release-3.1.5' into 3.1.x | Joas Schilling | 2015-06-11 | 2 | -8/+8 |
| |\ \ | | |/ | |||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-11 | 2 | -7/+7 |
|\ \ \ | |||||
| * | | | [3.1.x] Increase dev version to 3.1.6-dev | Joas Schilling | 2015-06-11 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Merge branch '3.0.x' into prep-release-3.1.5 | Joas Schilling | 2015-06-10 | 2 | -7/+7 |
| |\ \ | |||||
| | * | | [ticket/13823] Change diff options while packaging to not ignore all whitespaces | Tristan Darricau | 2015-06-10 | 2 | -7/+7 |
| | * | | Merge branch 'prep-release-3.0.14' into 3.0.x | Andreas Fischer | 2015-05-03 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | [3.0.x] Increment version number to 3.0.15-dev. | Andreas Fischer | 2015-04-28 | 1 | -3/+3 |
| * | | | | [prep-release-3.1.5] Update version to 3.1.5-RC1 | Joas Schilling | 2015-06-09 | 1 | -1/+1 |
* | | | | | Merge branch 'ticket/13930' into ticket/13930-master | Marc Alexander | 2015-06-08 | 2 | -0/+63 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset | Marc Alexander | 2015-06-08 | 2 | -3/+3 |
| * | | | | [ticket/13930] Remove not needed return statements | Marc Alexander | 2015-06-08 | 1 | -2/+0 |
| * | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis | Marc Alexander | 2015-06-07 | 2 | -0/+65 |
| |/ / / | |||||
* | | | | Merge branch '3.1.x' | Oliver Schramm | 2015-05-30 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3638 from naderman/ticket/13874 | Oliver Schramm | 2015-05-30 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | [ticket/13874] Add master to sami API docs | Nils Adermann | 2015-05-28 | 1 | -0/+1 |
* | | | | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 3 | -76/+75 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 3 | -76/+75 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 3 | -76/+75 |
* | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-16 | 2 | -0/+146 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3606 from Nicofuma/ticket/13838 | Joas Schilling | 2015-05-16 | 2 | -0/+146 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13838] Fix coding style | Nicofuma | 2015-05-14 | 1 | -1/+1 |
| | * | | | | [ticket/13838] Check braces for control structures | Nicofuma | 2015-05-14 | 2 | -0/+146 |
* | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | [ticket/13830] Fix unsused used statements and catch blocks | Nicofuma | 2015-05-14 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-14 | 1 | -0/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | [ticket/13830] Check class used in catch statements | Nicofuma | 2015-05-10 | 1 | -0/+14 |
* | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-03 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | [prep-release-3.1.4] Update version to 3.1.4 | Joas Schilling | 2015-05-03 | 1 | -2/+2 |
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-05-03 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-05-03 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release. | Andreas Fischer | 2015-05-03 | 1 | -3/+3 |
| | | | |/ | | | |/| | |||||
| | * | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2 | Joas Schilling | 2015-04-29 | 1 | -2/+2 |
* | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-28 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-04-28 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | [3.0.x] Bump version numbers for 3.0.14-RC1 release. | Andreas Fischer | 2015-04-27 | 1 | -1/+1 |
| * | | | | [3.1.x] Update development version to 3.1.5-dev | Joas Schilling | 2015-04-10 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Update version to 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during build | JoshyPHP | 2015-04-19 | 1 | -0/+2 |
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-03 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '3.0.x' into 3.1.x | Joas Schilling | 2015-04-03 | 1 | -5/+5 |
| |\ \ | | |/ | |||||
| | * | [ticket/13738] Use new branch names in sami-all.conf.php. | Andreas Fischer | 2015-04-02 | 1 | -5/+5 |
| | * | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-30 | 1 | -2/+2 |
| | |\ | |||||
* | | | | [ticket/13619] Remove unneeded files and folders from vendor in release package | Marc Alexander | 2015-02-15 | 1 | -0/+32 |