mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 02:01:52 +02:00
Code Issues Releases Wiki Activity
28,695 Commits 18 Branches 192 Tags
Commit Graph

386 Commits

Author SHA1 Message Date
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
a66ec6eccf [ticket/14530] Only generate text again if sig was parsed for storage 
PHPBB3-14530
 2016-03-24 11:01:54 +01:00
Marc Alexander
0d93af8324 Merge branch '3.1.x' 2016-01-31 20:05:07 +01:00
rxu
68abcb9058 [ticket/14439] Do not call avatar manager if avatars are disabled 
PHPBB3-14439
 2016-01-31 23:45:24 +07:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2016-01-08 16:39:33 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size 
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
 2016-01-07 17:36:02 +01:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables 
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
3b9a9bb04a [ticket/13454] Remove double semi-colons 
PHPBB3-13454
 2016-01-06 13:52:11 +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
f50ba9ab4f [ticket/13454] Remove unused variables 
This is part 2 of the pr.

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
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
javiexin
917c864bbf [ticket/14387] Extend avatar-driver by extension in ACP not possible 
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them directly when required.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension. Simplified manager
interface by reducing unneeded methods.

PHPBB3-14387
 2016-01-02 17:16:23 +01:00
javiexin
06f4b6926b [ticket/14387] Extend avatar-driver by extension in ACP not possible 
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them within the manager method.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension.

PHPBB3-14387
 2016-01-02 17:16:14 +01:00
Marc Alexander
f3c2c497d8 [ticket/14272] Assign min and max values for avatar driver settings 
PHPBB3-14272
 2016-01-01 17:26:14 +01:00
Marc Alexander
7705017f63 [ticket/14272] Make sure phpbb_avatar_manager was defined 
PHPBB3-14272
 2015-12-03 11:58:53 +01:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line 
PHPBB3-10572
 2015-10-14 15:50:15 +02:00
Tristan Darricau
e0fb680dbb Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
 2015-10-14 10:17:04 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168 
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
 2015-10-14 08:40:01 +02:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files 
PHPBB3-10572
 2015-10-13 11:52:52 -04:00
Marc Alexander
49312f05f8 [ticket/14168] Use attachment manager instead of separate classes 
PHPBB3-14168
 2015-10-12 11:34:11 +02:00
Cesar G
0a93db705b [ticket/13993] Do not parse signatures as posts when editing them. 
The implementation of PHPBB3-12516 changed the manual use of the message parser
to using generate_text_for_storage(). The function does not support
parse_message::parse()'s mode parameter, thus all the error checks on the sig
are invalid.

PHPBB3-13993
 2015-10-11 15:46:43 -07:00
Marc Alexander
98ebbbdca2 [ticket/14168] No longer use deprecated functions in core files 
PHPBB3-14168
 2015-10-09 10:18:40 +02:00
Marc Alexander
a679380f09 [ticket/14222] Use request class instead of request_var in acp_users 
PHPBB3-14222
 2015-10-08 10:52:00 +02:00
Marc Alexander
b13393078c Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_users.php
 2015-10-07 16:55:57 +02:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636 
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
 2015-10-07 16:54:50 +02:00
Oliver Schramm
185fbe41c9 [ticket/12143] Replace group name output 
So now we can use translated group names for non-special groups

PHPBB3-12143
 2015-08-05 17:50:24 +02:00
Joas Schilling
07231e7943 [ticket/13844] FAQ in new controller format 
PHPBB3-13844
 2015-05-16 22:09:05 +02:00
MateBartus
cc29638bcc [ticket/13636] Fix coding style 
PHPBB3-13636
 2015-04-06 13:15:39 +02:00
Marc Alexander
5e7560845b Merge branch '3.1.x' 2015-03-06 14:36:22 +01:00
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events 
for acp users profile

PHPBB3-13675
 2015-03-06 07:26:35 -05:00
MateBartus
19fe32d5b2 [ticket/13636] Deleting inactive user in acp_users gives unexpected link 
Change "referer" to "redirect" in variable names and GET params as well.

PHPBB3-13636
 2015-02-24 21:23:58 +01:00
MateBartus
b8dfbfe390 [ticket/13636] Deleting inactive user in acp_users gives unexpected link 
Success message did not provide the expected "previous page" link
(acp_inactive was expected, but the link took users to acp_users) if the
acp_users module was accessed by navigating from the inactive user list to
acp_users and then deleting inactive user.

PHPBB3-13636
 2015-02-24 21:06:53 +01:00
Joas Schilling
19a236205f [ticket/13647] Generate route links for faq 
PHPBB3-13647
 2015-02-22 22:44:50 +01: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
Joas Schilling
917a5ce0df Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2015-02-02 23:23:26 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log() 
PHPBB3-13468
 2015-01-27 18:34:33 +01:00
rxu
be1b114114 [ticket/13536] Add core events to allow modifying user profile data on editing 
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744

PHPBB3-13536
 2015-01-23 00:35:02 +07: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
Marc Alexander
7b84b8bba8 Merge branch 'develop-ascraeus' into develop 2015-01-04 11:26:00 +01:00
Matt Friedman
86f66b5f72 [ticket/13439] Update event version to 3.1.3-RC1 
PHPBB3-13439
 2015-01-04 01:38:50 -08:00
Marc Alexander
4749dbbc1a Merge branch 'develop-ascraeus' into develop 2015-01-04 00:39:21 +01:00
Matt Friedman
179a7a4c71 [ticket/13439] Add event core.acp_users_overview_before 
PHPBB3-13439
 2015-01-03 15:21:47 -08:00
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +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
6323180344 [ticket/12858] Fix timezone display on acp users page 
PHPBB3-12858
 2014-09-17 17:56:09 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop 
PHPBB3-12858
 2014-09-17 14:22:08 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00