aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 testsmarcosbc2014-05-091-2/+1
| | | | 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-032-7/+2
| | | | | | | 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-032-6/+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-032-2/+11
| | | | | | | | | | | | | | | 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 #2267 from prototech/ticket/10737Joas Schilling2014-05-0312-21/+438
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Remove loading indicator.Cesar G2014-04-231-1/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-232-0/+8
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-236-3/+33
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add loading indicator and alert box code to simple_footer.html.Cesar G2014-04-231-0/+14
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Load core.js and ajax.js in simple_footer.html.Cesar G2014-04-231-0/+2
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Set the username as the input value instead of redirecting.Cesar G2014-04-232-6/+7
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Drop subsilver2 changes.Cesar G2014-04-232-17/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add a more generic live search implementation.Cesar G2014-04-232-62/+335
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Clean up memberlist.php.Cesar G2014-04-231-11/+20
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Use dropdown for search results container.Cesar G2014-04-233-19/+17
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Adding delayed keyup and removing target_blank.Suhaib Khan2014-04-233-28/+39
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Using UTF-8 aware alternatives in PHP code.Suhaib Khan2014-04-231-3/+3
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Removing obsolete code.Suhaib Khan2014-04-234-12/+8
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Avoid hard-coding table row and use case-insensitive search.Suhaib Khan2014-04-235-13/+36
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Removing unnecessary/obsolete code.Suhaib Khan2014-04-231-2/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Using JQuery events and JSON response.Suhaib Khan2014-04-234-50/+33
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Code fixes in AJAX search featureSuhaib Khan2014-04-233-33/+32
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Improvements over last commitSuhaib Khan2014-04-233-68/+28
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Adding username suggestions in "Find a member" using AJAXSuhaib Khan2014-04-235-5/+132
| | | | | | | | PHPBB3-10737
* | Merge pull request #2375 from nickvergessen/ticket/12470Andreas Fischer2014-05-034-13/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12470 Move commands from .travis.yml to separate files to allow reusing * nickvergessen/ticket/12470: [ticket/12470] Correctly set up the php extensions [ticket/12470] Fix setup of phpbb [ticket/12470] Move setup of phpBB to new .sh [ticket/12470] Move setup of database to new .sh [ticket/12470] Move phing sniff into new .sh
| * | [ticket/12470] Correctly set up the php extensionsJoas Schilling2014-05-031-2/+2
| | | | | | | | | | | | PHPBB3-12470
| * | [ticket/12470] Fix setup of phpbbJoas Schilling2014-05-032-3/+3
| | | | | | | | | | | | PHPBB3-12470
| * | [ticket/12470] Move setup of phpBB to new .shJoas Schilling2014-05-032-6/+30
| | | | | | | | | | | | PHPBB3-12470
| * | [ticket/12470] Move setup of database to new .shJoas Schilling2014-05-032-4/+27
| | | | | | | | | | | | PHPBB3-12470
| * | [ticket/12470] Move phing sniff into new .shJoas Schilling2014-05-032-3/+18
|/ / | | | | | | PHPBB3-12470
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-037-25/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12485] Broken tests due to absolute exclude Conflicts: .travis.yml phpunit.xml.all phpunit.xml.dist phpunit.xml.functional
| * \ Merge pull request #2396 from Nicofuma/ticket/12485Joas Schilling2014-05-038-17/+61
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12485] Broken tests due to absolute 'exclude' * Nicofuma/ticket/12485: [ticket/12485] Broken tests due to absolute exclude
| | * | [ticket/12485] Broken tests due to absolute excludeNicofuma2014-05-038-17/+61
| |/ / | | | | | | | | | PHPBB3-12485
* | | Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeusCesar G2014-05-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10521: [ticket/10521] Fix broken tests using set_cookie
| * | | [ticket/10521] Fix broken tests using set_cookieMatt Friedman2014-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10521
* | | | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * github-vse/ticket/10521: [ticket/10521] Update docblock of set_cookie for new HttpOnly param
| * | | [ticket/10521] Update docblock of set_cookie for new HttpOnly paramMatt Friedman2014-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10521
* | | | Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into ↵Nils Adermann2014-05-031-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-bantu/ticket/12429-ascraeus: [ticket/12429] Can not insert into more columns than exist.
| * | | | [ticket/12429] Can not insert into more columns than exist.Andreas Fischer2014-05-031-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12429
* | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-031-9/+47
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| * | | | Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympusNils Adermann2014-05-031-9/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11860: [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| | * | | | [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.Andreas Fischer2013-09-231-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11860