mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
28,203 Commits 17 Branches 190 Tags
Commit Graph

28203 Commits

This Branch
This Branch
All Branches
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
rxu
a5790597ca [ticket/14051] Restore accidentally removed $topics_count value 
PHPBB3-14051
 2016-03-24 21:41:41 +07:00
Marc Alexander
ed21921c58 Merge branch '3.1.x' into 3.2.x 2016-03-24 15:22:38 +01:00
Marc Alexander
a4fac6da2a Merge pull request #4238 from RMcGirr83/ticket_14051 
[ticket/14051] Replace sql array of viewforum sort topics function
 2016-03-24 15:22:30 +01:00
Richard McGirr
78bf53587a [ticket/14051] Add table alias and fix types of property 
PHPBB3-14051
 2016-03-24 07:01:57 -04:00
Marc Alexander
2a6e8f3668 Merge branch '3.1.x' into 3.2.x 2016-03-24 11:49:31 +01:00
Marc Alexander
1bb4e3621e Merge pull request #4175 from Senky/ticket/14471 
[ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
 2016-03-24 11:49:24 +01:00
Marc Alexander
d8bcf479bf Merge branch '3.2.x' 2016-03-24 11:21:36 +01:00
Marc Alexander
200bcae2ae Merge branch '3.1.x' into 3.2.x 2016-03-24 11:21:31 +01:00
Marc Alexander
c36892f2fa Merge pull request #4113 from LaxSlash/ticket/14395 
[ticket/14395] Add event core.viewtopic_add_quickmod_option_before
 2016-03-24 11:21:24 +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
Marc Alexander
c5ef29a6f1 [ticket/14530] Add accidentally removed sig_parsed flag 
This was removed by accident previously while moving from the use of the
old bbcode class to the generate_test_for_display function.

PHPBB3-14530
 2016-03-24 10:41:43 +01:00
Tristan Darricau
56c2caf6c0 [ticket/14555] Uniformize cache directory usages 
PHPBB3-14555
 2016-03-24 09:15:34 +01:00
Richard McGirr
d9ad14e4c5 [ticket/14051] Fix whitespace 
PHPBB3-14051
 2016-03-23 21:46:45 -04:00
Richard McGirr
c003611f05 [ticket/14051] Replace sql array of viewforum sort topics function 
PHPBB3-14051
 2016-03-23 21:30:30 -04:00
LaxSlash
8f396673fe [ticket/14395] core.viewtopic_add_quickmod_option_before 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
 2016-03-23 20:11:20 -04:00
LaxSlash
a18c59317f [ticket/14395] core.viewtopic_add_quickmod_option_before 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
 2016-03-23 14:57:18 -04:00
Marc Alexander
827f11cf83 Merge branch '3.2.x' 2016-03-23 14:47:07 +01:00
Marc Alexander
1e0cda3e8a Merge pull request #4235 from Nicofuma/ticket/14550 
[ticket/14550] Fix the number of characters returned by unique_id()
 2016-03-23 14:47:01 +01:00
Marc Alexander
10d4093561 [ticket/14536] Force unix time stamps to be integer 
This will ensure to prevent PHP fatal errors in case the passed timestamp
is an empty string or does not evaluate to an integer (i.e. strings like
foobar).

PHPBB3-14536
 2016-03-23 14:44:31 +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
LaxSlash
8a8428d002 [ticket/14395] core.viewtopic_add_quickmod_option_before 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. This event serves two purposes - one, it is easier to
add new quickmod options, and two, it allows an extenstion developer to check
additional permissions and apply further authentication for the display of the
quickmod options.

PHPBB3-14395
 2016-03-22 19:29:33 -04:00
Matt Friedman
5b3b0edd80 [ticket/12684] Use a switch statement for readability 
PHPBB3-12684
 2016-03-21 13:54:50 -07:00
Matt Friedman
00c2efca60 [ticket/12684] Refactor a test 
PHPBB3-12684
 2016-03-21 13:54:41 -07: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
4dc8841e33 [ticket/13028] Rename unanswered search label 
PHPBB3-13028
 2016-03-18 11:54:46 +01:00
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration 
PHPBB3-14318
 2016-03-18 11:04:01 +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
Tristan Darricau
04450e1fae Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
 2016-03-16 19:10:45 +01:00
Tristan Darricau
eca4726f3c Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
 2016-03-16 19:10:34 +01:00
Tristan Darricau
0194c78d19 Merge pull request #4226 from rxu/ticket/14540 
[ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance

* rxu/ticket/14540:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
 2016-03-16 19:10:06 +01:00
rxu
e610b23916 [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance 
Swapping conditions in the function accept() of the class
\phpbb\recursive_dot_prefix_filter_iterator saves a lot of isDir() calls which
is more expensive than $filename[0] checks.

PHPBB3-14540
 2016-03-17 00:50:08 +07:00
Tristan Darricau
1c61fd54d4 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14538] Update dependencies for 3.2.x
  [ticket/14538] Update composer dependencies
 2016-03-15 20:25:55 +01:00
Tristan Darricau
d8e7f865d8 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2016-03-15 20:20:28 +01:00
Tristan Darricau
a03470ac75 Merge pull request #4225 from marc1706/ticket/14538-3.2.x 
[ticket/14538] Update composer dependencies

* marc1706/ticket/14538-3.2.x:
  [ticket/14538] Update dependencies for 3.2.x
  [ticket/14538] Update composer dependencies
 2016-03-15 19:55:44 +01:00
Tristan Darricau
f1874ec416 Merge pull request #4224 from marc1706/ticket/14538 
[ticket/14538] Update composer dependencies

* marc1706/ticket/14538:
  [ticket/14538] Update composer dependencies
 2016-03-15 19:53:15 +01:00
Marc Alexander
a92ce812e7 [ticket/14538] Update dependencies for 3.2.x 
PHPBB3-14538
 2016-03-15 13:37:26 +01:00
Marc Alexander
67d58aa7b8 Merge branch 'ticket/14538' into ticket/14538-3.2.x 2016-03-15 13:30:50 +01:00
Marc Alexander
681836a84d [ticket/14538] Update composer dependencies 
PHPBB3-14538
 2016-03-15 09:53:57 +01:00
Tristan Darricau
365c99a787 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14528] Add back itemprop definitions to breadcrumbs
  [ticket/14528] Update navbar_header.html for valid microdata
 2016-03-14 06:54:25 +01:00
Tristan Darricau
5c2ef741a6 Merge pull request #4221 from marc1706/ticket/14528 
[ticket/14528] Update navbar_header.html for valid microdata

* marc1706/ticket/14528:
  [ticket/14528] Add back itemprop definitions to breadcrumbs
  [ticket/14528] Update navbar_header.html for valid microdata
 2016-03-14 06:53:40 +01:00
Marc Alexander
04fbbbe1ed [ticket/14528] Add back itemprop definitions to breadcrumbs 
PHPBB3-14528
 2016-03-13 22:50:15 +01:00
C1n
36d2ed3121 [ticket/14528] Update navbar_header.html for valid microdata 
PHPBB3-14528
 2016-03-13 22:50:01 +01:00
Marc Alexander
cc212f680d Merge branch '3.2.x' 2016-03-13 20:24:50 +01:00
Marc Alexander
186c5f4f83 Merge branch '3.1.x' into 3.2.x 2016-03-13 20:24:41 +01:00
Marc Alexander
48bdab88de Merge pull request #4217 from phpbb-fr-com/ticket/14533 
[ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL
 2016-03-13 20:24:38 +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