aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-1/+21
|\ | | | | | | | | | | | | * develop-ascraeus: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
| * Merge pull request #2429 from Nicofuma/ticket/12074Joas Schilling2014-05-261-1/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12074] Managing extensions doesn't produce any log entry * Nicofuma/ticket/12074: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
| | * [ticket/12074] Don't log errorsTristan Darricau2014-05-091-12/+0
| | | | | | | | | | | | PHPBB3-12074
| | * [ticket/12074] Managing extensions doesn't produce any log entryTristan Darricau2014-05-091-1/+33
| | | | | | | | | | | | PHPBB3-12074
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+56
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/12583] Redirect only on non-empty $message [ticket/12583] Add event core.mcp_warn_post_before/after
| * | Merge pull request #2487 from n-aleha/ticket/12583Joas Schilling2014-05-261-7/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12583] Add event core.mcp_warn_post_before/after * n-aleha/ticket/12583: [ticket/12583] Redirect only on non-empty $message [ticket/12583] Add event core.mcp_warn_post_before/after
| | * | [ticket/12583] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | | | | | PHPBB3-12583
| | * | [ticket/12583] Add event core.mcp_warn_post_before/aftern-aleha2014-05-231-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | Event for when warning a user for a post. PHPBB3-12583
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12584] Redirect only on non-empty $message [ticket/12584] Add event core.mcp_warn_user_before/after
| * | | Merge pull request #2488 from n-aleha/ticket/12584Joas Schilling2014-05-261-7/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12584] Add event core.mcp_warn_user_before/after * n-aleha/ticket/12584: [ticket/12584] Redirect only on non-empty $message [ticket/12584] Add event core.mcp_warn_user_before/after
| | * | | [ticket/12584] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12584
| | * | | [ticket/12584] Add event core.mcp_warn_user_before/aftern-aleha2014-05-251-5/+46
| | |/ / | | | | | | | | | | | | | | | | | | | | Event for when warning a user from MCP. PHPBB3-12584
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-24/+58
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12270] Fixed topic counting bug and tests [ticket/12270] Fixed tests not working [ticket/12270] No quote notif and double poster notification fix [ticket/12270] Fixed tests [ticket/12270] Fixed rebase conflicts [ticket/12270] Correct confirm approval message for topics [ticket/12270] Correcting to follow phpBB coding standards [ticket/12270] Better structured code and no debug error message [ticket/12270] Correct notifications for posts/topics now working [ticket/12270] Reverted templates [ticket/12270] Correct post&topic approval msg, no template changes [ticket/12270] Corrent post and topic approval notification message
| * | | Merge pull request #2134 from marcosbc/ticket/12270Joas Schilling2014-05-261-24/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12270] Current post and topic approval notification message * marcosbc/ticket/12270: [ticket/12270] Fixed topic counting bug and tests [ticket/12270] Fixed tests not working [ticket/12270] No quote notif and double poster notification fix [ticket/12270] Fixed tests [ticket/12270] Fixed rebase conflicts [ticket/12270] Correct confirm approval message for topics [ticket/12270] Correcting to follow phpBB coding standards [ticket/12270] Better structured code and no debug error message [ticket/12270] Correct notifications for posts/topics now working [ticket/12270] Reverted templates [ticket/12270] Correct post&topic approval msg, no template changes [ticket/12270] Corrent post and topic approval notification message
| | * | | [ticket/12270] Fixed topic counting bug and testsmarcosbc2014-05-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topics was not correctly counted (the counter didn't count topics that were re-approved, for example, but only the ones that were unapproved. This should also fix the test that wasn't working correctly. PHPBB3-12270
| | * | | [ticket/12270] Fixed tests not workingmarcosbc2014-05-211-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The success message wasn't output correctly if we were approving topics. PHPBB3-12270
| | * | | [ticket/12270] No quote notif and double poster notification fixmarcosbc2014-05-101-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a call was added to self::approve_topic(), the poster would get double-notified about it (even if it was later marked as read). Also, when creating a new topic with a quote, it would not be notified, this has also been fixed. PHPBB3-12270
| | * | | [ticket/12270] Fixed rebase conflictsmarcosbc2014-05-031-21/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-12270
| | * | | [ticket/12270] Correct confirm approval message for topicsmarcosbc2014-05-031-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on approving a topic's first post in the MCP to approve the topic itself, the confirm box dialog asks whether to approve the post or not, instead of asking to approve the topic. To achieve this fix, we just need to count the topics to be approved and check if it's greater than zero. PHPBB3-12270
| | * | | [ticket/12270] Correcting to follow phpBB coding standardsmarcosbc2014-05-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot to put the brackets (so it follows the phpBB coding standards) and changed "count($topic_id_list) > 0" to "!empty($topic_id_list)", making the syntax more comprehensible. PHPBB3-12270
| | * | | [ticket/12270] Better structured code and no debug error messagemarcosbc2014-05-031-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A variable (that's not essential) has been removed, two if's has been merged to an if-else control structure. A variable named topic_ids_list has been renamed to topic_id_list to follow the naming standard in that file's code. Also, the debug error has been fixed by changing the topic data key 'username' to 'post_username' in the array_merge function in approve_topics(). PHPBB3-12270
| | * | | [ticket/12270] Correct notifications for posts/topics now workingmarcosbc2014-05-031-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should finally work correctly: Add the correct notification for post/topic approval without touching templates. This has been done by calling the function approve_topics() inside the approve_posts() function. It's the simplest way for this to work correctly. There may be a call to the DB but other ways (if any), without touching templates, would have been too messy for a function like this. PHPBB3-12270
| | * | | [ticket/12270] Reverted templatesmarcosbc2014-05-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some lines in the templates were not reverted correctly, so it's done now. PHPBB3-12270
| | * | | [ticket/12270] Correct post&topic approval msg, no template changesmarcosbc2014-05-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the previous commits, this patch removes the changes done to templates to depend only on code, as suggested by @nickvergessen. All previous modifications have been removed, with another one which checks, in the approve_posts() function, if it is sending a notification for post approval and it is the first one in the topic, send notification indicating that the topic has been approved (and not the post). If not the first post in the topic, do just as before (send a notification about a newly approved post). PHPBB3-12270
| | * | | [ticket/12270] Corrent post and topic approval notification messagemarcosbc2014-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you submit a post with needed approval (say user A), and then it gets approved by another user (user B), a subscribed user (user C) to that forum would receive a notification indicating: -A has replied to topic 'New Topic' in the forum 'xyz'. The expected result would be: -A has posted a new topic 'New topic' in the forum 'xyz'. This has fixed by adding a TOPIC_ID template variable to mcp_post.html and, in there, depending if the first post is the topic's first post or not, add a input's with name topic_id_list[] or post_id_list[] and then the respective value (TOPIC_ID or POST_ID). PHPBB3-12270
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-241-10/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12275] Change if (empty) to if (!isset) [ticket/12275] Fix a bug on the event "core.modify_username_string"
| * | | | Merge pull request #2199 from Zoddo/ticket/12275Joas Schilling2014-05-241-10/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12275] Fix a bug on the event "core.modify_username_string" * Zoddo/ticket/12275: [ticket/12275] Change if (empty) to if (!isset) [ticket/12275] Fix a bug on the event "core.modify_username_string"
| | * | | | [ticket/12275] Change if (empty) to if (!isset)Zoddo2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12275
| | * | | | [ticket/12275] Fix a bug on the event "core.modify_username_string"Zoddo2014-04-011-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the event "core.modify_username_string" also if $mode is "colour", "username" or "profile". PHPBB3-12275
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-241-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12585] Use a 5 minutes interval instead of 10 minutes [ticket/12585] Don't check the cron on each page load
| * | | | | Merge pull request #2490 from Nicofuma/ticket/12585Andreas Fischer2014-05-241-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12585] Don't check the cron on each page load * Nicofuma/ticket/12585: [ticket/12585] Use a 5 minutes interval instead of 10 minutes [ticket/12585] Don't check the cron on each page load
| | * | | | | [ticket/12585] Use a 5 minutes interval instead of 10 minutesTristan Darricau2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12585
| | * | | | | [ticket/12585] Don't check the cron on each page loadTristan Darricau2014-05-221-1/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-12585
* | | | | | Merge pull request #2478 from VSEphpbb/ticket/12564Andreas Fischer2014-05-2349-49/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12564] Remove version definition from ACP/MCP/UCP module info files * VSEphpbb/ticket/12564: [ticket/12564] Remove version definitions from modules in tests [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
| * | | | | [ticket/12564] Remove version definition from ACP/MCP/UCP module info filesMatt Friedman2014-05-1849-49/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12564
* | | | | [ticket/12576] Remove cron from common.phpTristan Darricau2014-05-221-1/+2
|/ / / / | | | | | | | | | | | | PHPBB3-12576
* | | | Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeusCesar G2014-05-162-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * n-aleha/ticket/12547: [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
| * | | | [ticket/12547] Rename jquery.js to jquery.min.js in assets directoryn-aleha2014-05-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpBB uses the minified version of jQuery hence the rename. PHPBB3-12547
* | | | | [ticket/12433] Use a different message when nesting of quotes is not allowedJoas Schilling2014-05-151-2/+10
|/ / / / | | | | | | | | | | | | PHPBB3-12433
* | | | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12526
* | | | Merge pull request #2412 from prototech/ticket/12501Joas Schilling2014-05-111-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12501] Fix improper display of inline attachments in post report page * prototech/ticket/12501: [ticket/12501] Only select attachments uploaded before the post was reported. [ticket/12501] Parse the reported post message before its attachments.
| * | | | [ticket/12501] Only select attachments uploaded before the post was reported.Cesar G2014-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The post text displayed to the user is the same as when it was reported, even if the post was edited afterwards, thus it follows that the attachments would be the same. This also addresses an issue where the index in the attachment bbcode no longer matches that of its corresponding attachment when new attachments are uploaded after the post is reported. PHPBB3-12501
| * | | | [ticket/12501] Parse the reported post message before its attachments.Cesar G2014-05-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the empty lines from attachment.html aren't converted into <br />. PHPBB3-12501
* | | | | Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-113-7/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9388] Only display the settings for the selected method in the auth and search ACP pages. * prototech/ticket/9388: [ticket/9388] Use "togglable" instead of "toggable" [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings. [ticket/9388] Reopen <fieldset> after auth templates. [ticket/9388] Fix unit tests. [ticket/9388] Use the new toggle function for the avatar type <select>. [ticket/9388] Display only the settings for the selected search backend. [ticket/9388] Display only the settings for the auth method that's selected. [ticket/9388] Add support for making <select> options able to toggle settings.
| * | | | | [ticket/9388] Use "togglable" instead of "toggable"Cesar G2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Display only the settings for the selected search backend.Cesar G2014-05-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Add support for making <select> options able to toggle settings.Cesar G2014-05-081-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-9388
* | | | | [ticket/12476] Increase assets also from acp_styles and phpbbclin-aleha2014-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli PHPBB3-12476
* | | | | [ticket/12476] Increase asset version on cache purgen-aleha2014-05-091-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Increace the asset version when purging the cache from "ACP > General" PHPBB3-12476
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:05:09 +0000