aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-0/+2
|\
| * [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
| | | | | | | | PHPBB3-13298
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ | |/
| * [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
* | Merge pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-118-2175/+96
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback * nicolas-grekas/develop: [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback [feature/patchwork-utf8] Remove utf8_str_replace [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
| * | [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-516/+64
| | |
| * | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-081-47/+0
| | |
| * | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-088-1612/+32
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-092-3/+3
|\ \ \ | |/ / |/| / | |/
| * [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-092-3/+3
| | | | | | | | PHPBB3-13300
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-024-7/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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 phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/memberlist_email.html
| * 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 'develop-ascraeus' into developJoas Schilling2014-10-281-2/+2
|\ \ \ | |/ /
| * | 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 'develop-ascraeus' into developNils Adermann2014-10-271-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13229] Fix overloading memberlist with redundant SQL queries
| * | | 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 'develop-ascraeus' into developNils Adermann2014-10-271-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-ascraeus: [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
| * | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-10-261-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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
| * | 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
| | |/ | |/|
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-1/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
| * | [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
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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.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 branch 'develop-ascraeus' into developJoas Schilling2014-10-231-5/+14
|\ \ \ | |/ /
| * | 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 branch 'develop-ascraeus' into developMarc Alexander2014-10-222-1/+41
|\ \ \ \ | |/ / /
| * | | 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
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-221-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/security-159] Only show first 8 characters of login keys in UCP
| * | | | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
| |/ / / | | | | | | | | | | | | SECURITY-159
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-1/+1
|\ \ \ \ | |/ / /
| * | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 13:05:54 +0000