mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 18:50:25 +02:00
Code Issues Releases Wiki Activity
33,861 Commits 18 Branches 192 Tags
Commit Graph

183 Commits

Author SHA1 Message Date
Marc Alexander
0ceebede32
Merge pull request #5847 from rubencm/ticket/16349 
[ticket/16349] Fix merge issues in acp_attachments and posting_attach_body.html
 2020-02-12 07:17:32 +01:00
rubencm
ebdb771a0a [ticket/16349] Fix merges 
PHPBB3-16349
 2020-02-02 21:09:21 +00:00
Marc Alexander
2d5289ed7e
Merge branch '3.3.x' 2020-02-01 08:50:24 +01:00
Marc Alexander
3bb2edd53d
Merge branch '3.2.x' into 3.3.x 2020-02-01 08:50:19 +01:00
KYPREO
68677b8525 [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-22 20:21:12 +11:00
KYPREO
a1617548cf [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-20 15:19:56 +11:00
Marc Alexander
c41efac6b7
Merge branch '3.3.x' 2019-07-28 10:38:42 +02:00
Marc Alexander
5a76d541a2
Merge branch '3.2.x' into 3.3.x 2019-07-28 10:38:38 +02:00
rubencm
c281604d0b [ticket/14459] Use language property 
PHPBB3-14459
 2019-07-27 23:52:01 +00:00
rubencm
acb5794d50 [ticket/14459] Rename variable 
PHPBB3-14459
 2019-07-27 15:15:58 +00:00
rubencm
6787f6706e [ticket/14459] Fix 
PHPBB3-14459
 2019-06-25 16:37:16 +00:00
rubencm
0184865c5c [ticket/14459] Uppercase string to try to match language keys 
PHPBB3-14459
 2019-06-25 16:33:38 +00:00
rubencm
e0395fa2f2 [ticket/14459] Uppercase string to try to match language keys 
PHPBB3-14459
 2019-06-25 16:29:51 +00:00
rubencm
6876fcb46a [ticket/14459] Remove unused variables 
PHPBB3-14459
 2019-06-25 15:59:12 +00:00
rubencm
caa767e5a8 [ticket/14459] Fix template logic 
PHPBB3-14459
 2019-06-21 23:32:22 +00:00
rubencm
caf5ee42fd [ticket/14459] Fix rebase 
PHPBB3-14459
 2019-06-20 01:46:52 +00:00
rubencm
d0b50b9ca1 [ticket/14459] Check language input for group 
PHPBB3-14459
 2019-06-20 01:45:36 +00:00
Marc Alexander
ff61288295
Merge branch '3.3.x' 2019-06-03 21:18:53 +02:00
Marc Alexander
5540a0f8e0
Merge branch '3.2.x' into 3.3.x 2019-06-03 21:18:46 +02:00
3D-I
fa1952fd08 [ticket/16071] Undefined index for custom attachments groups 
PHPBB3-16071
 2019-05-29 09:03:55 +02:00
Rubén Calvo
65b0698ef7
[ticket/15663] Remove flash attachments support 
PHPBB3-15663
 2019-05-09 18:53:46 +02:00
Marc Alexander
06a3bfd203
Merge branch '3.2.x' 2018-11-11 14:03:27 +01:00
Derky
e2d26e102d [ticket/security/227] Remove "no thumbnail support" message 
SECURITY-227
 2018-11-04 23:10:44 +01:00
Derky
d753351edc [ticket/security/227] Replace ImageMagick support with thumbnail event 
SECURITY-227
 2018-10-23 23:57:24 +02:00
Derky
5367c09ec0 Merge branch '3.2.x' 2018-09-14 14:43:48 +02:00
Derky
1991df9519 Merge pull request #5349 from rubencm/ticket/15566 
[ticket/15566] Set category to none if extension don't exist
 2018-09-14 14:40:46 +02:00
rubencm
af5a2c4a20 [ticket/15566] Add missing variable sign 
PHPBB3-15566
 2018-09-13 15:26:17 +00:00
rubencm
0898c4c1cc [ticket/15566] Set category to none if extension don't exist 
PHPBB3-15566
 2018-09-13 11:55:05 +00:00
Rubén Calvo
3966440008 [ticket/15663] Remove flash attachments support 
PHPBB3-15663
 2018-07-12 22:02:48 +02:00
Rubén Calvo
3c295abd66 [ticket/15286] Remove download_mode 
PHPBB3-15286
 2018-05-01 10:47:11 +02:00
Rubén Calvo
e749e06042 [ticket/15286] Use storage in attachments 
PHPBB3-15286
 2018-05-01 10:47:11 +02:00
rxu
f8fbe37936
[ticket/14972] replace all occurrences of sizeof() with the count() 
PHPBB3-14972
 2018-01-01 13:56:04 +01:00
Marc Alexander
7c141954bf
Merge branch '3.2.x' 2017-11-02 21:14:19 +01:00
Rubén Calvo
3f95d49fee [ticket/15041] Add pagination to orphaned attachments 
PHPBB3-15041
 2017-10-17 18:47:47 +02:00
rxu
797234e416 [ticket/14972] replace all occurrences of sizeof() with the count() 
PHPBB3-14972
 2017-07-17 16:57:00 +07:00
Marc Alexander
ef77852aff
Merge branch '3.1.x' into 3.2.x 2016-11-12 17:10:14 +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
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
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
Marc Alexander
b39b3da5af [ticket/14272] Allow input of floats for filesize 
This might be needed while switching the default input from KiB to MiB or
similar changes to settings.

PHPBB3-14272
 2016-02-03 22:03:31 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables 
This is part 5 and there is more to come.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables 
Part 4

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
685449bfe3 [ticket/14272] Fix invalid or missing min/max settings 
PHPBB3-14272
 2015-11-06 10:31:56 +01:00
Marc Alexander
aca6e64669 [ticket/14272] Only use maxlength and size for allowed input elements 
PHPBB3-14272
 2015-11-06 10:20:05 +01:00
Tristan Darricau
e0fb680dbb Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
 2015-10-14 10:17:04 +02:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files 
PHPBB3-10572
 2015-10-13 11:52:52 -04:00
Marc Alexander
49312f05f8 [ticket/14168] Use attachment manager instead of separate classes 
PHPBB3-14168
 2015-10-12 11:34:11 +02:00
Marc Alexander
98ebbbdca2 [ticket/14168] No longer use deprecated functions in core files 
PHPBB3-14168
 2015-10-09 10:18:40 +02:00
n-aleha
c60b92bf61 [ticket/12505] Remove outdated media handling from acp 
Remove outdated media handling from acp

PHPBB3-12505
 2015-08-24 00:40:38 +03:00