aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13753] Add template events to forum category row headersMatt Friedman2015-04-092-0/+16
* Merge pull request #3513 from bantu/ticket/13736Andreas Fischer2015-04-021-4/+4
|\
| * [ticket/13736] Missing four colon in Contact us pageRaphaƫl M2015-04-021-4/+4
|/
* Merge pull request #3510 from Nicofuma/ticket/13732Marc Alexander2015-04-011-0/+0
|\
| * [ticket/13732] Update composer to be php7 compliantTristan Darricau2015-03-301-0/+0
|/
* Merge branch '3.0.x' into 3.1.xNicofuma2015-03-290-0/+0
|\
| * Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-293-5/+88
| |\
* | \ Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-294-5/+175
|\ \ \
| * | | [ticket/13568] Add unit tests for validating absolute pathMarc Alexander2015-02-061-0/+87
| * | | Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-063-5/+88
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/13568] Also check if absolute_path_writable is writableMarc Alexander2015-02-061-1/+1
| | * | [ticket/13568] Use correct data provider on windowsMarc Alexander2015-02-031-1/+1
| | * | [ticket/13568] Add imagick tests for windowsMarc Alexander2015-02-021-8/+40
| | * | [ticket/13568] Correctly check rpath and rwpath validation optionsMarc Alexander2015-02-021-1/+1
| | * | [ticket/13568] Add more test cases for imagick pathMarc Alexander2015-02-021-0/+2
| | * | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-022-40/+9
| | * | [ticket/13568] Add functional test for imagick path settingMarc Alexander2015-02-021-0/+44
| | * | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-022-1/+37
* | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-03-261-3/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #3493 from prototech/ticket/13555Andreas Fischer2015-03-261-3/+7
| |\ \ \
| | * | | [ticket/13555] Render poll options separately when previewing.JoshyPHP2015-03-191-3/+7
* | | | | Merge branch '3.0.x' into 3.1.xOliver Schramm2015-03-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3505 from Nicofuma/ticket/13723Oliver Schramm2015-03-251-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge pull request #3506 from Nicofuma/ticket/13723-31xOliver Schramm2015-03-251-1/+2
|\ \ \ \ \
| * \ \ \ \ [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
| |\ \ \ \ \ |/ / / / / / | | | _ / / | | | / /
| * | | | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| |/ / /
* | | | Merge pull request #3398 from marc1706/ticket/13612Nicofuma2015-03-242-5/+12
|\ \ \ \
| * | | | [ticket/13612] Always display success message if extension was enabledMarc Alexander2015-02-142-13/+1
| * | | | [ticket/13612] Run meta refresh until extension is fully enabledMarc Alexander2015-02-141-1/+20
* | | | | Merge pull request #3501 from prototech/ticket/13698Nicofuma2015-03-241-13/+11
|\ \ \ \ \
| * | | | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.Cesar G2015-03-231-13/+11
* | | | | | Merge pull request #3410 from Senky/ticket/13467Nicofuma2015-03-241-0/+6
|\ \ \ \ \ \
| * | | | | | [ticket/13467] Add coding guidelines linkJakub Senko2015-02-261-1/+1
| * | | | | | [ticket/13467] Add a CONTRIBUTING fileJakub Senko2015-02-161-0/+6
* | | | | | | Merge pull request #3499 from Elsensee/ticket/13721Marc Alexander2015-03-241-0/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/13271] Fix URL Rewriting on IIS7Oliver Schramm2015-03-231-0/+12
|/ / / / / /
* | | | | | Merge remote-tracking branch 'brunoais/ticket/13719' into 3.1.xCesar G2015-03-231-1/+0
|\ \ \ \ \ \
| * | | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
|/ / / / / /
* | | | | | Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.xCesar G2015-03-188-10/+10
|\ \ \ \ \ \
| * | | | | | [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template filesJakub Senko2015-02-168-10/+10
| |/ / / / /
* | | | | | Merge pull request #3490 from prototech/ticket/13550Marc Alexander2015-03-161-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/13550] Check that the Plupload temp directory is writable before movingCesar G2015-03-151-1/+1
|/ / / / / /
* | | | | | Merge branch 'ticket/13702' into 3.1.xDhruv2015-03-156-5/+6
|\ \ \ \ \ \
| * | | | | | [ticket/13702] Add initial-scale to viewport in page headercyberalien2015-03-146-5/+6
* | | | | | | Merge pull request #3476 from brunoais/ticket/13674Dhruv Goel2015-03-141-11/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
| * | | | | | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
* | | | | | | Merge pull request #3428 from prototech/ticket/13463Marc Alexander2015-03-111-0/+7
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13463] Correctly position notification mark read icon in RTL.Scout4all2015-02-191-0/+7
* | | | | | | | Merge pull request #3477 from n-aleha/ticket/13679Marc Alexander2015-03-102-0/+8
|\ \ \ \ \ \ \ \