mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Code Issues Releases Wiki Activity
29,098 Commits 18 Branches 192 Tags
5474aec55fbf847f9f9cf599ce7c7b791d1e66f2
Commit Graph

10389 Commits

Author SHA1 Message Date
Marc Alexander
5474aec55f Merge branch '3.2.x' 2016-11-20 12:58:04 +01:00
Marc Alexander
20771271ca Merge branch '3.1.x' into 3.2.x 2016-11-20 12:57:31 +01:00
Jmz
0d15a95f97 [ticket/14850] Add core.generate_smilies_before 
Allows changing root_path of smilies to use CDN for example

PHPBB3-14850
 2016-11-20 12:56:12 +01:00
Jmz
6bbc18fa40 [ticket/14850] Add core.smiley_text_root_path 
Allows changing root_path of smilies to use CDN for example

PHPBB3-14850
 2016-11-20 12:56:11 +01:00
Marc Alexander
82960414f7 Merge branch '3.2.x' 2016-11-17 09:56:59 +01:00
Marc Alexander
9343317121 Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x 2016-11-17 09:56:51 +01:00
Marc Alexander
32667f6290 Merge branch '3.2.x' 2016-11-16 21:57:49 +01:00
Marc Alexander
c6bed98cf5 Merge branch '3.1.x' into 3.2.x 2016-11-16 21:57:10 +01:00
Marc Alexander
34ebbbc7c3 Merge pull request #4497 from senky/ticket/14849 
[ticket/14849] Add core.acp_extensions_run_action
 2016-11-16 21:56:15 +01:00
Marc Alexander
d5a6ae7290 Merge branch '3.2.x' 2016-11-16 21:53:33 +01:00
Marc Alexander
4844370c26 Merge branch '3.1.x' into 3.2.x 2016-11-16 21:53:30 +01:00
Marc Alexander
1ff01d722a Merge pull request #4510 from senky/ticket/14864 
[ticket/14864] Set maxlength=64 to dateformat in ACP
 2016-11-16 21:53:27 +01:00
Jakub Senko
e974f338af [ticket/14739] Remove SQLite 2.8.x database driver 
PHPBB3-14739
 2016-11-16 17:59:28 +01:00
Jakub Senko
b80b624551 [ticket/14849] Add core.acp_extensions_run_action 
PHPBB3-14849
 2016-11-13 22:34:28 +01:00
Jakub Senko
f8fb3e0f9f [ticket/14864] Set maxlength=64 to dateformat in ACP 
PHPBB3-14864
 2016-11-13 15:12:23 +01:00
Marc Alexander
5451c7fea9 Merge branch '3.2.x' 2016-11-12 17:10:39 +01:00
Marc Alexander
ef77852aff Merge branch '3.1.x' into 3.2.x 2016-11-12 17:10:14 +01:00
Marc Alexander
221cd3eb68 Merge pull request #4495 from senky/ticket/14847 
[ticket/14847] Add core.acp_attachments_config_edit_add
 2016-11-12 17:08:28 +01:00
Marc Alexander
90cd9fc18f Merge branch '3.2.x' 2016-11-12 16:17:34 +01:00
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
577fb0c39c Merge branch '3.2.x' 2016-11-12 13:55:53 +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
Tristan Darricau
3364a54f39 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14795] Use maximum topic views instead of adding up views in merge
 2016-11-06 15:47:56 +01: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
79dd364b9c Merge branch '3.2.x' 
* 3.2.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:42:05 +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
Jakub Senko
552691efbf [ticket/14847] Add core.acp_attachments_config_edit_add 
PHPBB3-14847
 2016-11-02 09:46:36 +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
rxu
a41b16d06a [ticket/14830] Fix FORM_INVALID error on cpf settings changing 
PHPBB3-14830
 2016-10-24 23:22:00 +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
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
kasimi
f02afe58bc [ticket/14827] Possibility to add multiple form keys 
PHPBB3-14827
 2016-10-19 22:42:52 +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