aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4418 from Elsensee/ticket/14636Marc Alexander2016-08-211-0/+4
|\
| * [ticket/14636] Inject into set_config methodsOliver Schramm2016-08-211-0/+2
| * [ticket/14636] Restore BC with request_varOliver Schramm2016-08-201-0/+2
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-211-8/+10
|\ \ | |/ |/|
| * [ticket/12925] Pluralize permanent delete checkbox labelJakub Senko2016-08-151-8/+10
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-011-7/+17
|\ \ | |/
| * [ticket/14721] Avoid renaming deleted usersOliver Schramm2016-08-011-7/+17
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-171-1/+11
|\ \ | |/
| * [ticket/14713] Add core event to the admin function get_forum_list()rxu2016-07-171-1/+11
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-161-9/+22
|\ \ | |/
| * Merge pull request #4374 from TheKigen/ticket/14616Marc Alexander2016-07-161-9/+22
| |\
| | * [ticket/14616] Switch prune limit to sql_query_limit instead of sql_andMax Krivanek2016-07-061-7/+2
| | * [ticket/14616] Added comma expected by test scripts.Max Krivanek2016-07-011-1/+1
| | * [ticket/14616] Added prune_limit to event core.prune_sqlMax Krivanek2016-06-281-1/+11
| | * [ticket/14616] Removed misplaced tab.Max Krivanek2016-06-271-1/+1
| | * [ticket/14616] Fixed auto-prune failing on large forumsMax Krivanek2016-06-271-6/+14
* | | [ticket/14709] add post_id to mod logWesley Fok2016-07-131-0/+1
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-071-1/+1
|\ \ \ | |/ /
| * | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-071-1/+1
| |\ \
| | * | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-111-1/+1
* | | | Merge pull request #4375 from bantu/ticket/14692Marc Alexander2016-07-061-1/+0
|\ \ \ \
| * | | | [ticket/14692] Remove duplicate subexpression in questionnaire.phpkilida2016-07-021-1/+0
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-061-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-1/+1
* | | | [Release 3.2.0-RC1] Update version to 3.2.0-RC2-devTristan Darricau2016-06-271-1/+1
* | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-271-1/+1
|\ \ \ \
| * | | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1Tristan Darricau2016-06-191-1/+1
* | | | | [ticket/14690] Create email queue cache file in the current env cache folderrxu2016-06-231-2/+2
* | | | | [ticket/14660] Remove redundant empty line in ucp_profile.phprxu2016-06-201-1/+0
* | | | | Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-192-13/+19
|\ \ \ \ \
| * | | | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
* | | | | | Merge pull request #4356 from markshawtoronto/ticket/14680Marc Alexander2016-06-191-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/14680] Fix wrong function name being checked in mcp_queue.Mark Shaw2016-06-171-1/+1
| |/ / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-192-0/+18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-192-0/+18
| |\ \ \ \ \
| | * | | | | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-1/+1
| | * | | | | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | * | | | | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-0/+19
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4331 from Senky/ticket/13978Marc Alexander2016-06-191-0/+10
| |\ \ \ \ \ \
| | * | | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_aryJakub Senko2016-05-241-0/+10
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge pull request #4329 from Senky/ticket/14429Marc Alexander2016-06-191-0/+24
| |\ \ \ \ \
| | * | | | | [ticket/14429] Add core.modify_users_online_string_modifyJakub Senko2016-05-271-0/+24
| | |/ / / /
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+28
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge pull request #4316 from rmcgirr83/ticket_14630Marc Alexander2016-06-191-0/+28
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/14630] Rename core eventRichard McGirr2016-06-021-3/+3
| | * | | [ticket/14630] Change event name and fix capitalizationRichard McGirr2016-05-161-3/+3
| | * | | [ticket/14630] Add event to modify pm messageRichard McGirr2016-05-061-0/+28