Commit graph

29008 commits

Author SHA1 Message Date
Máté Bartus
65d09b1dce Merge branch '3.2.x' 2016-11-02 10:02:09 +01:00
Máté Bartus
094ac6b60f Merge pull request #4494 from JoshyPHP/ticket/14846
[ticket/14846] Updated s9e\TextFormatter
2016-11-02 10:01:20 +01:00
JoshyPHP
33f1934b72 [ticket/14846] Updated s9e\TextFormatter
PHPBB3-14846
2016-11-02 09:19:35 +01:00
Marc Alexander
890fe72e48
Merge branch '3.2.x' 2016-10-28 21:06:54 +02:00
Marc Alexander
f658e062b2
Merge branch '3.1.x' into 3.2.x 2016-10-28 21:06:21 +02:00
Marc Alexander
85898d3d2c
Merge pull request #4489 from rxu/ticket/14830
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
2016-10-28 19:36:49 +02:00
Marc Alexander
466bdee8e6 [ticket/14823] Move check_form_key() inside actual save data step
PHPBB3-14823
2016-10-28 21:37:00 +07:00
Tristan Darricau
c563fe3cc5
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:11 +02:00
Tristan Darricau
b8ef36ddb1
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:09 +02:00
Tristan Darricau
e3a85ff0a7
Merge pull request #4487 from gmixo/patch-2
[ticket/14818] Optimize generate_board_url function

* gmixo/patch-2:
  [ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:06 +02:00
Tristan Darricau
e1234a92be
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
2016-10-24 22:24:28 +02:00
Tristan Darricau
b13910ee45
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
2016-10-24 22:24:26 +02:00
Tristan Darricau
163292bc11
Merge pull request #4491 from rxu/ticket/14831
[ticket/14831] Fix extension modules installation issues

* rxu/ticket/14831:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
2016-10-24 22:24:23 +02:00
rxu
a41b16d06a [ticket/14830] Fix FORM_INVALID error on cpf settings changing
PHPBB3-14830
2016-10-24 23:22:00 +07:00
Marc Alexander
773099d761
Merge branch '3.2.x' 2016-10-24 18:21:19 +02:00
Marc Alexander
52b1a9d4fa
Merge branch '3.1.x' into 3.2.x 2016-10-24 18:21:17 +02:00
Marc Alexander
cac8ac8242
Merge pull request #4477 from rxu/ticket/14808
[ticket/14808] Add template event overall_header_searchbox_after
2016-10-24 18:21:14 +02:00
rxu
cefbd39b82 [ticket/14830] Fix tests
PHPBB3-14830
2016-10-24 01:54:40 +07:00
rxu
77f1bac64b [ticket/14831] Optimize code construction
PHPBB3-14831
2016-10-24 01:41:24 +07:00
rxu
849cd74700 [ticket/14831] Add more tests against UCP modules
PHPBB3-14831
2016-10-23 23:33:03 +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
84db7a66ee
Merge branch '3.2.x' 2016-10-23 11:48:59 +02: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
rxu
0cc0920734 [ticket/14831] Fix module migrator tool
PHPBB3-14831
2016-10-23 00:57:37 +07: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
244ff0f969 [ticket/14830] Fix ACP search control functional tests
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
e030ddc1b2 Merge branch '3.2.x' 2016-10-20 18:35:40 +02:00
Máté Bartus
fd7244c892 Merge branch '3.1.x' into 3.2.x 2016-10-20 18:34:59 +02:00
Máté Bartus
05d0879795 Merge pull request #4482 from marc1706/ticket/14821
[ticket/14821] Replace escaped strong tags with actual tags
2016-10-20 18:33:48 +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
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
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
35ad0f1249
[ticket/14807] Fix tests after symfony upgrade
PHPBB3-14807
2016-10-09 22:13:58 +02:00
Tristan Darricau
82105070ad
[ticket/14807] Updates s9e textformatter again
PHPBB3-14807
2016-10-09 22:10:16 +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
Marc Alexander
8ce95413aa
Merge pull request #4478 from Nicofuma/ticket/14813
[ticket/14813] Add missing functions_compatibiity in phpbbcli
2016-10-09 15:58:31 +02:00
Tristan Darricau
4d4d3824f3
[ticket/14813] Add missing functions_compatibiity in phpbbcli
PHPBB3-14813
2016-10-09 10:47:56 +02:00