aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | [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 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 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
* | | | | | | | | | | [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
* | | | | | | | Merge pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-081-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12451] Split lang vars in posting.php for plurals * Elsensee/ticket/12451: [ticket/12451] Remove duplicated lang var [ticket/12451] Use new line to concatenate strings [ticket/12451] Split TOO_MANY_CHARS vars for plurals [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
| * | | | | | | | [ticket/12451] Remove duplicated lang varOliver Schramm2014-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| * | | | | | | | [ticket/12451] Use new line to concatenate stringsOliver Schramm2014-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| * | | | | | | | [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| * | | | | | | | [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-031-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
* | | | | | | | Merge pull request #2419 from prototech/ticket/12510Joas Schilling2014-05-081-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12510] Convert & to &amp; in build_url() when no params are stripped. * prototech/ticket/12510: [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
| * | | | | | | | [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.Cesar G2014-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12510
* | | | | | | | | Merge pull request #2421 from n-aleha/ticket/12493Joas Schilling2014-05-081-8/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12493] Fix sql query for selection of users that have disabled PM * n-aleha/ticket/12493: [ticket/12493] Add functional test [ticket/12493] Fix sql query for selection of users that have disabled PM
| * | | | | | | | | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* | | | | | | | | Merge pull request #2413 from prototech/ticket/12357Joas Schilling2014-05-071-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12357] Support routes in generate_smilies() function. * prototech/ticket/12357: [ticket/12357] Support routes in generate_smilies() function.
| * | | | | | | | [ticket/12357] Support routes in generate_smilies() function.Cesar G2014-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12357
* | | | | | | | | Merge pull request #2397 from Nicofuma/ticket/11497Joas Schilling2014-05-061-10/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11497] Remove 'ext.finder' from services' list * Nicofuma/ticket/11497: [ticket/11497] Rename set_ext_finder in find_routing_files [ticket/11497] Change the date in the package declaration [ticket/11497] Fix pagination tests [ticket/11497] Use a mock object to define the root folder for the finder [ticket/11497] Generate the list of the routes in controller_helper [ticket/11497] Fix the path for the finder in controller_provider [ticket/11497] Fix tests [ticket/11497] Update pagination test [ticket/11497] Remove 'ext.finder' from services' list
| * | | | | | | | | [ticket/11497] Rename set_ext_finder in find_routing_filesTristan Darricau2014-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11497
| * | | | | | | | | [ticket/11497] Remove 'ext.finder' from services' listNicofuma2014-05-031-10/+12
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11497
* | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeusCesar G2014-05-051-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12332: [ticket/12332] Add missing semicolon to inline styling [ticket/12332] Adjust size of mark column where too wide [ticket/12332] Adjust column widths for responsive changes [ticket/12332] Restore some changes back to original state [ticket/12332] Add break-word to fixed width table CSS [ticket/12332] Accomplish all word creaking in template and CSS [ticket/12332] Remove width sizing, as it is already set [ticket/12332] Fix displaying attachments with long file names
| * | | | | | | | [ticket/12332] Restore some changes back to original stateMatt Friedman2014-04-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12332
| * | | | | | | | [ticket/12332] Accomplish all word creaking in template and CSSMatt Friedman2014-04-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12332
| * | | | | | | | [ticket/12332] Fix displaying attachments with long file namesMatt Friedman2014-04-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12332
* | | | | | | | | [ticket/12491] Fix clashing USERNAME_FULL template variable.Cesar G2014-05-041-3/+3
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user notes and user warn pages have a variable with the same name. PHPBB3-12491
* | | | | | | | [prep-release-3.1.0-b3] Update phpBB Version for b4 developmentJoas Schilling2014-05-041-1/+1
| | | | | | | |
* | | | | | | | [prep-release-3.1.0-b3] Update version to 3.1.0-b3Joas Schilling2014-05-041-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX
| * | | | | | [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10737