aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/controller
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-02-25 16:04:22 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-02-25 16:04:22 +0100
commitc2974187e53e1da2516075581b854a6dc3a95a6f (patch)
tree90e3bcb580d2f512146993d8b42d96142e26d920 /phpBB/includes/controller
parentc1b4cdb1883bb6771a303624ece131eb5c7f071d (diff)
parent558ecdcd40fb13bb264839c210996c47e3e81bcb (diff)
downloadforums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar
forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.gz
forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.bz2
forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.xz
forums-c2974187e53e1da2516075581b854a6dc3a95a6f.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (119 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/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search ... Conflicts: phpBB/config/tables.yml
Diffstat (limited to 'phpBB/includes/controller')
0 files changed, 0 insertions, 0 deletions