Commit graph

25837 commits

Author SHA1 Message Date
Marc Alexander
c891277996
[ticket/14831] Add migration for deduplicating entries and fix typo
PHPBB3-14831
2016-10-23 22:00:02 +02:00
rxu
77f1bac64b [ticket/14831] Optimize code construction
PHPBB3-14831
2016-10-24 01:41:24 +07:00
rxu
51ef1ae346 [ticket/14831] Add more tests, better name for $e placeholder
PHPBB3-14831
2016-10-23 22:44:47 +07:00
rxu
a02b124dd0 [ticket/14831] Do not throw exception on the module existence checking
PHPBB3-14831
2016-10-23 21:58:29 +07:00
Marc Alexander
2a038d45df
Merge branch '3.1.x' into 3.2.x 2016-10-23 11:48:56 +02:00
Marc Alexander
3cb09358fe
Merge pull request #4490 from kasimi/ticket/14827
[ticket/14827] Fix adding multiple form keys
2016-10-23 11:48:53 +02:00
Marc Alexander
9f2867b115
[ticket/14831] Add method for getting valid migration name
PHPBB3-14831
2016-10-23 11:37:10 +02:00
Marc Alexander
2059d57c04
[ticket/14831] Fall back to possible migration names instead of adding prefix
Instead of just adding the backslash as prefix if needed, this will take care
of falling back to any possible migration with or without backslash no matter
how the mgiration was saved in the database or called in the migrations file.
This will result in a more robust migrator in regards to naming the migrations
and previously run migrations.

PHPBB3-14831
2016-10-23 10:28:22 +02:00
rxu
0cc0920734 [ticket/14831] Fix module migrator tool
PHPBB3-14831
2016-10-23 00:57:37 +07:00
Marc Alexander
8b8f693d00
[ticket/14831] Make sure migrations always start with backslash
The migration system expects every migration to start with a backslash.
If depends on definitions do not supply that leading backslash, we should
make sure it's added manually before calling the depends on migration.

PHPBB3-14831
2016-10-22 19:19:36 +02:00
rxu
8afa9fdf28 [ticket/14830] Fix FORM_INVALID error during AСP search index deletion
PHPBB3-14830
2016-10-21 01:23:45 +07:00
rxu
eca10dc08f [ticket/14830] Fix FORM_INVALID error on search backend changing
PHPBB3-14830
2016-10-21 01:23:44 +07:00
rxu
8e54c9ef8b [ticket/14830] Fix link hash checking case
PHPBB3-14830
2016-10-21 01:23:43 +07:00
rxu
832a87b924 [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion
PHPBB3-14830
2016-10-21 01:23:43 +07:00
Máté Bartus
fd7244c892 Merge branch '3.1.x' into 3.2.x 2016-10-20 18:34:59 +02:00
kasimi
f02afe58bc
[ticket/14827] Possibility to add multiple form keys
PHPBB3-14827
2016-10-19 22:42:52 +02:00
Marc Alexander
d98a1c4bc4
[ticket/14821] Simplify regex for converting <strong> tags back to HTML
PHPBB3-14821
2016-10-18 22:07:54 +02:00
MIkhail Gulyaev
868d55913d [ticket/14818] Optimize generate_board_url function
if $config['force_server_vars'] no need to calculate $request
2016-10-17 12:54:08 +07:00
Marc Alexander
20148e4d06
[ticket/11483] Generate user act key if database entry is empty
The force reactivation action in the ACP will no longer overwrite the
generated activation key in case the key stored in the database is empty.
It will also save the generated key back to the database to actually allow
the activation by the user.

PHPBB3-11483
2016-10-16 11:16:06 +02:00
Marc Alexander
fce30d1d91
[ticket/14795] Use maximum topic views instead of adding up views in merge
Merging topics should not result in topic views being added up but rather in
the highest topic view showing up for the merged topic.

PHPBB3-14795
2016-10-16 10:55:00 +02:00
Marc Alexander
2406fe2e5e
[ticket/14750] Remove html5 invalid attributes from attachment file input
PHPBB3-14750
2016-10-15 09:00:36 +02:00
Marc Alexander
1f0c616974
[ticket/14821] Replace escaped strong tags with actual tags
Everything else will still be escaped. This will however add back support for
bold text in exception messages.

PHPBB3-14821
2016-10-14 22:47:43 +02:00
Jakub Senko
4dfadfc97f [ticket/14819] Hide soft-deleted posts in topic review
PHPBB3-14819
2016-10-13 14:28:29 +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
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
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
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
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
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
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
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