| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
The success message wasn't output correctly if we were approving
topics.
PHPBB3-12270
|
| |
|
|
|
|
|
|
|
| |
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
|
| |
|
|
| |
PHPBB3-12270
|
| |
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
Some lines in the templates were not reverted correctly,
so it's done now.
PHPBB3-12270
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
[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
|
| | |
| |
| |
| | |
PHPBB3-10737
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* github-vse/ticket/12254:
[ticket/12254] Add subsilver2 support for cookie storage instead of SID
[ticket/12254] Use a cookie instead of SID to store language selection
[ticket/12254] No longer need to add change_lang to the URL params
[ticket/12254] Use 'language' instead of 'set_lang' as the variable name
[ticket/12254] Persist set_lang after reg only if changed from default
[ticket/12254] Add set_lang var changes to subsilver2 files
[ticket/12254] Use new set_lang var to avoid conflict with change_lang
[ticket/12254] Stop using deprecated request_var in user class
[ticket/12254] Better language switching on registration page
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| | | |
| | |
| | |
| | | |
PHPBB3-12254
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* github-bantu/ticket/12473:
[ticket/12473] Add console command for database migration.
[ticket/12473] Add more compatibility to phpBB Console Application.
[ticket/12473] Move compatibility globals out into its own file.
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12473
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
develop-ascraeus
* github-prototech/ticket/12265:
[ticket/12265] Actually use $u_pm.
[ticket/12265] Ensure that dropdown is always at the very left of the container
[ticket/12265] Define a loop for contact icons.
[ticket/12265] Break the icons that aren't in loop in case extensions add more
[ticket/12265] Fix modulo logic.
[ticket/12265] Adjust alignment of AIM and Jabber icons.
[ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
[ticket/12265] Add contact icon and remove border from last row & cells.
[ticket/12265] Fix issue with dropdown being restricted by the width of parent
[ticket/12265] Remove ugly logic.
[ticket/12265] Simplify contact icon design and move to dropdown.
Conflicts:
phpBB/viewtopic.php
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12265
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12265
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-9728
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |\ \ \ \ \ \
| |_|_|/ / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11508
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | | |
PHPBB3-11508
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# 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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-8323
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-8323
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Copied from language output
PHPBB3-8323
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
phpBB/viewtopic.php
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
notification
PHPBB3-8323
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-8323
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-8323
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-8323
|
