1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

10220 Commits

Author SHA1 Message Date
Marc Alexander
70b04016eb Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
2016-06-19 17:54:55 +02:00
Marc Alexander
804236bce4 Merge pull request #4331 from Senky/ticket/13978
[ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
2016-06-19 17:53:23 +02:00
Marc Alexander
63d3b240a4 Merge branch '3.1.x' into 3.2.x 2016-06-19 17:49:07 +02:00
Marc Alexander
cf8c13b04c Merge pull request #4329 from Senky/ticket/14429
[ticket/14429] Add core.obtain_users_online_string_before_modify
2016-06-19 17:49:01 +02:00
Marc Alexander
79d6d53296 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/includes/ucp/ucp_pm_compose.php
2016-06-19 17:20:45 +02:00
Marc Alexander
6764bea40c Merge pull request #4316 from rmcgirr83/ticket_14630
[ticket/14630] Add event to modify pm message
2016-06-19 17:17:26 +02:00
Marc Alexander
6a73188e6a Merge branch '3.1.x' into 3.2.x 2016-06-13 22:08:17 +02:00
Tobi Schäfer
cff2895599 [ticket/14626] Event core.make_jumpbox_modify_tpl_ary
PHPBB3-14626
2016-06-13 21:11:54 +02:00
Tobi Schäfer
516670225d [ticket/14626] Event core.make_jumpbox_modify_tpl_ary
https://tracker.phpbb.com/browse/PHPBB3-14626

PHPBB3-14626
2016-06-13 21:10:13 +02:00
Tobi Schäfer
256730c76a [ticket/14626] Event core.make_jumpbox_modify_tpl_ary
PHPBB3-14626
2016-06-13 21:10:13 +02:00
Andreas Fischer
cddf80c2e6 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14291] Do not update filesize if displaying thumbnail
2016-06-11 13:45:48 +02:00
Richard McGirr
08acf2acba [ticket/14630] Rename core event
PHPBB3-14630
2016-06-02 05:18:14 -04:00
Marc Alexander
72248cab45 [ticket/14291] Do not update filesize if displaying thumbnail
PHPBB3-14291
2016-05-30 20:05:45 +02:00
Jakub Senko
10d96d4f33 [ticket/14429] Add core.modify_users_online_string_modify
PHPBB3-14429
2016-05-27 13:46:23 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event
PHPBB3-14649
2016-05-26 06:26:14 -04:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
PHPBB3-13978
2016-05-24 18:07:11 +02:00
Richard McGirr
06507f9fa6 [ticket/14630] Change event name and fix capitalization
PHPBB3-14630
2016-05-16 17:57:26 -04:00
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt
PHPBB3-14624
2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
2016-05-15 23:57:16 +02:00
Richard McGirr
c7bbcd7b84 [ticket/14630] Add event to modify pm message
https://tracker.phpbb.com/browse/PHPBB3-14630

PHPBB3-14630
2016-05-06 06:31:35 -04:00
Richard McGirr
c0f3463819 [ticket/14624] Remove whitespace
PHPBB3-14624
2016-05-05 06:42:28 -04:00
Richard McGirr
c3b30144e3 [ticket/14624] Fix typo and phpBB version
PHPBB3-14624
2016-05-05 06:10:56 -04:00
Richard McGirr
aa3c5286cd [ticket/14624] Move event so it actually works
PHPBB3-14624
2016-05-05 06:09:11 -04:00
Richard McGirr
8e1102b1da [ticket/14624] Add event to ucp_profile in signature section
PHPBB3-14624
2016-05-05 05:26:19 -04:00
Joas Schilling
58dfff38fa [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
Tristan Darricau
6d2acb5ba3 [ticket/13616] Fix UI tests
PHPBB3-13616
2016-04-03 16:23:16 +02:00
Tristan Darricau
663e3bc642 [ticket/13616] Updates direct call to twig environment constructor
PHPBB3-13616
2016-04-03 16:23:16 +02:00
JoshyPHP
2505aaa9d6 [ticket/14426] Fixed undefined offset error
PHPBB3-14426
2016-04-03 10:27:23 +02:00
Tristan Darricau
9dad16c5a6 Merge pull request #4271 from kasimi/ticket/14562-3.2.x
[ticket/14562] Language fallback for extension permissions (3.2.x)

* kasimi/ticket/14562-3.2.x:
  [ticket/14562] Language fallback for extension permissions (3.2.x)
2016-04-02 13:11:43 +02:00
Tristan Darricau
a895640245 Revert "[ticket/14562] Language fallback for extension permissions"
This reverts commit 621b958b1ca41e1def6349e07e0e3c8258a9d9f3.
2016-04-02 13:10:55 +02:00
Tristan Darricau
bd91925fe7 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14562] Language fallback for extension permissions
2016-04-02 13:10:34 +02:00
Tristan Darricau
ccdf8e7ee1 Merge pull request #4270 from kasimi/ticket/14562
[ticket/14562] Language fallback for extension permissions

* kasimi/ticket/14562:
  [ticket/14562] Language fallback for extension permissions
2016-04-02 13:02:14 +02: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
kasimi
1819b64046 [ticket/14562] Language fallback for extension permissions (3.2.x)
PHPBB3-14562
2016-04-01 21:58:05 +02:00
kasimi
621b958b1c [ticket/14562] Language fallback for extension permissions
PHPBB3-14562
2016-04-01 18:06:19 +02:00
Tristan Darricau
a9090ecb0e Merge pull request #4251 from marc1706/ticket/14272-3.2.x
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272-3.2.x:
  [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: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
Tristan Darricau
386d31ec63 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
2016-03-27 12:56:03 +02:00
Tristan Darricau
5442a25967 Merge pull request #4182 from marc1706/ticket/14481
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https

* marc1706/ticket/14481:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
2016-03-27 12:56:03 +02:00
Marc Alexander
7d5a853b21 Merge pull request #4228 from Senky/ticket/9435
[ticket/9435] Replace BBcode magic numbers with constants
2016-03-27 12:40:38 +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
Tristan Darricau
dedfb317f2 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14134] Fix Okay in a comment.
  [ticket/14134] Fix code comments.
  [ticket/14134] Send warning notification PM in user's language.
2016-03-26 18:59:31 +01:00
Tristan Darricau
640070e133 Merge pull request #3874 from lavigor/ticket/14134
[ticket/14134] Send warning notification PM in user's language.

* lavigor/ticket/14134:
  [ticket/14134] Fix Okay in a comment.
  [ticket/14134] Fix code comments.
  [ticket/14134] Send warning notification PM in user's language.
2016-03-26 18:59:31 +01:00
lavigor
18a4505b23 [ticket/14134] Fix Okay in a comment.
PHPBB3-14134
2016-03-25 23:11:43 +03:00
Tristan Darricau
2a7c514cd0 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
7f9ba9849b Merge pull request #4190 from marc1706/ticket/14437
[ticket/14437] Correctly assume index from attachment display order

* marc1706/ticket/14437:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
8d98981012 Merge pull request #4218 from marc1706/ticket/14527
[ticket/14527] Retrieve link URL from href and not link text

* marc1706/ticket/14527:
  [ticket/14527] Decode automatically generated postlink without prefix
  [ticket/14527] Add tests for reverted improper fix
  [ticket/14527] Retrieve link URL from href and not link text
2016-03-25 11:35:47 +01:00
Tristan Darricau
f29ebb1846 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13630] Prevent empty parameter select_single
2016-03-25 11:20:56 +01:00