aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
* Merge PR #973 branch 'bantu/ticket/11069' into develop-olympusOleg Pudeyev2012-10-101-1/+1
|\
| * [ticket/11069] Add closing span back to credit line in subsilver2 simple footerAndreas Fischer2012-08-261-1/+1
* | Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympusOleg Pudeyev2012-10-091-1/+1
|\ \
| * | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
* | | Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympusAndreas Fischer2012-10-0610-10/+10
|\ \ \
| * | | [ticket/11135] Full replacement of credit link to httpsVinny2012-10-0510-10/+10
|/ / /
* | | Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympusAndreas Fischer2012-10-022-3/+3
|\ \ \ | |/ / |/| |
| * | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-012-3/+3
|/ /
* | Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympusAndreas Fischer2012-09-291-7/+8
|\ \
| * | [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributorsJoas Schilling2012-09-271-7/+8
|/ /
* | Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympusAndreas Fischer2012-09-1411-0/+166
|\ \
| * | [ticket/11045] Removed file conflict tests for compress classFyorl2012-09-111-13/+2
| * | [ticket/11045] Replaced __DIR__ with dirname(__FILE__)Fyorl2012-09-011-8/+8
| * | [ticket/11045] Opening brace on its own lineFyorl2012-08-281-1/+2
| * | [ticket/11045] Explicitely check for zlib and bz2Fyorl2012-08-281-2/+1
| * | [ticket/11045] Added tests for file conflictsFyorl2012-08-281-5/+21
| * | [ticket/11045] Added unit tests for the compress classFyorl2012-08-2811-0/+161
* | | Merge remote-tracking branch 'github-imkingdavid/task/functional' into develo...Nils Adermann2012-09-014-3/+112
|\ \ \
| * | | [task/functional] Fixed DEBUG_TEST related issuesDavid King2012-09-012-2/+6
| * | | [task/functional] Allow tests to bypass certain restrictions with DEBUG_TESTDavid King2012-09-013-11/+6
| * | | [task/functional] Added posting tests (reply and new topic)David King2012-09-011-0/+110
| |/ /
* | | Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-o...Nils Adermann2012-09-011-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
* | | Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympusNils Adermann2012-08-261-1/+0
|\ \ \
| * | | [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.phpJordan Rogers2012-08-231-1/+0
| |/ /
* | | Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympusNils Adermann2012-08-261-0/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.Andreas Fischer2012-08-261-0/+1
|/ /
* | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-08-202-2/+8
|\ \ | |/ |/|
| * [prep-release-3.0.11] Bumping version number for 3.0.11 final.Andreas Fischer2012-08-204-5/+11
* | Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympusAndreas Fischer2012-08-191-1/+1
|\ \
| * | [ticket/11059] Use https for the README logoIgor Wiedler2012-08-191-1/+1
* | | Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympusOleg Pudeyev2012-08-183-1/+4
|\ \ \ | |/ / |/| |
| * | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-113-0/+3
| * | [ticket/10943] use keywords variable to display in search boxDhruv Goel2012-08-111-1/+1
|/ /
* | Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympusAndreas Fischer2012-07-301-4/+2
|\ \
| * | [ticket/11034] Re-arranged install order to emulate real installFyorl2012-07-301-4/+2
|/ /
* | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-233-2/+15
|\ \ | |/
| * [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.Andreas Fischer2012-07-231-0/+9
| * [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.Andreas Fischer2012-07-234-5/+9
* | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+5
|\ \ | |/
| * Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-231-2/+5
| |\
| | * [ticket/10965] Profile data is only grabbed when show_novalue is enabledNils Adermann2012-07-231-2/+5
* | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+8
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-231-0/+8
| |\ \ | | |/
| | * [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
* | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-2313-13/+46
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-2313-13/+46
| |\ \ | | |/
| | * [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1Nils Adermann2012-07-231-1/+1
| | * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-2313-13/+46
| |/