mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-09 02:12:44 +02:00
Code Issues Releases Wiki Activity
28,797 Commits 18 Branches 192 Tags
Commit Graph

24401 Commits

Author SHA1 Message Date
Marc Alexander
728335820c
Merge branch '3.1.x' into 3.2.x 2016-11-12 16:17:31 +01:00
Marc Alexander
bc4c82bae5
Merge pull request #4481 from senky/ticket/14819 
[ticket/14819] Hide soft-deleted posts in topic review
 2016-11-12 16:17:27 +01:00
Marc Alexander
78db28286e
Merge branch '3.1.x' into 3.2.x 2016-11-12 13:54:59 +01:00
Marc Alexander
577d669ba7
Merge pull request #4472 from dsinn/ticket/14804 
[ticket/14804] Add core event to MCP after merging topics
 2016-11-12 13:53:24 +01:00
Marc Alexander
dd561ec275
Merge branch '3.1.x' into 3.2.x 2016-11-12 13:47:42 +01:00
Marc Alexander
a298ed1a66
Merge pull request #4507 from nickvergessen/ticket-14788 
[ticket/14788] Farewell my friendz
 2016-11-12 13:47:39 +01:00
Marc Alexander
8d3d396f1b
Merge branch '3.1.x' into 3.2.x 2016-11-12 13:44:32 +01:00
Joas Schilling
c9ea560c63 [ticket/14788] Farewell 
PHPBB3-14788
 2016-11-12 12:12:01 +01:00
lavigor
cdf6464382 [ticket/14860] Broken link on subscriptions page on mobile devices 
PHPBB3-14860
 2016-11-08 16:50:53 +03:00
Tristan Darricau
50f5efba9c Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14795] Use maximum topic views instead of adding up views in merge
 2016-11-06 15:47:49 +01:00
Tristan Darricau
9be9062df3 Merge pull request #4485 from marc1706/ticket/14795 
[ticket/14795] Use maximum topic views instead of adding up views in merge

* github.com:phpbb/phpbb:
  [ticket/14795] Use maximum topic views instead of adding up views in merge
 2016-11-06 15:47:20 +01:00
Tristan Darricau
cd348b200a Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:41:59 +01:00
Tristan Darricau
dc32b900c5 Merge pull request #4486 from marc1706/ticket/11483 
[ticket/11483] Generate user act key if database entry is empty

* github.com:phpbb/phpbb:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:41:46 +01:00
Marc Alexander
ecb81894cc
Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x 2016-11-05 21:35:06 +01:00
Tristan Darricau
d90afa67d8
[ticket/14814] Fix reparser cron 
PHPBB3-14814
 2016-11-02 19:38:33 +01:00
JoshyPHP
33f1934b72 [ticket/14846] Updated s9e\TextFormatter 
PHPBB3-14846
 2016-11-02 09:19:35 +01: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
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
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
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
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
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
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
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