Commit graph

20118 commits

Author SHA1 Message Date
rxu
378cfd6e16 [ticket/12278] Add mcp.php core event to allow to modify modules display option
This event allows extensions to set display option for custom MCP modules
for extensions which add custom MCP modules
and some of them should be displayed conditionally.

PHPBB3-12278
2014-03-17 23:28:51 +08:00
Joas Schilling
325931a56b Merge branch 'prep-release-3.1.0-b1' into develop
* prep-release-3.1.0-b1:
  [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev
  [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1
  [prep-release-3.1.0-b1] Prepare Changelog
  [prep-release-3.1.0-b1] Add migration for 3.1.0-b1
  [prep-release-3.1.0-b1] Update version to 3.1.0-b1
2014-03-15 17:32:48 +01:00
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
873b5686a1 [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1 2014-03-15 16:05:12 +01:00
Joas Schilling
f9c27ccd52 [prep-release-3.1.0-b1] Prepare Changelog 2014-03-15 15:37:22 +01:00
Joas Schilling
6159c3c738 [prep-release-3.1.0-b1] Add migration for 3.1.0-b1 2014-03-15 15:37:22 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Andreas Fischer
aee4534d71 Merge pull request #2111 from nickvergessen/ticket/12262
[ticket/12262] Fix event exporter

* nickvergessen/ticket/12262:
  [ticket/12262] Do not use inline assignments
  [ticket/12262] Do not use getExtension()
  [ticket/12262] Fix location list for acp events with "Locations:"
  [ticket/12262] Also find vars array when it's defined in the trigger_event()
2014-03-15 15:34:55 +01:00
Joas Schilling
2d987d36c1 Merge remote-tracking branch 'maelsoucaze/develop' into develop
* maelsoucaze/develop:
  [ticket/12272] Fix hardcoded colons in subforums.
  [ticket/12272] Fix hardcoded colons in subforums.
2014-03-15 15:17:55 +01:00
Joas Schilling
87292f534e [ticket/12262] Do not use inline assignments
PHPBB3-12262
2014-03-15 15:14:00 +01:00
Joas Schilling
2071abda1f [ticket/12262] Do not use getExtension()
The method is php 5.3.6+ only.

PHPBB3-12262
2014-03-15 15:13:59 +01:00
Maël Soucaze
23b7671617 [ticket/12272] Fix hardcoded colons in subforums.
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
2014-03-15 14:32:26 +01:00
Maël Soucaze
e1278320a2 [ticket/12272] Fix hardcoded colons in subforums.
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
2014-03-15 14:25:11 +01:00
Dhruv Goel
eafba554fd Merge pull request #2128 from nickvergessen/ticket/12271
[ticket/12271] Decouple dropdown header and footer from #notifications_list
2014-03-14 22:24:42 +05:30
Joas Schilling
d9037965c8 [ticket/12271] Decouple dropdown header and footer from #notifications_list
PHPBB3-12271
2014-03-14 17:10:20 +01:00
Joas Schilling
f852630ef3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12072] Fix comment about NEW MEMBERS permission
2014-03-14 14:36:29 +01:00
Joas Schilling
c1b48bdd01 Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympus
* Elsensee/ticket/12072:
  [ticket/12072] Fix comment about NEW MEMBERS permission
2014-03-14 14:35:56 +01:00
Oliver Schramm
647f976c30 [ticket/12072] Fix comment about NEW MEMBERS permission
PHPBB3-12072
2014-03-14 14:33:56 +01:00
Joas Schilling
bfe872d1b7 Merge remote-tracking branch 'vsephpbb/ticket/11429' into develop
* vsephpbb/ticket/11429:
  [ticket/11429] Increment asset version on Ext enable
2014-03-14 14:25:50 +01:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
2014-03-14 14:04:30 +01:00
Joas Schilling
c743e28b94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()

Conflicts:
	phpBB/includes/mcp/mcp_queue.php
2014-03-14 13:59:46 +01:00
Joas Schilling
bdce7abc84 Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympus
* marcosbc/ticket/12247:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
2014-03-14 13:58:17 +01:00
Joas Schilling
7b08a483fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data

Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-03-14 13:55:53 +01:00
Joas Schilling
943e4e35ee Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus
* exreaction/ticket/12202:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
2014-03-14 13:53:55 +01:00
Dhruv Goel
287c2b95ee Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241
[ticket/12241] Event to add and/or modify acp_board configurations
2014-03-14 18:00:14 +05:30
Nathan Guse
a6b274e8ab Merge pull request #11 from nickvergessen/ticket/exreaction/12202
[ticket/12202] Use an array in the data provider instead of exploding manually
2014-03-14 07:29:22 -05:00
Joas Schilling
1f8ab1c196 [ticket/12202] Use an array in the data provider instead of exploding manually
PHPBB3-12202
2014-03-14 13:18:30 +01:00
Nathan Guse
60d2c1f400 [ticket/9871] Can set current version to use instead of the phpBB version
PHPBB3-9871
2014-03-14 07:07:26 -05:00
Nathan Guse
0c40cd5f13 [ticket/9871] Fix indentation on comment
PHPBB3-9871
2014-03-14 07:03:37 -05:00
Nathan Guse
23289c89a1 [ticket/9871] Fix test name
PHPBB3-9871
2014-03-14 07:02:25 -05:00
Joas Schilling
56318fb5c4 [ticket/12241] Add @var for the arguments
PHPBB3-12241
2014-03-14 12:49:04 +01:00
Joas Schilling
7821cf0257 [ticket/12241] Update event name and version match our guidelines
PHPBB3-12241
2014-03-14 12:43:15 +01:00
Joas Schilling
5f8f1f04fd Merge remote-tracking branch 'dhruv/ticket/11040' into develop
* dhruv/ticket/11040:
  [ticket/11040] Topic is deleted if test is skipped
  [ticket/11040] Use unique text for the test post added
  [ticket/11040] Use hard delete in delete_topic
  [ticket/11040] Add migration to drop postgres search indexes
  [ticket/11040] Delete the functional test topic to avoid conflicts
  [ticket/11040] Add methods to delete post and topic in functional tests
  [ticket/11040] Swap post_text and post_subject for post_content index
  [ticket/11040] Add test cases for searching subject and post content together
  [ticket/11040] Remove postgres extra indexes
  [ticket/11040] Add post_content index
  [ticket/11040] Search subject and text together
2014-03-14 10:13:42 +01:00
Forumhulp.com
4b7a718f85 [ticket/12241] Add submit to event variables
PHPBB3-12241
2014-03-14 09:38:57 +01:00
Forumhulp.com
9d87b1a3c7 [ticket/12241] Move $phpbb_dispatcher to the top
PHPBB3-12241
2014-03-14 09:38:31 +01:00
Forumhulp.com
6db1a2bfad [ticket/12241] Event to add and/or modify acp_board configurations
PHPBB3-12241
2014-03-14 09:38:11 +01:00
Joas Schilling
3c6a17ae6b Merge remote-tracking branch 'vsephpbb/ticket/12263' into develop
* vsephpbb/ticket/12263:
  [ticket/12263] Add missing variable names to docblock fixes
  [ticket/12263] Remove invalid SQL query and unused variables
  [ticket/12263] Remove unused argument in module add/remove
  [ticket/12263] Fix incorrect docblock commets
2014-03-14 09:25:32 +01:00
Joas Schilling
954f0697ce Merge remote-tracking branch 'EXreaction/ticket/10288' into develop
* EXreaction/ticket/10288:
  [ticket/10288] Test to make sure included templates have proper variable scope
2014-03-14 08:56:06 +01:00
Matt Friedman
71246a5472 [ticket/11429] Increment asset version on Ext enable
PHPBB3-11429
2014-03-13 19:09:41 -07:00
Nathan Guse
a45aa2e5a0 [ticket/10288] Test to make sure included templates have proper variable scope
PHPBB3-10288
2014-03-13 19:48:07 -05:00
Nathan Guse
fb6b350c21 [ticket/9871] Split fast and slow version tests
PHPBB3-9871
2014-03-13 19:38:20 -05:00
Nathan Guse
36837e1975 Merge pull request #2109 from nickvergessen/ticket/11581
[ticket/11581] Hide categories on level 0 when they have no visible children
2014-03-13 19:31:22 -05:00
Marcos Bjorkelund
4333401a27 [ticket/12247] Makes static usernames work
Relative to the last ticket, this allows static usernames to
work correctly (those inserted in the post-column post_username)
when sending the e-mail, instead of showing just "Anonymous".

PHPBB3-12247
2014-03-14 00:49:20 +01:00
Matt Friedman
08165881f2 [ticket/12263] Add missing variable names to docblock fixes
PHPBB3-12263
2014-03-13 16:38:10 -07:00
Joas Schilling
12b8460089 Merge remote-tracking branch 'crizz0/ticket/11787' into develop
* crizz0/ticket/11787:
  [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
2014-03-14 00:22:01 +01:00
Matt Friedman
c48fe65dfd [ticket/12263] Remove invalid SQL query and unused variables
PHPBB3-12263
2014-03-13 16:20:38 -07:00
Matt Friedman
5df3e0a4ec [ticket/12263] Remove unused argument in module add/remove
PHPBB3-12263
2014-03-13 16:10:08 -07:00
Matt Friedman
89b0ff1da8 [ticket/12263] Fix incorrect docblock commets
PHPBB3-12263
2014-03-13 16:09:32 -07:00
Joas Schilling
c695aa3903 Merge remote-tracking branch 'vsephpbb/ticket/12029' into develop
* vsephpbb/ticket/12029:
  [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
2014-03-13 23:55:19 +01:00
Marcos Bjorkelund
b322cb4c11 [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
It includes the poster's username in the email notifications of
posts that get approved by moderators.

This is done by adding the username to every user_notification()
function located in /phpBB/includes/mcp/mcp_queue.php.

PHPBB3-12247
2014-03-13 23:54:06 +01:00