aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | [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
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-7/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3123 from Elsensee/ticket/13310Joas Schilling2014-11-221-7/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13310] Add event core.acp_email_modify_sql
| | * | | | | [ticket/13310] Add event core.acp_email_modify_sqlOliver Schramm2014-11-091-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310
| | * | | | | [ticket/13310] Always use sql_build_query in acp_email.phpOliver Schramm2014-11-091-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-11/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3116 from rxu/ticket/13297Joas Schilling2014-11-222-11/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns
| | * | | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns.rxu2014-11-092-11/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13297
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3158 from prototech/ticket/13354Joas Schilling2014-11-221-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs.
| | * | | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs.Cesar G2014-11-211-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13354
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-221-2/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/10744] Fix some doc blocksJoas Schilling2014-11-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744
| * | | | | | [ticket/10744] Type hint objects for IDE usagesJoas Schilling2014-11-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744
| * | | | | | [ticket/10744] Prevent installing styles with reserved namesJoas Schilling2014-11-211-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10744
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html
| * | | | | Merge pull request #3044 from Elsensee/ticket/13100Joas Schilling2014-11-211-2/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topic
| | * | | | | [ticket/13100] Remove pointless variableOliver Schramm2014-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100
| | * | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topicOliver Schramm2014-10-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-12/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #2765 from Elsensee/ticket/11863Joas Schilling2014-11-212-12/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11863] Set require_activation to none if emails are disabled
| | * | | | | | [ticket/11863] Display warning to user because of activation methodOliver Schramm2014-10-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11863
| | * | | | | | [ticket/11863] Grey out unavailable activation methods when emails disabledOliver Schramm2014-10-172-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further fall back to USER_ACTIVATION_DISABLE when emails are disabled but evaluate it at runtime. PHPBB3-11863
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3131 from omniError/ticket/13328Joas Schilling2014-11-211-0/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sql
| | * | | | | | | [ticket/13328] fix CSomniError2014-11-111-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
| | * | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sqlomniError2014-11-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /