Commit graph

263 commits

Author SHA1 Message Date
Marc Alexander
4844370c26
Merge branch '3.1.x' into 3.2.x 2016-11-16 21:53:30 +01:00
Jakub Senko
f8fb3e0f9f [ticket/14864] Set maxlength=64 to dateformat in ACP
PHPBB3-14864
2016-11-13 15:12:23 +01:00
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
rxu
9551475fce [ticket/14660] Fix parsing board email messages through template engine.
PHPBB3-14660
2016-06-18 00:39:33 +07:00
Benjamin Staneck
3708770eb9 [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
2016-06-17 08:46:02 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
Marc Alexander
fd9c05309d [ticket/14448] Let user decide if remote upload certs should be checked
Also fixed some minor issues like coding style.

PHPBB3-14448
2016-02-04 17:14:48 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables
This is part 5 and there is more to come.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables
Part 4

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables
This is the first part of the changes. More to come.

PHPBB3-13454
2016-01-06 13:51:19 +01:00
Marc Alexander
aca6e64669 [ticket/14272] Only use maxlength and size for allowed input elements
PHPBB3-14272
2015-11-06 10:20:05 +01:00
Zoddo
57cb7e4111 [ticket/10165] Add a "Send test email" feature
PHPBB3-10165
2015-09-09 17:51:14 +02:00
Nicofuma
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
2015-07-13 22:41:13 +02:00
Marc Alexander
77bc8ee68b Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
Joas Schilling
78b0c938a2 [ticket/sec-184] Do not output LDAP password to HTML
SECURITY-184
2015-06-04 14:29:03 +02:00
Joas Schilling
6ca3a30576 [ticket/sec-184] Do not output config passwords to the HTML page
SECURITY-184
2015-06-04 14:06:35 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style
PHPBB3-13838
2015-05-14 15:43:44 +02:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config()
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
2015-01-12 20:19:07 +01:00
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method
PHPBB3-11863
2014-10-17 15:42:11 +02:00
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
2014-10-17 15:40:03 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408
[ticket/12408] Add quick setting for "default guest style" to ACP
2014-10-06 23:43:27 +02:00
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects
PHPBB3-12858
2014-09-17 19:07:24 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
2014-09-17 14:22:08 +02:00
PayBas
0061a305d8 [ticket/12408] Fix white-space sniffer
PHPBB3-12408
2014-09-15 15:25:43 +02:00
PayBas
aaddf41e5b [ticket/12408] Changed lang vars, added fieldset and removed "default"
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
0b4944f125 [ticket/12408] Public functions and updated doc block
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
60c9955f51 [ticket/12408] Code cleanup
Rebased to see if travis will finally play along

PHPBB3-12408
2014-09-15 14:43:39 +02:00
PayBas
ae63843647 [ticket/12408] Simplified queries
PHPBB3-12408
2014-09-15 14:43:38 +02:00
PayBas
265c621c9e [ticket/12408] Add quick setting for "default guest style" to ACP
PHPBB3-12408
2014-09-15 14:43:38 +02:00
Andreas Fischer
e523711ec2 [ticket/12826] Add optional root namespace indicator for consistency.
PHPBB3-12826
2014-08-07 14:25:53 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Cesar G
d95164e641 [ticket/9388] Display only the settings for the auth method that's selected.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Cesar G
607698c884 [ticket/10737] Add config setting to disable live searches.
PHPBB3-10737
2014-04-23 09:11:40 -07:00
Oliver Schramm
933dcde805 [ticket/8558] Fix field length in ACP
PHPBB3-8558
2014-04-17 23:13:39 +02:00
Markus Stenudd
40c685e6fc [ticket/8558] Add display name in emails from board
PHPBB3-8558
2014-04-17 13:30:48 +02: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
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
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs.
PHPBB3-11980
2013-10-30 13:37:29 +01:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00