Commit graph

11074 commits

Author SHA1 Message Date
Marc Alexander
41df4d3c4c
[ticket/security/208] Add form key to password reset form
SECURITY-208
2017-06-18 17:39:16 +02:00
Marc Alexander
34fb146ab5
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:57:18 +02:00
Marc Alexander
05a8baffdb
Merge pull request #4840 from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
2017-06-05 11:56:22 +02:00
Marc Alexander
4177edf33a
Merge pull request #4833 from javiexin/ticket/15227
[ticket/15227] Check PHP version and remove old unused code
2017-06-05 11:53:02 +02:00
Marc Alexander
be76d582dc
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:13:39 +02:00
Marc Alexander
acf9cdba01
Merge pull request #4810 from rxu/ticket/15199
[ticket/15199] Add core event to the messenger send() function
2017-06-05 11:13:35 +02:00
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e
Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00
Marc Alexander
e10d563fc9
Merge branch '3.1.x' into 3.2.x 2017-06-03 11:43:09 +02:00
Marc Alexander
b357f78546
Merge pull request #4747 from ErnadoO/ticket/15132
[ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
2017-06-03 11:43:06 +02:00
Marc Alexander
4d4dbd52f7
Merge branch '3.1.x' into 3.2.x 2017-06-03 11:37:06 +02:00
Marc Alexander
58bd7a90a9
Merge pull request #4746 from ErnadoO/ticket/15131
[ticket/15131] Add variable to the 'core.mcp_main_modify_fork_sql' event
2017-06-03 11:37:02 +02:00
Erwan Nader
0914123391 [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-05-31 21:21:04 +02:00
Erwan Nader
e754a51acc [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-05-31 21:04:22 +02:00
Marc Alexander
de4b2eb620
Merge branch '3.1.x' into 3.2.x 2017-05-25 08:52:45 +02:00
Marc Alexander
3f58b5f9ab
Merge pull request #4717 from rmcgirr83/ticket/15107
[ticket/15107] Add message_parser to event
2017-05-25 08:52:41 +02:00
RMcGirr83
7a3e55bdb3 [ticket/15237] Fix unguarded includes to functions_user
https://tracker.phpbb.com/browse/PHPBB3-15237

PHPBB3-15237
2017-05-24 12:58:25 -04:00
javiexin
bee363f072 [ticket/15227] Remove function deregister_globals, not needed
PHPBB3-15227
2017-05-21 16:57:01 +02:00
javiexin
1d5f5ccffc [ticket/15227] Remove STRIP, as always false
PHPBB3-15227
2017-05-21 12:58:05 +02:00
javiexin
c2c5c20c31 [ticket/15227] Check PHP version and remove old unused code
PHPBB3-15227
2017-05-12 23:04:54 +02:00
Marc Alexander
877760ef98
Merge branch '3.1.x' into 3.2.x 2017-05-02 13:16:36 -04:00
kasimi
5808c9fae1
[ticket/15187] Use $this->template property 2017-04-29 13:45:20 +02:00
kasimi
bc404a3701
[ticket/15187] Add ACP style after enabling an extension 2017-04-29 11:01:55 +02:00
Tristan Darricau
7254980753
Merge pull request #4657 from marc1706/ticket/7336
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-28 11:30:14 +02:00
rxu
f5d49b61bb [ticket/15199] Add core event to the messenger send() function
PHPBB3-15199
2017-04-27 15:06:34 +07:00
Marc Alexander
8179e56b02
Merge branch '3.1.x' into 3.2.x 2017-04-26 19:58:29 -04:00
Marc Alexander
e53343857a
Merge pull request #4674 from senky/ticket/13730
[ticket/13730] Add core.delete_post_end event
2017-04-26 19:57:35 -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
Tristan Darricau
afe2664c56
Merge pull request #4802 from marc1706/ticket/8116-rhea
[ticket/8116] Add pagination for IP tables and post info -- Rhea version

* github.com:phpbb/phpbb:
  [ticket/8116] Add missing new line
  [ticket/8116] Correctly get other users who posted under IP
  [ticket/8116] Improve code and add tests for helper functions
  [ticket/8116] Add pagination for IP tables on post info
2017-04-21 23:54:41 +02:00
Tristan Darricau
a233f98bbf
Merge pull request #4780 from marc1706/ticket/8116
[ticket/8116] Add pagination for IP tables and post info

* github.com:phpbb/phpbb:
  [ticket/8116] Add missing new line
  [ticket/8116] Correctly get other users who posted under IP
  [ticket/8116] Improve code and add tests for helper functions
  [ticket/8116] Add pagination for IP tables on post info
2017-04-21 23:54:18 +02:00
javiexin
6a61e73e00 [ticket/15011] Use exception interface for 3.2
Update the mentioned ticket to 3.2 by using exception_inteface
instead of the actual exception class.
Also, use adm_back_link consistently.

PHPBB3-15011
2017-04-21 21:28:29 +02:00
Marc Alexander
b1439a4601
Merge branch 'ticket/8116' into ticket/8116-rhea 2017-04-19 23:43:41 +02:00
Tristan Darricau
c61e43cc91
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-19 23:01:35 +02:00
Tristan Darricau
a8d28d6bc8
Merge pull request #4657 from marc1706/ticket/7336
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-19 23:00:37 +02:00
Tristan Darricau
7cc2f8aa43
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
2017-04-19 17:08:16 +02:00
Tristan Darricau
d550f925ab
Merge pull request #4781 from nomind60s/ticket/15151
[ticket/15151] ACP Cookie settings add explanatory text

* github.com:phpbb/phpbb:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
2017-04-19 17:05:47 +02:00
rxu
f178c06b4f [ticket/15186] Fully implement the force_delete_allowed feature
PHPBB3-15186
2017-04-19 21:33:22 +07:00
Tristan Darricau
4cbf619fd5
Merge pull request #4705 from nomind60s/ticket/15097
[ticket/15097] Add PHP version to Board statistics

* github.com:phpbb/phpbb:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
2017-04-18 23:14:56 +02:00
Marc Alexander
771be9310d
[ticket/8116] Correctly get other users who posted under IP
PHPBB3-8116
2017-04-18 19:33:05 +02:00
Rubén Calvo
4efcfc2477 [ticket/15150] Remove php4 constructor
PHPBB-15150
2017-04-17 03:08:00 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array
PHPBB3-14990
2017-04-16 23:40:16 +07:00
rxu
1ea114ca20 [ticket/14990] Fix event name, email parsing, installer and dispatcher calls
PHPBB3-14990
2017-04-16 22:43:50 +07:00
lr94
aa37e9b7fc [ticket/15176] Add setting for user activity display limit.
Up to phpBB 3.2 the maximum number of posts a user must have to have his
activity shown is 5000. This limit is hardcoded in functions_display.php.
It would be useful if board administrators could choose to disable the
limit or to set an higher value.

PHPBB3-15176
2017-04-16 16:28:38 +02:00
Marc Alexander
d44d1f115f
Merge pull request #4698 from javiexin/ticket/15087
[ticket/15087] Optimize creation of metadata objects by caching
2017-04-16 11:15:45 +02:00
Marc Alexander
82e1b8fd72
Merge pull request #4581 from javiexin/ticket/14919
[ticket/14919] Do not directly use globals in acp_extensions
2017-04-16 09:49:21 +02:00
Marc Alexander
f9a596c544
Merge pull request #4761 from VSEphpbb/ticket/15142
[ticket/15142] Check extension updates on current branch
2017-04-11 21:26:52 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
2017-04-10 15:51:22 -07:00
Rubén Calvo
d0540eea52 [ticket/15150] Remove empty space
PHPBB3-15150
2017-04-04 14:28:03 +02:00
Rubén Calvo
601ffba0cf [ticket/15150] Use php5 constructor
PHPBB3-15150
2017-04-04 14:25:57 +02:00