aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-144-19/+9
|\
| * Merge pull request #2956 from prototech/ticket/13019Tristan Darricau2014-09-144-19/+9
| |\
| | * [ticket/13019] Do not hide reason field when deleting permanently.Cesar G2014-09-141-8/+0
| | * [ticket/13019] Rename deletion reason label.Cesar G2014-09-141-1/+1
| | * [ticket/13019] Always accept a reason for deleting a post/topic.Cesar G2014-09-142-10/+8
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-142-2/+11
|\ \ \ | |/ /
| * | [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.Cesar G2014-09-142-2/+11
| |/
* | Merge branch 'develop-ascraeus' into developCesar G2014-09-141-1/+1
|\ \ | |/
| * Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeusCesar G2014-09-141-1/+1
| |\
| | * [ticket/13040] Fix W3C validator warning in overall_footer.htmlJohn2014-09-141-1/+1
* | | Merge branch 'develop-ascraeus' into developCesar G2014-09-143-67/+16
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeusCesar G2014-09-142-66/+15
| |\ \
| | * | [ticket/13009] Remove legacy browser hackshanakin2014-09-112-66/+15
| * | | Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeusCesar G2014-09-141-1/+1
| |\ \ \
| | * | | [ticket/13058] Add min value to jump to page inputLouis77772014-09-131-1/+1
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-125-630/+653
|\ \ \ \ | |/ / /
| * | | Merge pull request #2879 from callumacrae/ticket/12982Marc Alexander2014-09-125-630/+653
| |\ \ \
| | * | | [ticket/12982] Refactoring: Killed undescriptive variablesCallum Macrae2014-09-102-40/+40
| | * | | [ticket/12982] Refactoring: Cleaned up crazy insert users stuffCallum Macrae2014-08-141-25/+17
| | * | | [ticket/12982] Refactoring: Cleaned up forum_fn.jsCallum Macrae2014-08-141-236/+221
| | * | | [ticket/12982] Refactoring: Cleaned up phpbb.searchCallum Macrae2014-08-133-62/+77
| | * | | [ticket/12982] Refactoring: made JS in adm niceCallum Macrae2014-08-131-17/+16
| | * | | [ticket/12982] Refactoring: made most JS nice.Callum Macrae2014-08-133-296/+328
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-7/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2941 from Senky/ticket/12734Andreas Fischer2014-09-121-7/+3
| |\ \ \ \
| | * | | | [ticket/12734] Remove unnecessary error supressingJakub Senko2014-09-101-7/+3
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.phpTristan Darricau2014-09-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-3/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2901 from rxu/ticket/13005Tristan Darricau2014-09-111-3/+27
| |\ \ \ \
| | * | | | [ticket/13005] Add event to display_forums() to modify category template datarxu2014-08-221-3/+27
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2903 from rxu/ticket/13006Tristan Darricau2014-09-111-1/+5
| |\ \ \ \
| | * | | | [ticket/13006] Add variables to the 'core.modify_quickmod_actions' eventrxu2014-08-221-1/+5
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-101-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2940 from Senky/ticket/13042Andreas Fischer2014-09-101-2/+0
| |\ \ \ \
| | * | | | [ticket/13042] Remove unused variablesJakub Senko2014-09-101-2/+0
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-103-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2936 from nickvergessen/ticket/12976Tristan Darricau2014-09-104-2/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-094-2/+7
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-101-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13052] Restore timespan parameter for check_form_key()Joas Schilling2014-09-101-4/+9
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-091-9/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2934 from VSEphpbb/ticket/13051Marc Alexander2014-09-091-9/+20
| |\ \ \ \
| | * | | | [ticket/13051] Fix core event nameMatt Friedman2014-09-091-2/+2
| | * | | | [ticket/13051] Rename new event core.viewonline_modify_user_rowMatt Friedman2014-09-091-2/+2
| | * | | | [ticket/13051] Add a new core event to handle the template arrayMatt Friedman2014-09-091-2/+17
| | * | | | [ticket/13051] Fix viewonline event, remove template dataMatt Friedman2014-09-081-21/+17
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-092-22/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2935 from nickvergessen/ticket/13052Andreas Fischer2014-09-092-22/+18
| |\ \ \ \ \