Marc Alexander
7ed89f3c4b
Merge branch '3.2.x'
2018-10-08 21:06:19 +02:00
Marc Alexander
426d8ce79f
Merge pull request #5152 from senky/ticket/15579
...
[ticket/15579] Add ucp_front events
2018-10-08 21:04:56 +02:00
Jakub Senko
1a284ebe8d
[ticket/15579] Add ucp_front events
...
PHPBB3-15579
2018-09-16 14:20:49 +02:00
Marc Alexander
d80b208a4b
Merge pull request #5303 from senky/ticket/11838
...
[ticket/11838] OAuth registration from ucp_register
2018-09-16 13:26:19 +02:00
Marc Alexander
ca408a899c
Merge branch '3.2.x'
2018-09-16 13:15:05 +02:00
MikelAlejoBR
5be990e959
[ticket/15733] Fix undeclared variable concatenation
...
PHPBB3-15733
2018-07-29 13:34:59 +02:00
MikelAlejoBR
740006ba60
[ticket/15697] Remove unused variable and corresponding input field
...
PHPBB3-15697
2018-07-28 13:15:31 +02:00
Jakub Senko
e398008624
[ticket/11838] OAuth registration from ucp_register
...
PHPBB3-11838
2018-07-27 20:50:48 +02:00
MikelAlejoBR
210c5f5a59
[ticket/15697] Remove hard coded time check when sending PMs
...
PHPBB3-15697
2018-07-23 17:45:48 +02:00
Tristan Darricau
4028c92c9d
Merge pull request #5272 from rubencm/ticket/15714
...
[ticket/15714] Auto login after registration
* github.com:/phpbb/phpbb:
[ticket/15714] Edit language string
[ticket/15714] Auto login after registration
2018-07-08 18:23:33 +02:00
Tristan Darricau
187e598236
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15717] Using correct variable for log entry
2018-07-08 18:21:46 +02:00
Alex Miles
a6fb2a6b8e
[ticket/15717] Using correct variable for log entry
...
PHPBB3-15717
2018-07-04 01:23:30 +01:00
Rubén Calvo
548363d57d
[ticket/15714] Auto login after registration
...
PHPBB3-15714
2018-06-29 01:34:02 +02:00
rxu
f8fbe37936
[ticket/14972] replace all occurrences of sizeof() with the count()
...
PHPBB3-14972
2018-01-01 13:56:04 +01:00
vinny
68f8ec60fc
[ticket/15484] Remove multiple empty lines at includes/ucp/ucp_register.php
...
PHPBB3-15484
2017-12-18 02:32:51 -03:00
Derky
bcbfd75719
Merge branch '3.2.x'
2017-12-18 00:07:13 +01:00
Derky
57772a0d32
Merge pull request #5035 from kasimi/ticket/15440
...
[ticket/15440] Added core.ucp_register_agreement_modify_template_data
2017-12-17 23:53:23 +01:00
Derky
d2dc314a30
[ticket/15440] State deprecated version for core.ucp_register_agreement
...
PHPBB3-15440
2017-12-17 23:36:26 +01:00
kasimi
79464c9951
[ticket/15440] Added core.ucp_register_agreement_modify_template_data
...
PHPBB3-15440
2017-12-17 23:35:59 +01:00
Derky
f70801856a
Merge branch '3.2.x'
2017-12-03 23:06:09 +01:00
Derky
2643e851f2
Merge pull request #5022 from kasimi/ticket/15431
...
[ticket/15431] Add event core.ucp_register_modify_template_data
2017-12-03 22:49:14 +01:00
kasimi
6cc46a3d39
[ticket/15431] Moved phpbb_timezone_select() before the event
...
PHPBB3-15431
2017-12-03 19:02:40 +01:00
kasimi
65c529e66d
[ticket/15431] Split up $template_vars
...
PHPBB3-15431
2017-12-03 18:47:17 +01:00
kasimi
9c93c180b0
[ticket/15431] Removed $page_title
...
PHPBB3-15431
2017-11-29 19:35:36 +01:00
kasimi
0409191be9
[ticket/15431] Fixed event argument description
...
PHPBB3-15431
2017-11-08 14:45:33 +01:00
Marc Alexander
f75fdc69b3
Merge branch '3.2.x'
2017-11-01 15:45:15 +01:00
Marc Alexander
5cdec6199c
Merge pull request #4984 from senky/ticket/15111
...
[ticket/15111] Fix the typo in ucp_pm_view_messsage
2017-11-01 15:45:11 +01:00
kasimi
be15e26e5f
[ticket/15431] Add event core.ucp_register_modify_template_data
...
PHPBB3-15431
2017-10-31 14:56:41 +01:00
Oliver Schramm
8e62ea225e
Merge branch '3.2.x'
...
Conflicts:
phpBB/includes/ucp/ucp_notifications.php
2017-10-05 15:14:58 +02:00
Jakub Senko
7fcb07572b
[ticket/15111] Fix the typo in ucp_pm_view_messsage
...
PHPBB3-15111
2017-10-03 11:43:29 +02:00
Jakub Senko
2cdb27a0d1
[ticket/15362] Fix colspan in notification options table
...
PHPBB3-15362
2017-10-02 12:24:33 +02:00
Máté Bartus
6211b69a6f
Merge branch '3.2.x'
2017-09-07 14:32:51 +02:00
kasimi
ec2d983ab1
[ticket/15328] Disable checkbox if notification method isn't supported
...
PHPBB3-15328
2017-08-24 10:39:59 +02:00
rxu
797234e416
[ticket/14972] replace all occurrences of sizeof() with the count()
...
PHPBB3-14972
2017-07-17 16:57:00 +07:00
Marc Alexander
f101532c09
Merge branch '3.2.x'
2017-07-16 21:42:30 +02:00
Marc Alexander
c56ebb5312
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1
2017-07-16 18:24:47 +02:00
Marc Alexander
41df4d3c4c
[ticket/security/208] Add form key to password reset form
...
SECURITY-208
2017-06-18 17:39:16 +02:00
Michael Miday
686a8e6d3a
[ticket/15234] patch avatar sizes
...
PHPBB3-15234
2017-06-01 16:35:21 -04:00
Marc Alexander
5cafff36b2
Merge branch '3.1.x' into 3.2.x
2017-04-26 19:30:50 -04:00
Marc Alexander
4c58dfc19a
Merge pull request #4671 from senky/ticket/13605
...
[ticket/13605] Add core.ucp_pm_compose_predefined_message event
2017-04-26 19:30:47 -04:00
Marc Alexander
f27cdad73e
Merge branch '3.1.x' into 3.2.x
2017-02-11 21:48:20 +01:00
Jakub Senko
1d38abdd7e
[ticket/13605] Add core.ucp_pm_compose_predefined_message event
...
PHPBB3-13605
2017-01-23 14:14:36 +01:00
Marc Alexander
777a1ad916
[ticket/14945] Parse signature preview with generate_text_for_display()
...
PHPBB3-14945
2017-01-04 22:04:07 +01:00
Marc Alexander
c5ce0cd3c4
Merge pull request #4599 from VSEphpbb/ticket/14945
...
[ticket/14945] Fix bbcode flags in user sig previews
2017-01-04 17:48:52 +01:00
Tristan Darricau
2251816b10
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
2017-01-02 22:47:47 +01:00
Marc Alexander
7df7cfff33
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
...
PHPBB3-14953
2017-01-02 22:39:40 +01:00
Matt Friedman
e31c895774
[ticket/14945] Send bbcode flags in user sig previews
...
PHPBB3-14945
2016-12-28 09:18:35 -08:00
Marc Alexander
58e4ec68b6
Merge branch '3.1.x' into 3.2.x
2016-12-18 21:07:23 +01:00
Marc Alexander
0f000aff0d
Merge pull request #4536 from senky/ticket/13845
...
[ticket/13845] Add core.ucp_profile_avatar_sql
2016-12-18 21:07:19 +01:00
Marc Alexander
bef0b15dbd
Merge branch '3.1.x' into 3.2.x
2016-12-18 20:47:46 +01:00