aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | [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 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 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 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 pull request #3114 from rxu/ticket/13294Joas Schilling2014-11-211-1/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13294] Add function parse() core event for additional message checks
| * | | | | | | | [ticket/13294] Add function parse() core event for additional message checksrxu2014-11-201-1/+44
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function parse() in includes/message_parser.php to allow additional handling message before parsing (i.e. perform custom message checks, cleanup etc.). PHPBB3-13294
* | | | | | | | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13298
* | | | | | | | [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for usernames with UTF-8 characters. PHPBB3-13318
* | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-092-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13300
* | | | | | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-024-8/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | | | [ticket/13248] Always use provider collection for getting providerMarc Alexander2014-11-013-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| * | | | | | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-011-1/+1
| | | | | | |
* | | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-281-2/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasksNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13232
* | | | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13229] Fix overloading memberlist with redundant SQL queries
| * | | | | | | [ticket/13229] Fix overloading memberlist with redundant SQL queriesrxu2014-10-271-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13229
* | | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
| * | | | | | [ticket/13230] Add missing globals and missing request object for path helperJoas Schilling2014-10-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13230
* | | | | | | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
| * | | | | | | [ticket/13193] Swap ternary condition membersJakub Senko2014-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| * | | | | | | [ticket/13193] Add load_search config checkJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| * | | | | | | [ticket/13193] Add link to post count in PMsJakub Senko2014-10-211-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13193
* | | | | | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-251-1/+1
| |/ / / / / |/| | | | |
* | | | | | [ticket/13207] Move default user notifications settings to user_add()Marc Alexander2014-10-252-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13207
* | | | | | [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-252-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13207
* | | | | | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-231-1/+1
| | | | | |
* | | | | | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-231-1/+1
| | | | | |
* | | | | | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-231-1/+1
| | | | | |
* | | | | | Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/security-161] Add form token to styles management form.
| * | | | | | [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-161
* | | | | | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-222-1/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders
| * | | | | | | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| * | | | | | | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| * | | | | | | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-222-1/+42
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13205
* | | | | | | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | SECURITY-159
* | | | | | Merge pull request #3053 from Senky/ticket/13194Marc Alexander2014-10-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13194] BBCode isn't parsed when issuing a warning for a post
| * | | | | | [ticket/13194] Use correct array to access bbcode_bitfieldJakub Senko2014-10-211-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-13194
* | | | | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | * develop-olympus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * | | | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| | * | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13168