aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympusAndreas Fischer2012-02-286-10/+18
|\
| * [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.Joas Schilling2012-02-276-10/+18
* | Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympusAndreas Fischer2012-02-263-3/+3
|\ \
| * | [ticket/10453] Fixing spacingVjacheslav Trushkin2012-02-263-3/+3
* | | Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympusAndreas Fischer2012-02-261-12/+37
|\ \ \ | |/ / |/| |
| * | [ticket/10532] Remove unnecessary parentheses around calculations of addition.Andreas Fischer2012-02-261-2/+2
| * | [ticket/10532] Remove one unnecessary level of if block nesting.Andreas Fischer2012-02-261-37/+34
| * | [ticket/10532] Get rid of inline calculation of $start, remove duplicated checkAndreas Fischer2012-02-261-2/+7
| * | [ticket/10532] Put $total_match_count assignment onto its own line.Andreas Fischer2012-02-261-1/+2
| * | [ticket/10532] Adjust total match count and limitrxu2012-01-141-6/+21
| * | [ticket/10532] Fix $start out of range for pre-made searchesrxu2012-01-141-15/+22
* | | Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympusAndreas Fischer2012-02-254-3/+4
|\ \ \
| * | | [ticket/10456] Add tabindex to subsilver2 captchaJoas Schilling2012-02-214-3/+4
| | |/ | |/|
* | | Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympusAndreas Fischer2012-02-253-3/+3
|\ \ \
| * | | [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'Joas Schilling2012-02-201-1/+1
| * | | [ticket/10630] Perform array_unique on authors array before creating the queryJoas Schilling2012-02-202-2/+2
| |/ /
* | | Merge branch 'ticket/raimon/10453' into develop-olympusVjacheslav Trushkin2012-02-246-47/+35
|\ \ \ | |/ / |/| |
| * | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-143-10/+24
| * | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-135-50/+24
* | | Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympusOleg Pudeyev2012-02-111-1/+1
|\ \ \
| * | | [ticket/10633] Stop leaking filename of attachments when thumbnail is requestedAndreas Fischer2012-02-091-1/+1
* | | | Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympusOleg Pudeyev2012-02-113-3/+3
|\ \ \ \
| * | | | [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).Andreas Fischer2012-02-092-2/+2
| * | | | [ticket/10606] Fix incorrect hidden fields array name in page_header().James King2012-02-091-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-102-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10569] Invalid string comparison in prosilverVjacheslav Trushkin2012-02-071-2/+2
| * | | [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
* | | | Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympusIgor Wiedler2012-02-074-9/+22
|\ \ \ \
| * | | | [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| * | | | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| * | | | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-032-0/+9
| |/ / /
* | | | [ticket/9914] Add backup warning to updater.Michael Cullum2012-02-032-0/+6
|/ / /
* | | Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympusAndreas Fischer2012-01-231-18/+2
|\ \ \
| * | | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
* | | | [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definitionrxu2012-01-151-1/+1
|/ / /
* | | Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympusOleg Pudeyev2012-01-122-6/+13
|\ \ \
| * | | [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| * | | [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-242-5/+7
* | | | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-023-0/+10
* | | | Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
|\ \ \ \
| * | | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| * | | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-...Andreas Fischer2012-01-0220-34/+19
|\ \ \ \
| * | | | [ticket/9916] Changing header in non-distributed filesUnknown2012-01-0219-31/+17
| * | | | [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-011-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-013-3/+9
* | | | | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
|\ \ \ \ \
| * | | | | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
|\ \ \ \ \