aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / /
| * | | | 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/12620] Remove the old includes/functions_url_matcher.php fileTristan Darricau2014-11-211-102/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Use the right environment while installingTristan Darricau2014-11-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-202-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Fix coding styleTristan Darricau2014-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Use the container to get the environment nameTristan Darricau2014-11-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Uses a cache directory per environmentTristan Darricau2014-11-201-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Fix download/file.php and app.php outside of the root_pathTristan Darricau2014-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Add support of the environments for the ext routing filesTristan Darricau2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Use PHPBB_ENVIRONMENTTristan Darricau2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Rename productive to productionTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Fix functional testsTristan Darricau2014-11-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Rename debug to developmentTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 15:28:12 +0000