Commit graph

22039 commits

Author SHA1 Message Date
Andreas Fischer
2964fb37e8 [ticket/12664] Refactor develop/migration_tips.php into a console command.
PHPBB3-12664
2014-06-10 01:57:59 +02:00
Joas Schilling
01a79fe1dc Merge pull request #2557 from Elsensee/ticket/12516
[ticket/12516] Always preview signature in UCP/ACP module

* Elsensee/ticket/12516:
  [ticket/12516] Always preview signature in UCP/ACP module
2014-06-10 00:27:18 +02:00
Joas Schilling
4916c8c24c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12606] Add ACP group core events
2014-06-10 00:13:20 +02:00
Joas Schilling
456ff2559a Merge pull request #2518 from Pico88/ticket/12606
[ticket/12606] Add ACP group core events

* Pico88/ticket/12606:
  [ticket/12606] Add ACP group core events
2014-06-10 00:13:11 +02:00
Joas Schilling
f0a0de1721 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
2014-06-10 00:01:39 +02:00
Joas Schilling
3a167ee801 Merge pull request #2568 from prototech/ticket/12667
[ticket/12667] Do not point viewtopic URL to unread post outside of view=unread.

* prototech/ticket/12667:
  [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
2014-06-10 00:01:30 +02:00
Joas Schilling
592624379f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:33 +02:00
Joas Schilling
771cbb2b3a Merge pull request #2434 from Nicofuma/ticket/8610
[ticket/8610] Merging topics does not handle bookmarks correctly

* Nicofuma/ticket/8610:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:27 +02:00
Cesar G
169a9a560d [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
PHPBB3-12667
2014-06-09 13:54:43 -07:00
Pico88
74842b2354 [ticket/12606] Add ACP group core events
PHPBB3-12606
2014-06-09 18:56:04 +02:00
Nils Adermann
7a55594e93 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:59 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Joas Schilling
0440d09dc0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
2014-06-09 17:20:36 +02:00
Joas Schilling
0c5af536f1 Merge pull request #2553 from rxu/ticket/12668
[ticket/12668] Add subforums_row to core.display_forums_modify_template_vars event

* rxu/ticket/12668:
  [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
2014-06-09 17:20:29 +02:00
rxu
1ee39d8c93 [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
Add subforums template data array to
'core.display_forums_modify_template_vars' event
to allow extensions to modify it if needed.

PHPBB3-12668
2014-06-09 22:22:54 +08:00
Joas Schilling
7245c54bb8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12669] Add core event to the function display_forums()
2014-06-09 16:09:33 +02:00
Joas Schilling
41a5c3bf2b Merge pull request #2554 from rxu/ticket/12669
[ticket/12669] Add core event to the function display_forums()

* rxu/ticket/12669:
  [ticket/12669] Add core event to the function display_forums()
2014-06-09 16:09:23 +02:00
Joas Schilling
ca259c1760 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
2014-06-09 15:47:42 +02:00
Joas Schilling
223c8c4784 Merge branch 'k0nsl-ticket/12677' into develop-ascraeus
* k0nsl-ticket/12677:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
2014-06-09 15:43:58 +02:00
Knecht Ruprecht
4d3fcd19ac [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
PHPBB3-12677
2014-06-09 15:42:14 +02:00
Dhruv
d1055bdd9e Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:25:24 +05:30
Dhruv
5e9cb35457 Merge branch 'develop-olympus' into develop-ascraeus
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-olympus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:23:49 +05:30
Dhruv Goel
233cdbfd66 Merge pull request #2548 from bantu/ticket/12660
[ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:22:15 +05:30
Andreas Fischer
a0c442d16e [ticket/12660] Improve check for when phpinfo() is disabled.
PHPBB3-12660
2014-06-09 03:28:57 +02:00
Andreas Fischer
bb590b6216 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12672] Make tab intercept; CB for keypress only react without key mods
2014-06-09 03:04:45 +02:00
Andreas Fischer
14d0a5f66b Merge pull request #2556 from brunoais/ticket/12672
[ticket/12672] Make tab intercept; CB for keypress only react without key mods

* brunoais/ticket/12672:
  [ticket/12672] Make tab intercept; CB for keypress only react without key mods
2014-06-09 03:04:45 +02:00
Andreas Fischer
31abf1ab02 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
2014-06-09 02:38:35 +02:00
Andreas Fischer
373918583d Merge pull request #2561 from marc1706/ticket/12675
[ticket/12675] Fix code sniffer complaints introduced by recent commits

* marc1706/ticket/12675:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
2014-06-09 02:38:34 +02:00
Joas Schilling
92f43c5371 [ticket/10073] Fix button descriptions
PHPBB3-10073
2014-06-09 01:40:17 +02:00
Joas Schilling
e3c3a5d2a7 [ticket/10073] Do not check disable boxes by default
PHPBB3-10073
2014-06-09 01:36:19 +02:00
Dhruv
74815d5951 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/11331] Inform user that double dots will be stripped from avatar paths
2014-06-09 04:39:28 +05:30
Dhruv Goel
6c1ff04ca0 Merge pull request #2555 from marc1706/ticket/11331
[ticket/11331] Inform user that double dots will be stripped from avatar paths
2014-06-09 04:38:01 +05:30
Marc Alexander
e8174f3d66 [ticket/12675] Fix code sniffer complaints introduced by recent commits
PHPBB3-12675
2014-06-09 00:51:01 +02:00
Marc Alexander
be638e2a18 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
2014-06-08 22:18:34 +02:00
Marc Alexander
b667923bcc Merge remote-tracking branch 'bantu/ticket/12673' into develop-ascraeus
* bantu/ticket/12673:
  [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
2014-06-08 22:17:56 +02:00
Andreas Fischer
ae35c4b05c [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
PHPBB3-12673
2014-06-08 16:46:55 +02:00
rxu
d5865e316c [ticket/12669] Add core event to the function display_forums()
Add core event to the function display_forums()
in includes/functions_display.php to allow assigning additional template data
for every forum, f.e. additional forumrow subloops.

PHPBB3-12669
2014-06-08 16:32:28 +08:00
Oliver Schramm
084875f343 [ticket/12516] Always preview signature in UCP/ACP module
PHPBB3-12516
2014-06-07 18:24:13 +02:00
brunoais
f8a9eccb2a [ticket/12672] Make tab intercept; CB for keypress only react without key mods
Changed the callback of keypress inside the <textarea> for the posting
such that, if key 9 is pressed (tab character) and ctrl, shift, alt and meta
are not pressed the tab is placed. Otherwise, nothing is made and default is
not prevented.

PHPBB3-12672
2014-06-07 17:08:05 +01:00
Marc Alexander
9a02dc3e27 [ticket/11331] Inform user that double dots will be stripped from avatar paths
PHPBB3-11331
2014-06-07 16:28:03 +02:00
Andreas Fischer
9e00aef34a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12655] Set register_container_commands as public
  [ticket/12655] Don't try to restore the definition in the help
  [ticket/12655] Fix coding style
  [ticket/12655] Make the --shell option available only for phpbbcli.php
  [ticket/12655] Fix coding style in \phpbb\console\application
  [ticket/12655] Set the arguments of \phpbb\console\application as required
  [ticket/12655] Don't require acp/common again in the commands
  [ticket/12655] Run the shell when --shell is used
2014-06-06 19:49:30 +02:00
Andreas Fischer
fc4275ab2b Merge pull request #2543 from Nicofuma/ticket/12655
[ticket/12655] Run phpbbcli as a shell when --shell or -s is used

* Nicofuma/ticket/12655:
  [ticket/12655] Set register_container_commands as public
  [ticket/12655] Don't try to restore the definition in the help
  [ticket/12655] Fix coding style
  [ticket/12655] Make the --shell option available only for phpbbcli.php
  [ticket/12655] Fix coding style in \phpbb\console\application
  [ticket/12655] Set the arguments of \phpbb\console\application as required
  [ticket/12655] Don't require acp/common again in the commands
  [ticket/12655] Run the shell when --shell is used
2014-06-06 19:49:29 +02:00
Andreas Fischer
e509f8664b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
2014-06-06 19:43:09 +02:00
Andreas Fischer
69e50dffae Merge pull request #2509 from Stephannos/ticket/12602
[ticket/12602] Add command to print the cron list

* Stephannos/ticket/12602:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
2014-06-06 19:43:09 +02:00
Etienne Baroux
088ce641be [ticket/12602] Fix language key removal.
PHPBB3-12602
2014-06-06 17:49:18 +02:00
Andreas Fischer
32afa50290 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12666] Use "None" for images in root of gallery avatar path
2014-06-06 16:03:11 +02:00
Andreas Fischer
1f78ab536b Merge pull request #2552 from marc1706/ticket/12666
[ticket/12666] Use "None" for images in root of gallery avatar path

* marc1706/ticket/12666:
  [ticket/12666] Use "None" for images in root of gallery avatar path
2014-06-06 16:03:08 +02:00
Etienne Baroux
347de7f060 [ticket/12602] Rectify language keys.
PHPBB3-12602
2014-06-06 14:55:37 +02:00
Etienne Baroux
49beb2075b [ticket/12602] Fix test mistake.
PHPBB3-12602
2014-06-06 10:29:58 +02:00
Etienne Baroux
8f0a04f318 [ticket/12602] Fix language var mistakes.
PHPBB3-12602
2014-06-06 10:21:00 +02:00