mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 09:00:48 +01:00
Code Issues Releases Wiki Activity
28,003 Commits 18 Branches 191 Tags
Commit Graph

28003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
a9b6a537c5 Merge pull request #4243 from marc1706/ticket/14136-3.2.x 
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136-3.2.x:
  [ticket/14136] Add back X-UA-Compatible meta tag
 2016-03-24 18:00:42 +01:00
Tristan Darricau
7e2c8f1885 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14536] Force unix time stamps to be integer
 2016-03-24 17:53:57 +01:00
Tristan Darricau
dcb6154be7 Merge pull request #4222 from marc1706/ticket/14536 
[ticket/14536] Force unix time stamps to be integer

* marc1706/ticket/14536:
  [ticket/14536] Force unix time stamps to be integer
 2016-03-24 17:53:34 +01:00
Marc Alexander
51c243f76b Merge branch '3.1.x' into 3.2.x 2016-03-24 17:22:07 +01:00
Marc Alexander
1721965c38 Merge pull request #4241 from rxu/ticket/14051 
[ticket/14051] Restore accidentally removed $topics_count value
 2016-03-24 17:21:56 +01:00
Marc Alexander
d817da6049 Merge pull request #4227 from Senky/ticket/14318 
[ticket/14318] Fix SQL error in Notifications Board migration
 2016-03-24 16:33:15 +01:00
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
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
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
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
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration 
PHPBB3-14318
 2016-03-18 11:04:01 +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
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
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
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
Skouat
3e278bcf0a [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL 
PHPBB3-14533
 2016-03-12 20:53:42 +01:00
Máté Bartus
b0fe454163 Merge pull request #4209 from marc1706/ticket/14523 
[ticket/14523] Replace prototype definition with shared services
 2016-03-11 23:12:25 +01:00
Tristan Darricau
eef7a4dbf4 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14529] Stop using --prefer-source for composer
 2016-03-11 18:53:36 +01:00
Tristan Darricau
d142bebdd6 Merge pull request #4216 from marc1706/ticket/14529 
[ticket/14529] Stop using --prefer-source for composer

* marc1706/ticket/14529:
  [ticket/14529] Stop using --prefer-source for composer
 2016-03-11 18:53:13 +01:00
Marc Alexander
2337d9dd27 [ticket/14529] Stop using --prefer-source for composer 
The api rate limit has been removed by github. Therefore,
we no longer need --prefer-source

PHPBB3-14529
 2016-03-11 17:51:02 +01:00
Marc Alexander
18fea1b286 Merge branch '3.1.x' into 3.2.x 2016-03-10 22:11:07 +01:00
Marc Alexander
9288a50bcf Merge pull request #4211 from marc1706/ticket/14422 
[ticket/14422] Support cmd+enter & ctrl+enter for submitting message
 2016-03-10 22:09:19 +01:00
Marc Alexander
ad8363ae57 Merge pull request #4213 from RMcGirr83/TICKET_13972 
[ticket/13972] Remove hard coded flood check from posting
 2016-03-10 18:43:47 +01:00
Marc Alexander
1f25f710ea [ticket/14422] Submit when pressing ctrl or cmd + enter 
PHPBB3-14422
 2016-03-10 15:08:12 +01:00
Jakub Senko
795ce6ccf1 [ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event 
PHPBB3-14471
 2016-03-10 13:25:43 +01:00
Richard McGirr
b0bedce662 [ticket/13972] Remove hard coded flood check from posting 
PHPBB3-13972
 2016-03-10 06:48:36 -05:00