1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

20149 Commits

Author SHA1 Message Date
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
Joas Schilling
92b15fbdf8 Merge remote-tracking branch 'vsephpbb/ticket/11111' into develop
* vsephpbb/ticket/11111:
  [ticket/11111] Prosilver posting textarea may only be resized vertically
2014-03-13 23:49:29 +01:00
Joas Schilling
4f8cba3c82 Merge remote-tracking branch 'vsephpbb/ticket/12073' into develop
* vsephpbb/ticket/12073:
  [ticket/12073] Increase size of samp and code tags in ACP
2014-03-13 23:40:51 +01:00
Matt Friedman
2c0efd5d1b [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
PHPBB3-12029
2014-03-13 15:24:27 -07:00
Matt Friedman
2de3943cec [ticket/12073] Increase size of samp and code tags in ACP
PHPBB3-12073
2014-03-13 15:08:21 -07:00
Crizzo
0c02eae1ad [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
PHPBB3-11787
2014-03-13 20:58:05 +01:00
Matt Friedman
21bec33e0b [ticket/11111] Prosilver posting textarea may only be resized vertically
The resize element displays a mechanism for allowing the
user to resize the element. Setting this to vertical means it
may only be resized vertically.

PHPBB3-11111
2014-03-13 12:47:28 -07:00
Joas Schilling
8a61e4b4c0 Merge remote-tracking branch 'crizz0/ticket/8785' into develop
* crizz0/ticket/8785:
  [ticket/8785] Deletes additional add and add_bcc buttons
  [ticket/8785] Fixed problem with add empty.png and travis will now pass
  [ticket/8785] and again a fresh line
  [ticket/8785] Just one blank line
  [ticket/8785] pm_layout.html back to more standard code
  [ticket/8785] <hr /> will only displayed when needed
  [ticket/8785] Adds blank lines at file end
  [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
  [ticket/8785] Adds two <hr /> to seperate recipients and BCC
  [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
  [ticket/8785] Little spaces mistake
  [ticket/8785] Rebuilding posting_editor pm head + new language vars
2014-03-13 11:28:21 +01:00
Joas Schilling
6361d382b3 [ticket/11581] Add assertNotContainsLang() for functional test cases
PHPBB3-11581
2014-03-13 11:25:58 +01:00
Joas Schilling
eb1dd47e39 [ticket/11581] Hide categories when they have no visible children
PHPBB3-11581
2014-03-13 11:25:45 +01:00
Andreas Fischer
bd33855e7b Merge pull request #2110 from nickvergessen/ticket/12168
[ticket/12168] Move padding-top to ul.linklist li

* nickvergessen/ticket/12168:
  [ticket/12168] Move padding-top to ul.linklist li
2014-03-13 11:10:08 +01:00
Andreas Fischer
4ecfc07e03 Merge pull request #2113 from nickvergessen/ticket/8041
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
2014-03-13 11:02:29 +01:00
Andreas Fischer
16e7a1d931 Merge pull request #2115 from Elsensee/ticket/12267
[ticket/12267] Replace $php_ext with $phpEx

* Elsensee/ticket/12267:
  [ticket/12267] Replace $php_ext with $phpEx
2014-03-13 11:00:31 +01:00
Oliver Schramm
86a88751a8 [ticket/12267] Replace $php_ext with $phpEx
PHPBB3-12267
2014-03-13 10:52:10 +01:00
Joas Schilling
db63d0fbf9 [ticket/8041] Add space/tabs after => in array list
PHPBB3-8041
2014-03-13 10:41:41 +01:00
Joas Schilling
dbebe30c9a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-03-13 10:27:19 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
2014-03-13 10:16:41 +01:00
Andreas Fischer
e123b0c0a0 [ticket/12176] Reword comment about config entries.
PHPBB3-12176
2014-03-13 00:53:07 +01:00
Nathan Guse
d69012ea6d Merge pull request #2104 from nickvergessen/ticket/12261
[ticket/12261] Remove web root path from login redirect url
2014-03-12 18:48:41 -05:00
Andreas Fischer
d3ddf29e59 Merge pull request #6 from nickvergessen/ticket/bantu/12176
[ticket/12176] Add newest_user_colour to config array to ensure it exists

* nickvergessen/ticket/bantu/12176:
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
2014-03-13 00:17:59 +01:00
Joas Schilling
c6a87e77d4 Merge remote-tracking branch 'vsephpbb/ticket/12244' into develop
* vsephpbb/ticket/12244:
  [ticket/12244] Rename extensions manager tab
  [ticket/12244] Rename link to Extensions Manager in the ACP
2014-03-12 20:18:29 +01:00
Joas Schilling
ca92ed918a [ticket/12176] Add newest_user_colour to config array to ensure it exists
PHPBB3-12176
2014-03-12 20:08:55 +01:00
Joas Schilling
871a89af07 Merge remote-tracking branch 'EXreaction/ticket/11716' into develop
* EXreaction/ticket/11716:
  [ticket/11716] Correct license URL
  [ticket/11716] Fix dependencies in migration files
  [ticket/11716] Rename migration files and add note that it's converting a MOD
  [ticket/11716] Convert Soft Delete Mod to post/topic visibility
2014-03-12 18:51:14 +01:00
Joas Schilling
dfa077710f [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
PHPBB3-8041
2014-03-12 18:47:02 +01:00