aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-102-9/+19
|\
| * Merge pull request #3189 from rxu/ticket/12926Joas Schilling2015-01-102-9/+19
| |\ | | | | | | | | | [ticket/12926] Support for IDN (IRI)
| | * [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.phprxu2015-01-101-7/+17
| | | | | | | | | | | | | | | | | | | | | Get rid of the $scheme and $inline vars, fix regex_idn.php to generate both common and inline mode regexes all at once. PHPBB3-12926
| | * [ticket/12926] Support for IDN (IRI)rxu2014-11-272-5/+5
| | | | | | | | | | | | | | | | | | Add international domain name support for URLs. PHPBB3-12926
* | | 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
|\ \ \ \ | |/ / /
| * | | [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-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-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 developMarc Alexander2015-01-041-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3254 from VSEphpbb/ticket/13440Marc Alexander2015-01-041-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13440] Update event version to 3.1.3-RC1
| | * | [ticket/13440] Update event version to 3.1.3-RC1Matt Friedman2015-01-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13440
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3253 from VSEphpbb/ticket/13439Marc Alexander2015-01-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13439] Update event version to 3.1.3-RC1
| | * | | [ticket/13439] Update event version to 3.1.3-RC1Matt Friedman2015-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13439
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-041-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3249 from VSEphpbb/ticket/13440Marc Alexander2015-01-041-0/+13
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / [ticket/13440] Add event core.login_box_failed
| | * | [ticket/13440] Add event core.login_box_failedMatt Friedman2015-01-031-0/+13
| | | | | | | | | | | | | | | | PHPBB3-13440
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-041-0/+15
|\ \ \ \ | |/ / /
| * | | [ticket/13439] Add event core.acp_users_overview_beforeMatt Friedman2015-01-031-0/+15
| |/ / | | | | | | | | | PHPBB3-13439
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-031-0/+1
|\ \ \ | |/ /
| * | [ticket/13441] Functions_convert fails to set global moderators default groupGaëtan Muller2015-01-031-0/+1
| | | | | | | | | | | | PHPBB3-13441
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-20/+53
|\ \ \ | |/ /
| * | [ticket/13312] Use empty for usernames arrayOliver Schramm2014-11-261-2/+2
| | | | | | | | | | | | PHPBB3-13312
| * | [ticket/13312] Add event core.acp_email_send_beforeOliver Schramm2014-11-261-19/+52
| |/ | | | | | | PHPBB3-13312
* | [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-062-2/+2
| | | | | | | | PHPBB3-13421
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-251-23/+5
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-251-1/+1
| |
| * Merge branch 'develop-olympus' into prep-release-3.1.2Joas Schilling2014-11-251-23/+5
| |\
| | * [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3Nils Adermann2014-11-251-23/+5
| | | | | | | | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376
| | * Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\ | | | | | | | | | | | | Ticket/13234
| | | * [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13234
| | | * [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
| | |/ | | | | | | | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234
| * | [prep-release-3.1.2] Increase version number to 3.1.2Joas Schilling2014-11-241-1/+1
| | |
| * | [prep-release-3.1.2] Update version to 3.1.2-RC1Joas Schilling2014-11-221-1/+1
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-57/+10
|\ \ \ | |/ /
| * | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-222-57/+10
| |\ \ | | | | | | | | | | | | [ticket/13358] Add class for retrieving remote file data
| | * | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358
| | * | [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-211-4/+6
| | | | | | | | | | | | | | | | PHPBB3-13358
| | * | [ticket/13358] Use file_downloader in get_remote_file()Marc Alexander2014-11-211-57/+8
| | | | | | | | | | | | | | | | | | | | | | | | get_remote_file() has been marked as deprecated. PHPBB3-13358