* 'develop' of https://github.com/phpbb/phpbb3: (497 commits)
[ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
[ticket/11358] Changed the name of post parameter.
[ticket/11358] Changed the action parameter value to represent the link.
[ticket/11358] Enabled link making all users default for a group.
[ticket/11358] Removed redundant code and referred proper variable.
[ticket/11358] Success message even without selecting a user.
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
[ticket/10896] Add missing email validation lost in develop merge
[ticket/7262] Add note about set_config() not updating is_dynamic.
[ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
[ticket/7262] Backport set_config() and set_config_count() docs from develop.
[ticket/11122] Move rxu to 'Former Contributors' section.
[ticket/11122] Add EXreaction to docs/AUTHORS.
[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
[ticket/11361] Make sure that array passed to strtr() has the proper format.
[ticket/11342] Fix "unexpected token" syntax error
[ticket/11179] remove extra & in function call
[ticket/11179] correct start parameter in sphinx search
[ticket/11179] correct start parameter in native author search
...
Conflicts:
phpBB/config/services.yml
phpBB/includes/functions_user.php
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
* develop-olympus:
[ticket/11358] Changed the name of post parameter.
[ticket/11358] Changed the action parameter value to represent the link.
[ticket/11358] Enabled link making all users default for a group.
[ticket/11358] Removed redundant code and referred proper variable.
[ticket/11358] Success message even without selecting a user.
Replaced the parameter name 'defaultbylink' to a meaningful name
'set_default_on_all'. Parameter is used for making all users
default for selected group in acp_groups.php.
PHPBB3-11358
Changed the action parameter value to recognize whether 'Make default
group for every member' is clicked. If so execute a seperate code block
under switch statement for $action and add all the users as default
for the group.
PHPBB3-11358
Detect whether link is clicked or form is posted for making users
default for a group. If form is posted and no users are selected,
validation happens and displays an error message. When the link is
clicked, all the users will be default users for that group.
PHPBB3-11358
Error was thrown when no users are selected before executing the code
chunk which manually adds all the user to make the group default.
Removed this code and referred $mark_ary instead of $name_ary which
will not have selected user ids.
PHPBB3-11358
In group membership management, if you perform the action
'Make group default for member' without selecting any user,
a confirm box will be displayed and will show a success
message after confirming. Added a new condition to fix this
issue in acp_groups.php. It will check weather any users are
selected before performing above action.
PHPBB3-11358
* develop-olympus:
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
Conflicts:
phpBB/includes/acp/acp_groups.php
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.
PHPBB3-11355
* Fyorl/ticket/10939:
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10939] Added tests for phpbb_request::file
[ticket/10939] Modified the default return for $request->file
[ticket/10939] Modified fileupload tests to deal with new behaviour
[ticket/10939] Modified mock request class to handle deactivated $_FILES
[ticket/10939] Modified acp_groups.php to not use $_FILES
[ticket/10939] Modified ucp_groups.php to not use $_FILES
[ticket/10939] Modified functions_user.php to not use $_FILES
[ticket/10939] Modified message_parser.php to not use $_FILES
[ticket/10939] Modified functions_upload to not use $_FILES
[ticket/10939] Modified request test slightly to include $_FILES
[ticket/10939] Added $_FILES handling to phpbb_request
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.
PHPBB3-10345
The code in acp_groups.php removes unchanged attributes from the
group_attributes array, to prevent issues with reapplying avatar/rank and more.
This code causes problems with the new teampage/legend feature, because when
the attribute is not set, the group is removed from the feature. Therefore I
added an array with the keys that need to be set, when calling the function.
PHPBB3-10300
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.
PHPBB3-9519
- Changed behaviour of group_create() function to support specifying additional group columns
- New groups option to excempt group leaders from group permissions
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 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
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
-Route all avatar downloads through download.php - adrien
-Change the way inline attachments are delivered
-Fixes a few (unreported) bugs, notably avatar upload during group generation
-#10079
git-svn-id: file:///svn/phpbb/trunk@7429 89ea8834-ac86-4346-8a33-228a782c2dd0
