aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-092-3/+44
|\
| * Merge pull request #3128 from omniError/ticket/13306Joas Schilling2015-01-092-3/+44
| |\ | | | | | | | | | [ticket/13306] add error level to collector
| | * [ticket/13306] update testomniError2014-11-131-1/+29
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
| | * [ticket/13306] move error_reporting callomniError2014-11-131-2/+3
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
| | * [ticket/13306] allow 0 error typesomniError2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
| | * [ticket/13306] constructor sets error typesomniError2014-11-111-2/+14
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
| | * [ticket/13306] add error level to collectoromniError2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-0/+31
|\ \ \ | |/ /
| * | Merge pull request #3227 from prototech/ticket/13366Joas Schilling2015-01-091-0/+31
| |\ \ | | | | | | | | | | | | [ticket/13366] Ensure plupload_last_gc config entry is dynamic.
| | * | [ticket/13366] Ensure plupload_last_gc config entry is dynamic.Cesar G2014-12-091-0/+31
| | | | | | | | | | | | | | | | PHPBB3-13366
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3242 from lavigor/ticket/13442Joas Schilling2015-01-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13442] UTF-8 symbols for database host
| | * | | [ticket/13442] UTF-8 symbols for database hostlavigor2015-01-021-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Added support for cyrillic domains as database hosts. PHPBB3-13442
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3258 from marc1706/ticket/13385Joas Schilling2015-01-091-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13385] Free result in \phpbb\config\db::set_atomic()
| | * | | [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()Marc Alexander2015-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13385
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/bbcode.php
| * | | | Merge pull request #3267 from Elsensee/ticket/13478Joas Schilling2015-01-091-1/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13478] Add event core.bbcode_cache_init_end
| | * | | | [ticket/13478] Add event core.bbcode_cache_init_endOliver Schramm2015-01-081-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13478
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3268 from Elsensee/ticket/13470Joas Schilling2015-01-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13470] Fix non-empty username array if no usernames are given
| | * | | | | [ticket/13470] Fix non-empty username array if no usernames are givenOliver Schramm2015-01-081-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13470
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3271 from marc1706/ticket/13432Joas Schilling2015-01-091-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/13432] Make sure to add language file when including acp_modules
| | * | | | [ticket/13432] Make sure to add language file when including acp_modulesMarc Alexander2015-01-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13432
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3262 from Elsensee/ticket/13466Joas Schilling2015-01-061-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13466] Add bitfield and uid to event core.message_parser_check_message
| | * | | | [ticket/13466] Add bitfield and uid to event core.message_parser_check_messageOliver Schramm2015-01-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13466
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-062-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | Merge pull request #3243 from kinerity/ticket/13437Joas Schilling2015-01-063-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13437] Add template event viewtopic_body_post_author_before/after
| | * | | | | [ticket/13437] Change "View" to "view"Kailey Truscott2015-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13437
| | * | | | | Fix events.md event nameKailey Truscott2015-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13437
| | * | | | | [ticket/13437] Add template event viewtopic_body_post_author_before/afterKailey Truscott2015-01-023-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13437
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-0/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3231 from rxu/ticket/13435Joas Schilling2015-01-061-0/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13435] Add core event to modify submit_post() sql data
| | * | | | | | [ticket/13435] Add core event to modify submit_post() sql datarxu2014-12-131-0/+24
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13435
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-1/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3230 from omniError/ticket/13430Joas Schilling2015-01-061-1/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13430] Add event core.prune_sql
| | * | | | | | [ticket/13430] update event versionomniError2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13430 PHPBB3-13430
| | * | | | | | [ticket/13430] Add event core.prune_sqlomniError2014-12-111-1/+16
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13430 PHPBB3-13430
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-2/+36
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'Wolfsblvt-ticket/13428' into develop-ascraeusJoas Schilling2015-01-061-2/+36
| |\ \ \ \ \ \
| | * | | | | | [ticket/13428] Add core events to memberlist.php for teampageWolfsblvt2015-01-061-2/+36
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13428
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-062-1/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3221 from MasterShredder/ticket/13422Joas Schilling2015-01-062-1/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13422] New events for save custom cookies and set custom ban type
| | * | | | | | [ticket/13422] Renamed eventMasterShredder2014-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13422
| | * | | | | | [ticket/13422] Changed some spaces to tabsMasterShredder2014-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13422
| | * | | | | | [ticket/13422] Changed variable descriptionsMasterShredder2014-12-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13422
| | * | | | | | [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event ↵MasterShredder2014-12-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core.ucp_save_custom_cookies PHPBB3-13422
| | * | | | | | [ticket/13422] Deleted event core.session_check_user_sessionMasterShredder2014-12-081-9/+1
| | | | | | | |