Joas Schilling 8c6a1e50f5 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 ... * '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		2013-02-25 21:03:34 +01:00
..
attachments.php	Merge branch 'develop-olympus' into develop	2012-05-31 11:55:12 +02:00
ban.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
board.php	[ticket/10771] fix remember me language	2012-12-02 15:40:25 +05:30
bots.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
common.php	[ticket/11088] Changed "file extensions" to "attachment extensions"	2012-12-12 19:36:52 -05:00
database.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
email.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
extensions.php	[ticket/10631] Use exceptions for errors. Build action list dynamically.	2012-09-01 15:05:34 +01:00
forums.php	[ticket/10650] Changed acp option from per forum to global	2012-04-08 10:34:44 +05:30
groups.php	[ticket/10411] Use template loops instead of defining the html in php files	2013-02-25 20:24:11 +01:00
index.htm	some bugfixes	2006-10-26 10:58:58 +00:00
language.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
modules.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
permissions.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
permissions_phpbb.php	[ticket/10679] Add new permission for changing profile field information	2012-12-06 15:10:29 +01:00
posting.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
profile.php	Merge branch 'develop-olympus' into develop	2012-07-23 15:50:54 +02:00
prune.php	Merge remote-tracking branch 'upstream/develop' into feature/prune-users	2012-11-06 11:11:27 -05:00
search.php	[feature/sphinx-fulltext-search] use 9312 as default port	2012-07-27 11:10:04 +05:30
styles.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
users.php	Merge branch 'develop-olympus' into develop	2012-07-21 16:15:42 +02:00