aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9492] Retain custom ranks and avatars when setting users default groupJoas Schilling2013-01-171-30/+53
* Merge remote-tracking branch 'remotes/DavidIQ/ticket/10786' into developNathan Guse2013-01-164-14/+25
|\
| * [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-152-3/+7
| * [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-85/+22
| * [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-19/+89
|/
* Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into developNathan Guse2013-01-151-0/+16
|\
| * [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into developNathan Guse2013-01-156-64/+60
|\ \
| * | [ticket/10431] Remove .left class from reply-allVjacheslav Trushkin2013-01-161-1/+1
| * | [ticket/10431] Remove reply-all custom cssVjacheslav Trushkin2013-01-161-14/+0
| * | [ticket/10431] Adjustments for large buttonsVjacheslav Trushkin2013-01-151-33/+34
| * | [ticket/10431] Changed fonts for LinuxVjacheslav Trushkin2012-11-121-1/+1
| * | [ticket/10431] Adjustments for IE7Vjacheslav Trushkin2012-11-121-0/+1
| * | [ticket/10431] Different font for iOSVjacheslav Trushkin2012-11-121-1/+2
| * | [ticket/10431] CSS3 buttonsVjacheslav Trushkin2012-11-114-50/+57
* | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-1539-267/+21
|\ \ \
| * | | [ticket/11201] Remove database column on updateJoas Schilling2013-01-161-0/+5
| * | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-1138-267/+16
* | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-1411-51/+80
|\ \ \ \
| * | | | [ticket/11171] Moved the DB schema changes to its placeBruno Ais2012-12-071-19/+6
| * | | | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| * | | | [ticket/11171] Adapted the code in report.phpBruno Ais2012-12-071-19/+27
| * | | | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| * | | | [ticket/11171] DB changes for the updateBruno Ais2012-12-071-0/+17
| * | | | [ticket/11171] DB additions for these changesBruno Ais2012-12-058-19/+43
* | | | | Merge PR #1194 branch 'develop-olympus' into developOleg Pudeyev2013-01-133-1/+25
|\ \ \ \ \
| * \ \ \ \ Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympusOleg Pudeyev2013-01-133-1/+22
| |\ \ \ \ \
| | * | | | | [ticket/11323] Add tests for inclusion of defined variablesMarc Alexander2013-01-143-1/+22
* | | | | | | Merge PR #1191 branch 'develop-olympus' into developOleg Pudeyev2013-01-131-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympusOleg Pudeyev2013-01-131-0/+5
| |\ \ \ \ \ \
| | * | | | | | [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.Andreas Fischer2013-01-131-0/+5
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11320' into developAndreas Fischer2013-01-131-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31Nathan Guse2013-01-101-0/+5
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11321' into developAndreas Fischer2013-01-117-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/11321] Recreate schema files with develop/create_schema_files.phpJoas Schilling2013-01-117-10/+10
|/ / / / / /
* | | | | | Merge PR #1181 branch 'marc1706/ticket/11313' into developOleg Pudeyev2013-01-091-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11313] Use correct object el instead of eel in alt_text callbackMarc Alexander2013-01-081-1/+1
* | | | | | | Merge PR #1182 branch 'develop-olympus' into developOleg Pudeyev2013-01-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympusOleg Pudeyev2013-01-091-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | * | | | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| |/ / / / /
* | | | | | Merge PR #1178 branch 'marc1706/ticket/10949' into developOleg Pudeyev2013-01-086-226/+174
|\ \ \ \ \ \
| * | | | | | [ticket/10949] Remove not needed commaMarc Alexander2013-01-051-1/+1
| * | | | | | [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-046-97/+89
| * | | | | | Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949Marc Alexander2013-01-042-129/+85
| |\ \ \ \ \ \
| | * | | | | | [ticket/10949] Converted AJAX coding standards to new guidelines.Callum Macrae2012-06-212-132/+87
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
* | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/11311' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ \ \ \ \ \