aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12349] Update license header in several new filesJoas Schilling2014-04-0398-98/+98
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-030-0/+0
|\
| * Merge remote-tracking branch 'Elsensee/ticket/12341' into develop-olympusJoas Schilling2014-04-031-0/+125
| |\
* | \ Merge remote-tracking branch 'Elsensee/ticket/12341-ascraeus' into develop-as...Joas Schilling2014-04-031-0/+126
|\ \ \
| * | | [ticket/12341] Update test with new class name and dependenciesOliver Schramm2014-04-021-2/+3
| * | | Merge branch 'ticket/12341' into ticket/12341-ascraeusOliver Schramm2014-04-021-0/+125
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/12341] Add tests for get_username_string()Oliver Schramm2014-04-011-0/+125
| | |/
* | | Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeusJoas Schilling2014-04-032-33/+60
|\ \ \ | |/ / |/| |
| * | [ticket/12043] Fix order of disabled extensions in unit testsMatt Friedman2014-03-291-5/+5
| * | [ticket/12043] Correct try/catch exceptions for invalid extensionsMatt Friedman2014-03-291-49/+49
| * | [ticket/12043] Sort Extensions by Display Name in ACP Extension manangerMatt Friedman2014-03-291-3/+30
* | | Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeusJoas Schilling2014-04-016-18/+30
|\ \ \
| * | | [ticket/12329] changed all CSS classes to ".stat-block"PayBas2014-04-016-11/+11
| * | | [ticket/12329] Add <div> container to index blocks (stats, etc.)PayBas2014-03-306-18/+30
* | | | Merge remote-tracking branch 'paybas/ticket/12328' into develop-ascraeusJoas Schilling2014-04-013-0/+12
|\ \ \ \
| * | | | [ticket/12328] Change "since" to B3PayBas2014-04-011-1/+1
| * | | | [ticket/12328] Add Template Event index_body_stat_blocks_afterPayBas2014-03-303-0/+12
| |/ / /
* | | | Merge remote-tracking branch 'paybas/ticket/12322' into develop-ascraeusJoas Schilling2014-04-012-8/+8
|\ \ \ \
| * | | | [ticket/12322] Added profile-custom-field classPayBas2014-04-012-2/+2
| * | | | [ticket/12322] CSS classes for postprofile-profile <dd> itemsPayBas2014-03-292-8/+8
| |/ / /
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-311-29/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'bantu/ticket/12318-olympus' into develop-olympusJoas Schilling2014-03-311-29/+54
| |\ \ \
| | * | | [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.Andreas Fischer2014-03-301-0/+4
| | * | | [ticket/12318] Pin HHVM version to 3.0.0~precise.Andreas Fischer2014-03-301-1/+2
| | * | | [ticket/12318] Always install new config file on HHVM upgrade conflict.Andreas Fischer2014-03-301-1/+1
| | * | | [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.Andreas Fischer2014-03-301-0/+6
| | * | | [ticket/12318] Upgrade to a recent stable version of HHVM.Andreas Fischer2014-03-301-0/+3
| | * | | [ticket/12318] Correctly setup HHVM for functional tests.Andreas Fischer2014-03-301-29/+40
| |/ / /
* | | | Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeusJoas Schilling2014-03-3111-111/+107
|\ \ \ \
| * | | | [ticket/9758] Clickable avatar in header and renamed class for avatar-imgCrizzo2014-03-303-2/+3
| * | | | [ticket/9758] Remove unnessary if-question for include functions_displayCrizzo2014-03-281-5/+0
| * | | | [ticket/9758] Slims the line 4775 in includes/functions.phpCrizzo2014-03-281-1/+1
| * | | | [ticket/9758] Adds id and changes filter to fix travis CI testCrizzo2014-03-283-4/+4
| * | | | [ticket/9758] Removed the needless space after first ENDIFCrizzo2014-03-281-1/+1
| * | | | [ticket/9758] Adding impr. for overall_header display of avatar and usernameCrizzo2014-03-283-3/+6
| * | | | [ticket/9758] Fixed bug in mcp_warn.phpCrizzo2014-03-282-2/+9
| * | | | [ticket/9758] Optimises the html code of avatar image in headerCrizzo2014-03-281-1/+1
| * | | | [ticket/9758] Error because of missing functions_display.php fixedCrizzo2014-03-282-2/+8
| * | | | [ticket/9758] Removed useless if-conditions to include functions.phpCrizzo2014-03-287-34/+1
| * | | | [ticket/9758] Changes class name of new "span" in overall_header.htmlCrizzo2014-03-282-2/+2
| * | | | [ticket/9758] Adds global template variable CURRENT_USER_AVATARCrizzo2014-03-2811-94/+111
* | | | | Merge branch 'prep-release-3.1.0-b2' into develop-ascraeusJoas Schilling2014-03-308-35/+133
|\ \ \ \ \
| * | | | | [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3Joas Schilling2014-03-303-5/+5
| * | | | | [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2Joas Schilling2014-03-301-0/+66
| * | | | | [prep-release-3.1.0-b2] Prepare ChangelogJoas Schilling2014-03-301-25/+28
| * | | | | [prep-release-3.1.0-b2] Add migration for 3.1.0-b2Joas Schilling2014-03-301-0/+29
| * | | | | [prep-release-3.1.0-b2] Update version to 3.1.0-b2Joas Schilling2014-03-306-8/+8
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/12326' into develop-ascraeusDavid King2014-03-301-17/+11
|\ \ \ \ \
| * | | | | [ticket/12326] Correctly format update/index.php and remove php closing tagJoas Schilling2014-03-301-11/+5
| * | | | | [ticket/12326] Do not add deleted files to the list of changed filesJoas Schilling2014-03-301-6/+6