aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-029-4/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/feature/sqlite3: [feature/sqlite3] Add sqlite3 database to .gitignore [feature/sqlite3] Use SQLite3 by default [feature/sqlite3] Remove invalid comment [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries [feature/sqlite3] Correctly recreate indexes when recreating a table [feature/sqlite3] Fix sql_index_drop() for sqlite3 [feature/sqlite3] Remove trailing comma from column list [feature/sqlite3] Update docblocks and function visibility [feature/sqlite3] Add support for SQLite 3
| * | | | | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-029-4/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728
* | | | | | | Merge remote-tracking branch 'github-prototech/ticket/11508' into ↵Nils Adermann2014-05-022-61/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/11508: [ticket/11508] Fix build_url test. [ticket/11508] Add functional test for jumpbox. [ticket/11508] Use $phpbb_path_helper. [ticket/11508] Allow equal sign in parameter value. [ticket/11508] Remove unnecessary implode. [ticket/11508] Remove unnecessary isset check. [ticket/11508] Fix build_url test. [ticket/11508] Curly brace should be on its own line... [ticket/11508] The question mark is expected even if there are no parameters. [ticket/11508] Add tests. [ticket/11508] Do not add the '?' unless there are parameters. [ticket/11508] Change separator parameter to a simple true|false $is_amp. [ticket/11508] Move helper functions to path_helper class. [ticket/11508] Move the stripping param code to separate function as well. [ticket/11508] Build the jumpbox hidden fields using the _form action_ [ticket/11508] Split parts of build_url() into reusable functions.
| * | | | | | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-222-118/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] Move the stripping param code to separate function as well.Cesar G2014-04-221-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] Build the jumpbox hidden fields using the _form action_Cesar G2014-04-222-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | | [ticket/11508] Split parts of build_url() into reusable functions.Cesar G2014-04-221-28/+72
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-11508
* | | | | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-023-23/+95
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * | | | | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05182-35340/+7624
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
| * | | | | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | [ticket/8323] CommentsNathan Guse2012-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | [ticket/8323] Comments for inactive reasons in constants.phpNathan Guse2012-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from language output PHPBB3-8323
| * | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-07159-1838/+10243
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-102-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | | | | | [ticket/8323] Allow temporarily banned users to receive PMs, but not a ↵Nathan2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification PHPBB3-8323
| * | | | | | | [ticket/8323] Correct PM notification settings (only notify those who can ↵Nathan2012-07-102-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive them) Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense) PHPBB3-8323
| * | | | | | | [ticket/8323] Allow sending PMs to temporarily banned usersNathan2012-07-103-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time) PHPBB3-8323
| * | | | | | | [ticket/8323] Do not allow sending PMs to Inactive usersNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | | [ticket/8323] Correcting the commentNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | | [ticket/8323] Remove code used for testingNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | | | | | [ticket/8558] htmlspecialchars_decode the contact name for emailsNils Adermann2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into ↵Nils Adermann2014-05-022-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
| * | | | | | | | [ticket/8558] Fix operatorOliver Schramm2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
| * | | | | | | | [ticket/8558] Fix field length in ACPOliver Schramm2014-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
| * | | | | | | | [ticket/8558] Use only one variable and improve explain stringOliver Schramm2014-04-171-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
| * | | | | | | | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-172-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558' into ↵Nils Adermann2014-05-021-2/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558: [ticket/8558] Do string concatenation only once and do htmlspecialchars [ticket/8558] Add display name in emails from board
| * | | | | | | | | [ticket/8558] Do string concatenation only once and do htmlspecialcharsOliver Schramm2014-04-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
| * | | | | | | | | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | | | | | Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeusNils Adermann2014-05-021-25/+65
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-rxu/ticket/12409: [ticket/12409] Add acp_users.php core events to modify users preferences data
| * | | | | | | | | | [ticket/12409] Add acp_users.php core events to modify users preferences datarxu2014-04-171-25/+65
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There're events to modify UCP user preferences in ucp_prefs.php, so it makes sense to add related events to acp_users.php to control new user's prefs via ACP. PHPBB3-12409
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-0216-62/+140
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * | | | | | | | | | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-2512-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | | | | | [ticket/12273] Update existing eventsJoas Schilling2014-04-256-17/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | | | | | [ticket/12273] Fix long $vars lines for existing eventsJoas Schilling2014-04-245-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | | | | | [ticket/12273] Fix missing $vars lineJoas Schilling2014-04-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | | | | | [ticket/12273] Fix invalid @event and @since tagsJoas Schilling2014-04-183-3/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-0212-59/+94
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12371: [ticket/12371] Fix language string [ticket/12371] Fix typos in comment [ticket/12371] Fix redirect link for approve_post and post_in_queue [ticket/12371] Delete the approve_post notification when editing a post [ticket/12371] Fix language in comment [ticket/12371] Reapprove the post and topic again in tests [ticket/12371] Correctly set is_starter when editing first post of the topic [ticket/12371] Add functional tests for reapproving [ticket/12371] Fix query in mcp_sorting() [ticket/12371] Rename disapprove and softdelete tests [ticket/12371] We do not group quote notifications anymore [ticket/12371] Fix SQL query [ticket/11772] Do not send out new topic/post notifications when reapproving [ticket/12052] Use different visibility when post was edited [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method [ticket/12371] Do not add unlimited users as responders [ticket/12371] Do not update the notification entry unneccessarily [ticket/12371] Do not delete post related notifications when a post is deleted [ticket/12371] Allow notification types to redirect to a different url [ticket/12371] Do not group "quote" notifications
| * | | | | | | | | | [ticket/12371] Delete the approve_post notification when editing a postJoas Schilling2014-04-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to delete the initial approve notification, so we can notify the user again, when his post got reapproved. PHPBB3-12371
| * | | | | | | | | | [ticket/12371] Correctly set is_starter when editing first post of the topicJoas Schilling2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | | | | | | | [ticket/12371] Fix SQL queryJoas Schilling2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | | | | | | | [ticket/11772] Do not send out new topic/post notifications when reapprovingJoas Schilling2014-04-251-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add notifications, if we are not reapproving post When the topic was already approved, but was edited and now needs re-approval, we don't want to notify the users again. PHPBB3-11772
| * | | | | | | | | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-2512-25/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052