makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 16:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 206 MiB
Commit graph

25179 commits

Author SHA1 Message Date
Jakub Senko
4dfadfc97f [ticket/14819] Hide soft-deleted posts in topic review 
PHPBB3-14819
 2016-10-13 14:28:29 +02:00
Marc Alexander
47b6e7edf4
Merge branch '3.2.x' 2016-10-12 21:44:07 +02:00
Marc Alexander
84a8cf00ad
Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
Marc Alexander
1dd0ceabf6
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-10-12 21:40:59 +02:00
Marc Alexander
8f4ea4c495
Merge branch '3.2.x' 2016-10-10 21:39:21 +02:00
Marc Alexander
322b86da1f
Merge pull request #4476 from Nicofuma/ticket/14807 
[ticket/14807] Updates dependencies
 2016-10-10 21:30:13 +02:00
Tristan Darricau
b2711371f1
[ticket/14807] s9e/textformatter 0.8.1 
PHPBB3-14807
 2016-10-10 20:07:33 +02:00
Tristan Darricau
1100db7e86
[ticket/14807] Updates paragonie/random_compat 
PHPBB3-14807
 2016-10-09 22:03:50 +02:00
Marc Alexander
54ca672dde
Merge branch '3.2.x' 2016-10-09 15:58:33 +02:00
Tristan Darricau
4d4d3824f3
[ticket/14813] Add missing functions_compatibiity in phpbbcli 
PHPBB3-14813
 2016-10-09 10:47:56 +02:00
rxu
98a6133c1e [ticket/14808] Add template event overall_header_searchbox_after 
PHPBB3-14808
 2016-10-04 16:58:51 +07:00
Marc Alexander
380be9f1fd
[ticket/14733] Make sure detect_algorithm() works correctly and add tests 
detect_algorithm() returned array() if an algorithm prefix was more than 2
characters long. This might have been invalid for other prefixes. In order
to correctly cope with other prefixes, another check for a backslash in the
prefix definitino has been added.
This was discovered while writing the tests for the newly added interface.

PHPBB3-14733
 2016-10-03 22:09:28 +02:00
Marc Alexander
722639a0e2
[ticket/14733] Extend passwords driver_interface in rehashable_driver_interface 
PHPBB3-14733
 2016-10-03 22:09:22 +02:00
Marc Alexander
d15269950d
[ticket/14733] Use new interface to preserve backwards compatibility 
PHPBB3-14733
 2016-10-03 22:09:16 +02:00
Marc Alexander
297376ee94
[ticket/14733] Use default cost factor in bcrypt constructor 
PHPBB3-14733
 2016-10-03 22:09:12 +02:00
Marc Alexander
1d40c0f43b
[ticket/14733] Support increasing hashing cost factor 
PHPBB3-14733
 2016-10-03 22:09:07 +02:00
Tristan Darricau
d94c03d084
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:21:46 +02:00
Tristan Darricau
7bb4e88acd
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:20:54 +02:00
Tristan Darricau
1ad64f89b8
Merge pull request #4471 from dsinn/ticket/14802 
[ticket/14802] Empty/blank lines should not be additional poll options

* dsinn/ticket/14802:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:05:49 +02:00
Daniel Sinn
59b52d6312 [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 
PHPBB3-14804
 2016-10-03 10:24:30 -04:00
Marc Alexander
40354f1f90
Merge pull request #27 from phpbb/ticket/security-196 
[ticket/security-196] Escapes the exception messages before displaying them
 2016-10-02 22:25:30 +01:00
Marc Alexander
71e632b9f0
[prep-release-3.1.10] Add 3.1.10 migration 2016-10-02 21:07:18 +01:00
Marc Alexander
cb226f83be
[prep-release-3.1.10] Update version numbers for 3.1.10 2016-10-02 21:06:56 +01:00
Tristan Darricau
4c60995d7a
[ticket/14807] Updates everything else 
PHPBB3-14807
 2016-10-02 19:40:49 +02:00
Tristan Darricau
7a5fbd0257
[ticket/14807] Updates Twig 
PHPBB3-14807
 2016-10-02 19:24:45 +02:00
Tristan Darricau
10ae96c9b6
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:13:13 +02:00
Tristan Darricau
b28fe0a7fa
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:12:53 +02:00
Tristan Darricau
85e4566223
Merge pull request #4467 from Senky/ticket/14786 
[ticket/14786] Add mcp_forum_actions_before/after events

* Senky/ticket/14786:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:11:48 +02:00
Tristan Darricau
3375ce16eb
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:26 +02:00
Tristan Darricau
722fe0ca48
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:10 +02:00
Tristan Darricau
55a0570567
Merge pull request #4469 from rxu/ticket/14787-2 
[ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters

* rxu/ticket/14787-2:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:09 +02:00
Tristan Darricau
2602c2d29c
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:44:59 +02:00
Tristan Darricau
89a564adb2
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:43:55 +02:00
Tristan Darricau
b4e673acc1
Merge pull request #4470 from rxu/ticket/14801 
[ticket/14801] Highlighting utf8 strings in search results

* rxu/ticket/14801:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:43:55 +02:00
Tristan Darricau
bd71c3d8e2
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:35 +02:00
Tristan Darricau
5075090d4f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:32 +02:00
Tristan Darricau
cd4190a72d
Merge pull request #4474 from marc1706/ticket/14789 
[ticket/14789] Move form key checks to where they actually do something

* marc1706/ticket/14789:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
6b798d02fb
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Marc Alexander
c30a2b27a5
Merge branch '3.2.x' 2016-10-01 16:58:15 +01:00
Marc Alexander
328a7afcc3
Merge branch '3.1.x' into 3.2.x 2016-10-01 16:58:07 +01:00
Marc Alexander
5a6933fee7
Merge pull request #4466 from Senky/ticket/14795 
[ticket/14795] Merge topic views when merging topics
 2016-10-01 16:58:02 +01:00
Marc Alexander
89f3e5d29e
Merge branch '3.2.x' 2016-10-01 11:07:46 +01:00
Marc Alexander
57fc321c4d
Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Marc Alexander
f1eda6868f
Merge pull request #4465 from Senky/ticket/8301 
[ticket/8301] Add log_time index
 2016-10-01 11:07:40 +01:00
Marc Alexander
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes 
PHPBB3-14789
 2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something 
PHPBB3-14789
 2016-09-30 22:32:54 +01:00
Marc Alexander
0b1d7cc53f
Merge branch '3.2.x' 2016-09-30 21:49:41 +01:00
Daniel Sinn
32d569c594 [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 
PHPBB3-14804
 2016-09-30 16:34:11 -04:00
rxu
5b32019ad6 [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master 
PHPBB3-14799
 2016-10-01 02:59:17 +07:00
Daniel Sinn
c6383d3f89 [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since 
PHPBB3-14804
 2016-09-30 15:58:10 -04:00