mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity
28,880 Commits 18 Branches 192 Tags
Commit Graph

2163 Commits

Author SHA1 Message Date
Marc Alexander
c3108d44ce
Merge branch '3.1.x' into 3.2.x 2016-11-20 13:18:31 +01:00
Marc Alexander
d98fd7868b
Merge pull request #4511 from senky/ticket/14842 
[ticket/14842] Don't display filesize limit if there is none
 2016-11-20 13:18:27 +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
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
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
ba5243ba76 [ticket/14842] Don't display filesize limit if there is none 
PHPBB3-14842
 2016-11-15 14:22:42 +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
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
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
f658e062b2
Merge branch '3.1.x' into 3.2.x 2016-10-28 21:06:21 +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
rxu
a41b16d06a [ticket/14830] Fix FORM_INVALID error on cpf settings changing 
PHPBB3-14830
 2016-10-24 23:22:00 +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
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
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
Marc Alexander
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes 
PHPBB3-14789
 2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something 
PHPBB3-14789
 2016-09-30 22:32:54 +01:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809 
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
 2016-09-25 17:19:13 +02:00
Tristan Darricau
19bbbfe0f3
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
 2016-09-18 21:14:47 +02:00
Marc Alexander
72f6241aa2
[ticket/14789] Add form tokens to tests and uncomment add_form_key 
PHPBB3-14789
 2016-09-18 15:30:25 +02:00
Marc Alexander
585a3ed863
[ticket/14789] Add link hashes and form tokens to all acp links/buttons 
This will further harden the ACP security by adding link hashes to links and
form tokens to forms that did not have these yet and result in modified
settings or write action on the filesystem or database. These few links and
forms were still relying on the global ACP protection, mainly due to them
not posing further risks of compromising data. After this change these will
now also be properly protected against tampering.

PHPBB3-14789
 2016-09-18 15:29:50 +02:00
Marc Alexander
b0ff957684
Merge branch '3.1.x' into 3.2.x 2016-09-17 12:59:56 +02:00
Marc Alexander
801519ca4d Merge pull request #4435 from Crizz0/ticket/14764 
[ticket/14764] Wrong link to database update script has been fixed
 2016-09-06 21:45:49 +02:00
Crizzo
86752fc6df [ticket/14764] Wrong link to database update script has been fixed 
PHPBB3-14764
 2016-09-02 22:05:37 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable 
PHPBB3-10961
 2016-09-01 08:48:37 +02:00
rxu
3bf64de247 [ticket/14738] Add core events to improve modifying forum lists 
PHPBB3-14738
 2016-08-07 16:10:49 +07:00
Jakub Senko
c64b8102b7 [ticket/10809] Remove MSSQL support 
PHPBB3-10809
 2016-08-02 12:06:06 +02:00
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
Marc Alexander
cddb884be6 Merge pull request #4354 from Stanzilla/smtp_explain 
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
 2016-07-06 19:23:54 +02:00
Marc Alexander
09c602425c Merge pull request #4357 from rxu/ticket/14660 
[ticket/14660] Fix parsing board email messages through template engine.
 2016-06-19 22:33:29 +02:00
Marc Alexander
a460aec68c Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/language/en/install.php
 2016-06-19 18:25:16 +02:00
rxu
9551475fce [ticket/14660] Fix parsing board email messages through template engine. 
PHPBB3-14660
 2016-06-18 00:39:33 +07:00
Benjamin Staneck
3708770eb9 [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option 
This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
 2016-06-17 08:46:02 +02:00
Richard McGirr
c938077172 [ticket/13716] Fix verboseness 
PHPBB3-13716
 2016-04-12 05:17:02 -04:00
RMcGirr83
920219dc56 [ticket/13716] Remove extraneous blank line 
PHPBB3-13716
 2016-04-05 14:55:42 -04:00
Richard McGirr
04f320cb01 [ticket/13716] Check phpBB version against config version 
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
 2016-04-05 07:09:12 -04:00
Marc Alexander
2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x 
Conflicts:
	phpBB/includes/acp/acp_modules.php
 2016-04-02 09:51:37 +02:00
Marc Alexander
5b61ac06cb [ticket/14577] Do not calculate size of array in for loop 
For loops that modify the size of the looped arrays were obviously not
changed.

PHPBB3-14577
 2016-04-02 09:46:54 +02:00
Tristan Darricau
2bfbc07b7d Merge pull request #4021 from marc1706/ticket/14272 
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
 2016-03-27 13:34:17 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
 2016-03-27 09:59:25 +02:00