aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-192-13/+19
|\
| * [ticket/14660] Fix typos in email templates.rxu2016-06-195-5/+5
| * [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-195-5/+5
|\ \
| * | [ticket/14683] Fix typos in email templates.rxu2016-06-205-5/+5
* | | Merge pull request #4326 from Crizz0/ticket/14640Marc Alexander2016-06-191-1/+1
|\ \ \
| * | | [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docuCrizzo2016-05-181-1/+1
* | | | 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-195-2/+55
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-195-2/+54
| |\ \ \
| | * | | [ticket/13716] Remove extra br tag and correct missing closing a html tagRichard McGirr2016-05-162-2/+2
| | * | | [ticket/13716] Fix verbosenessRichard McGirr2016-04-122-18/+2
| | * | | [ticket/13716] Fix grammar and href title tagsRichard McGirr2016-04-061-7/+7
| | * | | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | * | | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-055-2/+71
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-194-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4351 from rmcgirr83/ticket_14672Marc Alexander2016-06-197-2/+18
| |\ \ \ \
| | * | | | [ticket/14672] Change event name add to events.mdRichard McGirr2016-06-137-2/+18
| | * | | | [ticket/14672] Add template event after topic titleRichard McGirr2016-06-121-1/+1
* | | | | | 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/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4328 from Senky/ticket/13865Marc Alexander2016-06-191-0/+5
| |\ \ \ \ \ \
| | * | | | | | [ticket/13865] Add id_ary, show_results to core.search_modify_param_beforeJakub Senko2016-05-221-0/+5
| | |/ / / / /
* | | | | | | 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
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-131-5/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-4/+2
| * | | | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-2/+2
| * | | | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-5/+26
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-06-111-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4345 from marc1706/ticket/14291Andreas Fischer2016-06-111-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/14291] Do not update filesize if displaying thumbnailMarc Alexander2016-05-301-1/+1
| * | | | | | Merge pull request #4346 from lavigor/ticket/14661Marc Alexander2016-06-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/14661] Fix a typo in twig.phplavigor2016-06-051-1/+1
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [ticket/14664] Fix PHPDoc comment in cron managerlavigor2016-06-071-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #4302 from cyberalien/ticket/14612Marc Alexander2016-06-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14612] Fix incorrect class for fieldset in mcp_approve.htmlcyberalien2016-04-231-1/+1
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-311-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | [ticket/14643] Offer latest backup to restore by defaultJakub Senko2016-05-291-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-281-0/+12
|\ \ \ \ \ \ \ | |/ / / / / /