Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | [prep-release-3.1.3] Add migration for 3.1.3 | Joas Schilling | 2015-02-01 | 1 | -0/+31 | |
| * | | | | | | | [prep-release-3.1.3] Update version to 3.1.3 | Joas Schilling | 2015-02-01 | 3 | -5/+5 | |
* | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Joas Schilling | 2015-01-31 | 5 | -5/+52 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC2 | Joas Schilling | 2015-01-31 | 1 | -0/+15 | |
| * | | | | | | | [prep-release-3.1.3] Add migration for 3.1.3-RC2 | Joas Schilling | 2015-01-31 | 1 | -0/+32 | |
| * | | | | | | | [prep-release-3.1.3] Update version to 3.1.3-RC2 | Joas Schilling | 2015-01-31 | 3 | -5/+5 | |
* | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Joas Schilling | 2015-01-31 | 1 | -7/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'ticket/13553' into prep-release-3.1.3 | Joas Schilling | 2015-01-31 | 1 | -7/+9 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/13553] Use defined title value in page headers too | Matt Friedman | 2015-01-31 | 1 | -1/+1 | |
| | * | | | | | | | [ticket/13553] Make title var accept a lang key var | Matt Friedman | 2015-01-31 | 1 | -4/+4 | |
| | * | | | | | | | [ticket/13553] Message helper should accept a lang key var | Matt Friedman | 2015-01-31 | 1 | -5/+7 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Joas Schilling | 2015-01-31 | 2 | -0/+74 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3355 from nickvergessen/ticket/13557 | Joas Schilling | 2015-01-31 | 2 | -0/+74 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1 | Joas Schilling | 2015-01-30 | 2 | -0/+74 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Andreas Fischer | 2015-01-30 | 2 | -5/+6 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3354 from nickvergessen/ticket/13556 | Andreas Fischer | 2015-01-30 | 2 | -5/+6 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/13556] Fix exception translation with filedownloader | Joas Schilling | 2015-01-30 | 2 | -5/+6 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Joas Schilling | 2015-01-30 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3341 from brunoais/ticket/13544 | Joas Schilling | 2015-01-30 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/13544] Use integer case because $role_id is an int | brunoais | 2015-01-26 | 1 | -1/+1 | |
| | * | | | | | | | [ticket/13544] Fixing wrong SQL query for permission_unset for roles | brunoais | 2015-01-26 | 1 | -1/+2 | |
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Andreas Fischer | 2015-01-30 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-30 | 3 | -29/+39 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Andreas Fischer | 2015-01-30 | 2 | -44/+52 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3 | Andreas Fischer | 2015-01-30 | 3 | -45/+53 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. | Andreas Fischer | 2015-01-30 | 1 | -2/+2 | |
| | * | | | | | | | | [prep-release-3.0.13] Also update version in references to files. | Andreas Fischer | 2015-01-29 | 1 | -3/+3 | |
| | * | | | | | | | | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. | Andreas Fischer | 2015-01-29 | 1 | -0/+10 | |
| | * | | | | | | | | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. | Andreas Fischer | 2015-01-29 | 1 | -24/+24 | |
| | * | | | | | | | | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. | Andreas Fischer | 2015-01-29 | 4 | -6/+12 | |
* | | | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeus | Dhruv | 2015-01-30 | 9 | -47/+196 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3353 from nickvergessen/ticket/13553 | Dhruv Goel | 2015-01-30 | 1 | -1/+16 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | [ticket/13553] Add a method to the controller helper to display a message | Joas Schilling | 2015-01-29 | 1 | -1/+16 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC1 | Joas Schilling | 2015-01-26 | 1 | -0/+96 | |
| * | | | | | | | | | [prep-release-3.1.3] Prepare Changelog | Joas Schilling | 2015-01-26 | 1 | -38/+41 | |
| * | | | | | | | | | [prep-release-3.1.3] Add migration for 3.1.3-RC1 | Joas Schilling | 2015-01-26 | 1 | -0/+35 | |
| * | | | | | | | | | [prep-release-3.1.3] Update version to 3.1.2-RC1 | Joas Schilling | 2015-01-26 | 6 | -8/+8 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Andreas Fischer | 2015-01-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympus | Dhruv | 2015-01-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge pull request #3347 from bantu/ticket/13554 | Dhruv Goel | 2015-01-29 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | [ticket/13554] Show feature release upgrades in blue rather than red. | Andreas Fischer | 2015-01-28 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Andreas Fischer | 2015-01-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-29 | 2 | -2/+7 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge pull request #3348 from bantu/ticket/13549 | Andreas Fischer | 2015-01-29 | 2 | -2/+7 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. | Marc Alexander | 2015-01-28 | 2 | -2/+7 | |
| | | |/ / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Andreas Fischer | 2015-01-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge pull request #3349 from bantu/ticket/12933 | Andreas Fischer | 2015-01-29 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | [ticket/12933] Handle case when * is last character of word | Dhruv | 2015-01-28 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | Merge pull request #3338 from dhruvgoel92/ticket/12933 | Andreas Fischer | 2015-01-29 | 3 | -1/+61 | |
|\ \ \ \ \ \ \ \ \ |