| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
* 3.1.x:
[ticket/10572] Unguarded includes in acp files
|
| |
| |
| |
| | |
PHPBB3-10572
|
| |
| |
| |
| |
| |
| | |
So now we can use translated group names for non-special groups
PHPBB3-12143
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
| |
| |
| |
| | |
PHPBB3-13823
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
This changes the line with non-whitespace changes, so the packaging script
should correctly detect them as changed and put the file into the update.
PHPBB3-13823
|
|\ \
| |/ |
|
| |
| |
| |
| | |
PHPBB3-13587
|
| |
| |
| |
| | |
PHPBB3-13455
|
|/
|
|
| |
PHPBB3-13468
|
|
|
|
| |
PHPBB3-13420
|
|
|
|
| |
PHPBB3-12446
|
|
|
|
| |
PHPBB3-12594
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
... and needs to be reapproved.
PHPBB3-12052
|
|/
|
|
|
|
|
|
|
| |
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
|
|
|
|
| |
PHPBB3-7707
|
|
|
|
| |
PHPBB3-12187
|
|
|
|
|
|
| |
Also fixed the empty option which is not allowed.
PHPBB3-12045
|
|
|
|
|
|
|
| |
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.
PHPBB3-11507
|
|
|
|
| |
PHPBB3-11507
|
|
|
|
|
|
| |
Only unapproved posts should be counted.
PHPBB3-11507
|
|
|
|
| |
PHPBB3-11507
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11236:
[ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language
[ticket/11236] Do not require group selection in prune users
[ticket/11236] Correct HTML
|
| |
| |
| |
| | |
PHPBB3-11236
|
| |
| |
| |
| | |
PHPBB3-11236
|
|/
|
|
|
|
| |
Also making the code a bit more efficient (removing one SQL query)
PHPBB3-11237
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
|
| |
| |
| |
| | |
PHPBB3-9916
|
| |
| |
| |
| | |
PHPBB3-9622
|
| |
| |
| |
| | |
PHPBB3-9622
|
| |
| |
| |
| | |
PHPBB3-9622
|
| |
| |
| |
| | |
PHPBB3-9622
|
| |
| |
| |
| | |
PHPBB3-9622
|
| |
| |
| |
| |
| |
| |
| | |
Removed unneeded hidden fields in confirmation page. Do not show group prune
dropdown if there are no groups, etc.
PHPBB3-9622
|
| |
| |
| |
| |
| |
| |
| | |
Adjust two language strings for ACP prune feature to include descriptions for
new features.
PHPBB3-9622
|
|/
|
|
|
|
|
|
|
| |
user_delete now uses fewer queries to delete a set of users of size > 1 by
accepting an array of users rather than a single user at a time. This required
changing the third parameter, however the function retains its former behavior
with the old-style parameters.
PHPBB3-9622
|
|
|
|
|
|
|
|
|
|
|
|
| |
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556
|
|
|
|
|
|
| |
The username textboxes were not being properly encoded in UTF8.
PHPBB3-9623
|
|
|
|
|
|
| |
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9754 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8453 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
gone through every javascript invocation and making sure we adhere to our coding guidelines.
git-svn-id: file:///svn/phpbb/trunk@8099 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7912 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7789 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
to adjust them for different DBMS as well as SQLite2 not supporting escaping characters in LIKE statements (which is a reason why we think about dropping sqlite support completely).
git-svn-id: file:///svn/phpbb/trunk@7788 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7749 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
| |
#10741
Confirm box on pruning forums - #10619
Not stripping empty lines on parsing messages - #10579
Remove reports alongside with users - #10501
git-svn-id: file:///svn/phpbb/trunk@7527 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
| |
much faster. sync() recalculates the number of topics and posts using just the topics table instead of having to join topics and posts together. However, even this can be avoided if we know what operation is happening and an auto sync is not in action. Since MCP operations are "known", we can provide very fast MCP operations.
- changed the way we decide if a DB gets multi value support. Old method uses switch/case, new method assumes a DB can't unless the DB says it can via a property
I hope nothing is broken :P
git-svn-id: file:///svn/phpbb/trunk@7466 89ea8834-ac86-4346-8a33-228a782c2dd0
|