Commit graph

25179 commits

Author SHA1 Message Date
Marc Alexander
0cb72ed6c5
Merge branch '3.2.x' 2016-11-05 21:36:27 +01:00
Marc Alexander
ecb81894cc
Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x 2016-11-05 21:35:06 +01:00
rxu
ad4fe1799f [ticket/14853] Add core event to allow modifying PM attachments download auth
PHPBB3-14853
2016-11-04 18:42:49 +07:00
rxu
6984f17f62 [ticket/14852] Add core event to modify email headers
PHPBB3-14852
2016-11-04 18:23:09 +07:00
Marc Alexander
4d07f8a134
[ticket/14716] Update dependencies to latest versions
This addresses some issues with symfony that resulted in
issues when open_basedir restrictions were enabled, as well
as issues with JPEG images in fast-image-size.
The phpBB class extending the twig lexer also had to be
modified to ensure compatibility after BC was broken by
the PR https://github.com/twigphp/Twig/pull/2182 for twig
1.27.

PHPBB3-14716
2016-11-03 21:36:12 +01:00
Tristan Darricau
d90afa67d8
[ticket/14814] Fix reparser cron
PHPBB3-14814
2016-11-02 19:38:33 +01:00
Jakub Senko
2f6a258175 [ticket/14848] Add acp_ext_list_disabled/enabled_title_after
PHPBB3-14848
2016-11-02 10:03:11 +01:00
Máté Bartus
65d09b1dce Merge branch '3.2.x' 2016-11-02 10:02:09 +01:00
Jakub Senko
552691efbf [ticket/14847] Add core.acp_attachments_config_edit_add
PHPBB3-14847
2016-11-02 09:46:36 +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
Marc Alexander
ffc6623dd4
[ticket/14831] Rename migration and replace preg_replace() with simpler methods
PHPBB3-14831
2016-10-25 20:25:57 +02: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
Marc Alexander
6f8c0df1c6
[ticket/14831] Compare depends_on for migrations and remove prefixless names
PHPBB3-14831
2016-10-23 22:17:19 +02:00
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
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
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
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
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