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

10215 Commits

Author SHA1 Message Date
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x 
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag 
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
 2016-03-24 16:07:07 +01:00
Marc Alexander
a66ec6eccf [ticket/14530] Only generate text again if sig was parsed for storage 
PHPBB3-14530
 2016-03-24 11:01:54 +01:00
Tristan Darricau
56c2caf6c0 [ticket/14555] Uniformize cache directory usages 
PHPBB3-14555
 2016-03-24 09:15:34 +01:00
Tristan Darricau
dc097221d8 [ticket/14550] Fix the number of characters returned by unique_id() 
PHPBB3-14450
 2016-03-23 10:18:22 +01:00
Jakub Senko
f77142c0b6 [ticket/13630] Prevent empty parameter select_single 
PHPBB3-13630
 2016-03-20 16:58:35 +01:00
Jakub Senko
15a0013193 [ticket/9435] Switch "ID" and BBcode name in constants keys 
PHPBB3-9435
 2016-03-19 17:17:03 +01:00
Jakub Senko
0f7d08c121 [ticket/9435] Add NUM_PREDEFINED_BBCODES constant 
PHPBB3-9435
 2016-03-18 11:02:02 +01:00
Jakub Senko
46c79bbe90 [ticket/9435] Convert bbcode magic numbers to constants 
PHPBB3-9435
 2016-03-18 10:56:14 +01:00
Marc Alexander
17b8e93a53 [ticket/14527] Decode automatically generated postlink without prefix 
The http prefix gets automatically added and should be removed prior
to outputting the post to the user.

PHPBB3-14527
 2016-03-13 14:48:21 +01:00
Marc Alexander
58678ff21c [ticket/14527] Retrieve link URL from href and not link text 
PHPBB3-14527
 2016-03-13 12:20:09 +01:00
Marc Alexander
0e84856a45 Merge branch '3.1.x' into 3.2.x 2016-03-10 12:19:10 +01:00
Marc Alexander
9bcf8df5d0 Merge pull request #4184 from lavigor/ticket/14486 
[ticket/14486] Add an event and fix an event in login_box()
 2016-03-10 12:18:47 +01:00
Máté Bartus
0e49dc4409 [ticket/13264] Don't force approved state if post visibility is known (3.2) 
The previous PR broke 3.2 because of different variable names

PHPBB3-13264
 2016-03-09 20:25:27 +01:00
Máté Bartus
0251a02896 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13264] Link to post if user can view it
  [ticket/13264] Do not force approved state if post visibility is known
 2016-03-09 19:42:57 +01:00
Máté Bartus
5e84d47a03 Merge pull request #4205 from marc1706/ticket/13264 
[ticket/13264] Do not force approved state if post visibility is known
 2016-03-09 19:39:29 +01:00
Máté Bartus
a01e3a0ffa Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14132] Use transaction for adding notifications to type table
  [ticket/14519] Skip query if all unread notifications are retrieved
  [ticket/14483] Do not send headers by default on access via controller

Conflicts:
	phpBB/phpbb/notification/manager.php
 2016-03-08 22:18:42 +01:00
Marc Alexander
dd115d1896 [ticket/13264] Link to post if user can view it 
PHPBB3-13264
 2016-03-08 15:25:45 +01:00
Marc Alexander
d461ee4f5c [ticket/13264] Do not force approved state if post visibility is known 
Post visibility is used if it is set to a valid value.

PHPBB3-13264
 2016-03-07 22:18:26 +01:00
Tristan Darricau
9d7b6260bd [release-3.2.0-b2] Update versions to 3.2.0-3-dev 2016-03-07 17:36:16 +01:00
Marc Alexander
62a2619300 [ticket/14483] Do not send headers by default on access via controller 
PHPBB3-14483
 2016-03-06 21:10:42 +01:00
Marc Alexander
3d7d0c40b8 [ticket/14437] Make sure attachments array is properly ordered before processing 
PHPBB3-14437
 2016-03-06 11:22:53 +01:00
Marc Alexander
1e10664739 [ticket/14437] Sort attachments after assigning inline attachments 
This does not seem to cause any issues but prevents us from having to consider
the currenty display order.

PHPBB3-14437
 2016-03-06 00:14:47 +01:00
Marc Alexander
b490be1f81 Merge branch '3.1.x' into 3.2.x 2016-02-28 10:15:47 +01:00
Marc Alexander
a4040e53b7 Merge pull request #4153 from gn36/ticket/14443 
[ticket/14443] Introduce additional parameter to messenger
 2016-02-28 10:15:41 +01:00
lavigor
40bd4c8b72 [ticket/14486] Use empty() and move error check. 
PHPBB3-14486
 2016-02-27 20:05:59 +03:00
Martin Beckmann
5d579631d7 [ticket/14443] substr($var, 0, 1) -> $var[0] 
PHPBB3-14443
 2016-02-27 15:17:17 +01:00
lavigor
276d48ed4f [ticket/14134] Fix code comments. 
PHPBB3-14134
 2016-02-27 16:55:05 +03:00
Marc Alexander
cb6ae863f5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/functions_content.php
 2016-02-27 12:44:28 +01:00
Marc Alexander
747a70964e Merge pull request #4086 from rxu/ticket/14366 
[ticket/14366] Add core events to the function decode_message()
 2016-02-27 11:41:50 +01:00
Marc Alexander
7c41be4f51 Merge branch '3.1.x' into 3.2.x 2016-02-27 11:04:55 +01:00
Marc Alexander
ee7cba5df7 Merge pull request #4085 from rxu/ticket/14365 
[ticket/14365] Add core event to the function topic_review()
 2016-02-27 11:04:52 +01:00
rxu
cd3b93b9e2 [ticket/14366] Add core events to the function decode_message() 
Remove match/replace vars, use alternative var for the message var,
update the target phpBB version.

PHPBB3-14366
 2016-02-27 12:08:58 +07:00
rxu
2076280947 [ticket/14365] Fix a typo in the docblock. 
PHPBB3-14365
 2016-02-27 11:55:41 +07:00
Marc Alexander
30db51a86e Merge branch '3.1.x' into 3.2.x 2016-02-26 23:11:16 +01:00
Jakub Senko
ec70ec96e7 [ticket/14189] Add core.gen_sort_selects_after event 
PHPBB3-14189
 2016-02-26 23:10:18 +01:00
Marc Alexander
c5c2f7f7d0 [ticket/14437] Correctly assume index from attachment display order 
PHPBB3-14437
 2016-02-21 14:10:45 +01:00
Tristan Darricau
b7deef46ac Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
 2016-02-18 22:00:10 +01:00
Marc Alexander
f6fd819764 Merge pull request #4165 from Nicofuma/ticket/14457 
[ticket/14457] Uses a random placeholder to inject css and js
 2016-02-18 21:52:48 +01:00
Marc Alexander
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary 
PHPBB3-13681
 2016-02-18 19:03:56 +01:00
Tristan Darricau
58359b1587 [ticket/14457] Replaces unique_id implementation by random_bytes() 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
lavigor
4b4584bcd4 [ticket/14486] Add an event and fix an event in login_box() 
PHPBB3-14486
 2016-02-18 19:22:11 +03:00
Marc Alexander
6f41fcb3d6 [ticket/14315] Add back roles select for disable javascript 
The javascript will hide the old select and show the version using
the span and showing the tooltips.

PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
0a1604a536 [ticket/14315] Apply roles options format for multiple forums too 
PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
4cfba8f3a4 [ticket/14315] Build role options for each permission group 
Previously all role options were put into one array. This required
filtering the options. Instead, these are now passed to the template
via template loops.

PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
eab1b1ad11 [ticket/14315] Correctly set default values and reset values 
The permissions tooltip javascript failed at correctly passing
the default values to the page. The same applied to the
display_mask() method in includes/acp/auth.php.

PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
4973632288 [ticket/14315] Only add role options specified for each group 
PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
9eedf29021 [ticket/14481] Use port 443 if https is specified in x-forwarded-proto 
PHPBB3-14481
 2016-02-16 16:33:19 +01:00
Joas Schilling
8663edce76 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2016-02-13 18:08:01 +01:00
Joas Schilling
17e21d5140 [3.1.x] Increase dev version for 3.1.9 2016-02-13 18:01:32 +01:00