1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 19:49:20 +02:00

10781 Commits

Author SHA1 Message Date
Marc Alexander
4ed45c4e12
Merge pull request #32 from phpbb/ticket/security-203
[ticket/security-203] Fully validate version check data in version helper
2017-07-16 11:17:36 +02:00
Marc Alexander
0ec5e21979
Merge pull request #37 from phpbb/ticket/security/208
[ticket/security/208] Add form key to password reset form
2017-07-16 09:58:46 +02:00
Marc Alexander
a53c8cee79
[3.2.x] Update version numbers for 3.2.2-dev 2017-07-11 21:27:26 +02:00
Marc Alexander
d423b2ec0d
[prep-release-3.2.1] Update version numbers for 3.2.1-RC1 2017-06-25 21:55:00 +02:00
Marc Alexander
08c146ee34
Merge branch '3.1.x' into prep-release-3.1.11 2017-06-25 21:32:12 +02:00
Marc Alexander
5e24508280
Merge branch '3.2.x' 2017-06-25 21:27:09 +02:00
Marc Alexander
aef138d8bc
Merge branch '3.1.x' into 3.2.x 2017-06-25 21:26:43 +02:00
Marc Alexander
dc49a8a199
Merge pull request #4804 from rxu/ticket/15186
[ticket/15186] Fully implement the force_delete_allowed feature
2017-06-25 21:25:54 +02:00
Marc Alexander
04ef19595c
[prep-release-3.1.11] Update version numbers to 3.1.11-RC1 2017-06-25 17:42:55 +02:00
Marc Alexander
797bde42aa
Merge branch '3.2.x' 2017-06-25 11:07:13 +02:00
Marc Alexander
b28dc339f0
Merge branch '3.1.x' into 3.2.x 2017-06-25 11:06:47 +02:00
Marc Alexander
976d799ff2
Merge branch '3.2.x' 2017-06-24 21:42:54 +02:00
Marc Alexander
b59073cf3e
Merge pull request #4794 from lr94/ticket/15176
[ticket/15176] Add setting for user activity display limit.
2017-06-24 21:42:39 +02:00
Daniel Sinn
127f5a3ffa [ticket/15250] Add core event to MCP at the end of merge_posts
PHPBB3-15250
2017-06-20 17:56:48 -04:00
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
cfa56ed3b8
Merge branch '3.2.x' 2017-06-05 11:57:37 +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
c0abca3c1a
Merge pull request #4836 from hanakin/ticket/15234
[ticket/15234] quickfix notification avatar sizes
2017-06-05 11:55:06 +02:00
Marc Alexander
92195ede52
Merge branch '3.2.x' 2017-06-05 11:53:07 +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
a58d032bf9
Merge branch '3.2.x' 2017-06-05 11:13:43 +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
509ea30aa2
Merge branch '3.2.x' 2017-06-05 11:02:49 +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
cfafc32694
Merge branch '3.2.x' 2017-06-03 11:43:13 +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
2a8f3e0101
Merge branch '3.2.x' 2017-06-03 11:37:10 +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
Michael Miday
686a8e6d3a [ticket/15234] patch avatar sizes
PHPBB3-15234
2017-06-01 16:35:21 -04: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
36763ab244
Merge branch '3.2.x' 2017-05-25 08:52:49 +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
rxu
2485db81a3 [ticket/15220] Fix undefined variable $phpbb_root_path in acp_extensions.php
PHPBB3-15220
2017-05-07 10:03:19 +07:00
Marc Alexander
cf603f7025
Merge branch '3.2.x' 2017-05-02 13:16:39 -04: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