mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
28,521 Commits 17 Branches 190 Tags
Commit Graph

286 Commits

Author SHA1 Message Date
rxu
fa878f2818 [ticket/14660] Remove redundant empty line in ucp_profile.php 
PHPBB3-14660
 2016-06-20 14:28:22 +07:00
Marc Alexander
70b04016eb Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-06-19 17:54:55 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event 
PHPBB3-14649
 2016-05-26 06:26:14 -04:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary 
PHPBB3-13978
 2016-05-24 18:07:11 +02:00
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt 
PHPBB3-14624
 2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-05-15 23:57:16 +02:00
Richard McGirr
c0f3463819 [ticket/14624] Remove whitespace 
PHPBB3-14624
 2016-05-05 06:42:28 -04:00
Richard McGirr
c3b30144e3 [ticket/14624] Fix typo and phpBB version 
PHPBB3-14624
 2016-05-05 06:10:56 -04:00
Richard McGirr
aa3c5286cd [ticket/14624] Move event so it actually works 
PHPBB3-14624
 2016-05-05 06:09:11 -04:00
Richard McGirr
8e1102b1da [ticket/14624] Add event to ucp_profile in signature section 
PHPBB3-14624
 2016-05-05 05:26:19 -04: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
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
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
805b084607 [ticket/14272] Define min and max values for avatar width and height 
PHPBB3-14272
 2015-12-27 08:39:07 +01:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00
Cesar G
c7d7967a91 [ticket/13945] Send reactivation requests to admins using notifications system. 
PHPBB3-13945
 2015-10-15 22:26:14 -07: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
Joas Schilling
07231e7943 [ticket/13844] FAQ in new controller format 
PHPBB3-13844
 2015-05-16 22:09:05 +02:00
Marc Alexander
6f3ca35ae7 Merge branch '3.1.x' 2015-03-10 15:20:28 +01:00
Marc Alexander
7c26cd25c7 Merge pull request #3434 from nickvergessen/ticket/13647 
[ticket/13647] Move FAQ page to a controller
 2015-03-05 15:25:30 +01:00
RMcGirr83
0442957420 [ticket/13650] Move core event 
PHPBB3-13650
 2015-02-25 11:28:00 -05:00
Joas Schilling
06d6bcbe00 Merge branch '3.1.x' 2015-02-24 21:53:05 +01:00
Richard McGirr
03ded5853b [ticket/13650] Validate ucp profile data changes 
PHPBB3-13650
 2015-02-23 21:19:10 -05:00
Joas Schilling
19a236205f [ticket/13647] Generate route links for faq 
PHPBB3-13647
 2015-02-22 22:44:50 +01:00
Joas Schilling
7f3ad29c47 Merge branch '3.1.x' 2015-02-20 21:00:49 +01:00
RMcGirr83
1f345a8cf9 [ticket/13635] Add sql_ary to ucp profile event 
PHPBB3-13635
 2015-02-19 05:45:10 -05: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
Joas Schilling
7330c0afd3 Merge pull request #3325 from rxu/ticket/13536 
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
 2015-02-02 23:22:23 +01:00
Joas Schilling
2f060b8299 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:18:24 +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
rxu
e08cd70a89 [ticket/13535] Add core event to allow modifying account settings on editing 
Add ucp_profile.php core event to allow modifying account settings on editing.

PHPBB3-13535
 2015-01-22 23:10:05 +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
Nils Adermann
00c57ed122 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/security-159] Only show first 8 characters of login keys in UCP
 2014-10-22 18:21:12 -04:00
Marc Alexander
f796f92058 [ticket/security-159] Only show first 8 characters of login keys in UCP 
SECURITY-159
 2014-10-22 16:21:16 -05:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +02:00
Marc Alexander
e0c2013bb9 [ticket/12822] Add method for deleting avatars and use confirm_box 
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
 2014-08-07 17:29:33 +02:00
Marc Alexander
b3d2898d01 Merge branch 'develop-ascraeus' into develop 2014-07-08 15:59:54 +02:00
PayBas
0a286e044b [ticket/12804] Dont use ternary form 
PHPBB3-12804
 2014-07-07 11:28:06 +02:00
PayBas
c5b4d0afb7 [ticket/12804] Hide Jabber from UCP & member search when disabled 
PHPBB3-12804
 2014-07-07 09:05:57 +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
Oliver Schramm
084875f343 [ticket/12516] Always preview signature in UCP/ACP module 
PHPBB3-12516
 2014-06-07 18:24:13 +02:00
Joas Schilling
911725a581 [ticket/10073] Split email validation from email ban and taken checks 
PHPBB3-10073
 2014-05-29 02:14:41 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys 
PHPBB3-12380
 2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP 
PHPBB3-12380
 2014-04-10 09:04:35 -07:00
Matt Friedman
80bc30214f [ticket/11098] Fix error reporting on the autologin key pages 
PHPBB3-11098
 2014-04-09 23:17:30 -07:00