mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 07:07:51 +02:00
Code Issues Releases Wiki Activity
27,933 Commits 18 Branches 192 Tags
Commit Graph

1536 Commits

Author SHA1 Message Date
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
62a2619300 [ticket/14483] Do not send headers by default on access via controller 
PHPBB3-14483
 2016-03-06 21:10:42 +01:00
Tristan Darricau
58359b1587 [ticket/14457] Replaces unique_id implementation by random_bytes() 
PHPBB3-14457
 2016-02-18 17:30:31 +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
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list 
PHPBB3-14409
 2016-02-13 15:58:05 +01:00
Marc Alexander
8e5b5a5c07 Merge branch '3.1.x' 2016-01-16 23:10:37 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events 
PHPBB3-14412
 2016-01-15 14:07:50 +03:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables 
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
 2016-01-06 13:52:11 +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
Tristan Darricau
f14a9b7069 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14261] Fix tests by removing old code.
  [ticket/14261] Move the update of session informations to page_footer()
 2015-12-07 21:52:38 +01:00
Zoddo
88dd8a4849 [ticket/14261] Move the update of session informations to page_footer() 
Currently, the unique way to disable the update of session_page is to pass
"false" to the parameter of session_begin(). This method is directly
called in app.php, so pages served from the routing system can't disable
the update of session informations.

By moving the update to page_footer, we can allow controllers to tell to
the session manager that we don't want to update the session infos.

PHPBB3-14261
 2015-10-27 17:26:18 +01:00
Cesar G
a246cb6414 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14249] Fix online list order
 2015-10-22 10:05:25 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order 
PHPBB3-14249
 2015-10-21 21:51:43 +02:00
Tristan Darricau
ce45813e2c Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13591] Change SQL query into array to allow
 2015-10-12 10:20:32 +02:00
Tristan Darricau
2668fa42ad Merge pull request #3946 from RMcGirr83/ticket_13591 
[ticket/13591] Change SQL query into array to allow

* RMcGirr83/ticket_13591:
  [ticket/13591] Change SQL query into array to allow
 2015-10-12 10:20:16 +02:00
Tristan Darricau
fcf797c3f2 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14200] Allow hidden users to see himself on viewonline
 2015-10-12 09:20:13 +02:00
Zoddo
8eb9ce50b0 [ticket/14200] Allow hidden users to see himself on viewonline 
PHPBB3-14200
 2015-10-10 16:33:40 +02:00
RMcGirr83
8a52ccc938 [ticket/13591] Change SQL query into array to allow 
extension authors to modify SQL query

PHPBB3-13591
 2015-10-08 14:18:45 -04:00
Michael Miday
956723af0e [ticket/12769] Properly include FA 2015-09-17 18:37:25 +02:00
Tristan Darricau
b83ce0a702 Merge pull request #3876 from VSEphpbb/ticket/14138 
[ticket/14138] Use span tags instead of abbr

* VSEphpbb/ticket/14138:
  [ticket/14138] Use span tags instead of abbr
 2015-09-09 11:02:22 +02:00
Marc Alexander
9d18b3d1ee Merge branch '3.1.x' 2015-09-08 13:35:04 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers 
PHPBB3-14142
 2015-09-04 13:38:14 -07:00
Matt Friedman
b4dbb5b249 [ticket/14138] Use span tags instead of abbr 
PHPBB3-14138
 2015-09-01 15:13:12 -07:00
Tristan Darricau
9e0a075be1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
 2015-08-28 16:28:59 +02:00
Tristan Darricau
90d18356a0 Merge pull request #3809 from marc1706/ticket/14070 
[ticket/14070] Properly pass whether config should be ignored for avatars

* marc1706/ticket/14070:
  [ticket/14070] Properly pass whether config should be ignored for avatars
 2015-08-28 16:27:05 +02:00
Máté Bartus
e8219e8610 Merge pull request #3470 from Nicofuma/ticket/13645 
[ticket/13645] Move the feeds to controllers
 2015-08-28 10:39:07 +02:00
Tristan Darricau
6af8c579e0 [ticket/13897] Make dependency to the filesystem optional in error handler 
PHPBB3-13897
 2015-08-25 21:44:40 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Marc Alexander
1956bd4bba Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
Marc Alexander
668defcf57 Merge pull request #3784 from Senky/ticket/14043 
[ticket/14043] Add core.get_avatar_after php event
 2015-08-09 10:31:37 +02:00
Marc Alexander
f4c1796d5e [ticket/14070] Properly pass whether config should be ignored for avatars 
PHPBB3-14070
 2015-08-05 17:46:17 +02:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event 
PHPBB3-14043
 2015-08-02 20:27:05 +02:00
Jakub Senko
c6a654e859 [ticket/14043] Add dispatcher to globals, change @since value 
PHPBB3-14043
 2015-07-22 13:55:26 +02:00
Jakub Senko
5e3ebda0da [ticket/14043] Add core.get_avatar_after php event 
PHPBB3-14043
 2015-07-21 21:20:24 +02:00
Nicofuma
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class 
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
 2015-07-13 22:41:13 +02:00
Tristan Darricau
58d1d37c16 Merge pull request #3747 from rxu/ticket/13377 
[ticket/13377] Fix decoding for www type URLs in function decode_message()
 2015-07-13 17:36:35 +02:00
Marc Alexander
01097a24b5 Merge branch '3.1.x' 
Conflicts:
	tests/template/template_includecss_test.php
 2015-07-08 22:54:26 +02:00
Matt Friedman
04d34e6c8b [ticket/13995] Invalid avatar HTML missing space between elements 
PHPBB3-13995
 2015-07-07 20:10:18 -07:00
rxu
1365519283 [ticket/13377] Fix decoding for www type URLs in function decode_message() 
PHPBB3-13377
 2015-07-07 22:30:20 +07:00
Marc Alexander
ef890e3363 Merge branch '3.1.x' 2015-06-17 15:39:12 +02:00
Matt Friedman
4f05364eb9 [ticket/13882] Add lazy load avatars to phpbb wrappers 
PHPBB3-13882
 2015-06-16 11:58:31 -07:00
Marc Alexander
80768b526b Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/user_loader.php
 2015-06-16 12:35:51 +02:00
Marc Alexander
dc9245dd7a Merge pull request #3653 from callumacrae/ticket/13882 
[ticket/13882] Lazy load the notification avatars.
 2015-06-16 12:33:17 +02:00
Andreas Fischer
2eceaaddf6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10711] Duplicate key error on forum_tracks_table
 2015-06-13 16:27:44 +02:00
Andreas Fischer
89f7fc63e8 Merge pull request #3703 from javiexin/ticket/10711 
[ticket/10711] Duplicate key error on forum_tracks_table

* javiexin/ticket/10711:
  [ticket/10711] Duplicate key error on forum_tracks_table
 2015-06-13 16:27:44 +02:00
javiexin
7b026eff79 [ticket/10711] Duplicate key error on forum_tracks_table 
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).

The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.

PHPBB3-10711
 2015-06-13 01:08:18 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Callum Macrae
9366f29fd7 [ticket/13882] no more egyptian brackets /o/ 
PHPBB3-13882
 2015-05-30 10:48:38 +02:00
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844 
Ticket/13844 Better FAQ language files
 2015-05-29 15:44:39 +02:00
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars. 
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
 2015-05-28 18:05:07 +02:00