mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Code Issues Releases Wiki Activity
28,779 Commits 18 Branches 192 Tags
cd348b200a6d3711eee6b8f028d9c7caef268e5f
Commit Graph

3128 Commits

Author SHA1 Message Date
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration 
PHPBB3-14318
 2016-03-18 11:04:01 +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
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
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
Skouat
3e278bcf0a [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL 
PHPBB3-14533
 2016-03-12 20:53:42 +01:00
Marc Alexander
215fad420f [ticket/14241] Log fatal captcha error to error log 
PHPBB3-14241
 2016-03-12 10:24:07 +01:00
Marc Alexander
4c5c289f75 [ticket/14241] Prevent empty q&a as a result of improper settings 
Improper setup of the q&a captcha in combination with the admin choosing a
default language that does not have any questions and answers set might
result in the user being presented empty questions and answers. This
change will try to fall back to any question in case the admin incorrectly
set the default language and has no questions & answers set. If that does
not work, the captcha will not allow passing it and suggest to contact the
board admin to resolve this issue.

PHPBB3-14241
 2016-03-11 10:51:07 +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
Matt Friedman
5917a8e72e [ticket/12684] Use interactive method correctly 
PHPBB3-12684
 2016-03-09 17:40:58 -08:00
Matt Friedman
693664f278 [ticket/12684] Extract interactivity to a method 
PHPBB3-12684
 2016-03-09 15:16:23 -08:00
Máté Bartus
6c814ef641 Merge branch '3.2.x' 
* 3.2.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
 2016-03-08 22:19:54 +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
Máté Bartus
7c45ed0733 Merge pull request #4206 from marc1706/ticket/14519 
[ticket/14519] Skip query if all unread notifications are retrieved
 2016-03-08 22:09:02 +01:00
Máté Bartus
a0fa396901 Merge pull request #4207 from marc1706/ticket/14132 
[ticket/14132] Use transaction for adding notifications to type table
 2016-03-08 22:07:33 +01:00
Máté Bartus
05ccbc512d Merge pull request #4204 from marc1706/ticket/14483 
[ticket/14483] Do not send headers by default on access via controller
 2016-03-08 22:07:11 +01:00
Marc Alexander
10004c4032 [ticket/14132] Use transaction for adding notifications to type table 
This will prevent a race condition that might occur by two posts being
submitted at the same time with the notification type IDs not being
cached.

PHPBB3-14132
 2016-03-08 12:36:29 +01:00
Marc Alexander
9fcd0b116b [ticket/14519] Skip query if all unread notifications are retrieved 
PHPBB3-14519
 2016-03-08 12:15:21 +01:00
Matt Friedman
0f8790dd2e [ticket/12684] Add extended help for the user:add command 
PHPBB3-12684
 2016-03-08 00:34:27 -08:00
Matt Friedman
0c1e7c2f9c [ticket/12684] Add shorthand alternates to the options 
PHPBB3-12684
 2016-03-08 00:34:27 -08:00
Marc Alexander
a1b7a5aedc Merge branch '3.2.x' 2016-03-07 09:52:36 +01:00
Marc Alexander
c00e45d30e Merge branch '3.1.x' into 3.2.x 2016-03-07 09:52:30 +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
Oliver Schramm
b77856a903 [ticket/14514] Don't skip users when converting passwords 
PHPBB3-14514
 2016-03-06 16:11:29 +01:00
Matt Friedman
cc941e6e05 [ticket/12684] Remove whitespace 
PHPBB3-12684
 2016-03-05 10:41:35 -08:00
Matt Friedman
8c5d6efad5 [ticket/12684] Add an error on user creation failure 
PHPBB3-12684
 2016-03-05 09:20:04 -08:00
Tristan Darricau
517c1f8825 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 2016-03-03 22:53:53 +01:00
Tristan Darricau
0e6bcd166c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14510] Prevent infinite loop in add_bots task
 2016-03-02 21:51:37 +01:00
Máté Bartus
fa2ae3a14b [ticket/14510] Prevent infinite loop in add_bots task 
PHPBB3-14510
 2016-03-02 21:48:10 +01:00
Marc Alexander
43ffffca5f Merge branch '3.2.x' 2016-03-01 21:52:29 +01:00
Marc Alexander
a38a6ec7f5 Merge pull request #4196 from CHItA/ticket/14487 
[ticket/14487] Try to handle connection timeouts
 2016-03-01 21:52:05 +01:00
Matt Friedman
7b0452e53a [ticket/12684] Remove unnecessary null arguments 
PHPBB3-12684
 2016-02-29 23:24:01 -08:00
Matt Friedman
07b8c0663d [ticket/12684] Additional clean up 
PHPBB3-12684
 2016-02-29 21:04:41 -08:00
Matt Friedman
b17f9fc81c [ticket/12684] Allowed to use $this in enclosure 
PHPBB3-12684
 2016-02-29 21:04:16 -08:00
Matt Friedman
0ca4484525 [ticket/12684] Move all lang keys to cli 
PHPBB3-12684
 2016-02-29 21:03:32 -08:00
Matt Friedman
e905c6226d [ticket/12684] Fix a few mistakes and clean it up 
PHPBB3-12684
 2016-02-29 16:52:17 -08:00
Matt Friedman
97c6cce687 [ticket/12684] Some code clean up 
PHPBB3-12684
 2016-02-29 14:50:19 -08:00
Matt Friedman
a84f77bf25 [ticket/12684] Another little fix 
PHPBB3-12684
 2016-02-29 14:28:02 -08:00
Matt Friedman
fe31060fca [ticket/12684] Fix tests 
PHPBB3-12684
 2016-02-29 14:23:32 -08:00
Máté Bartus
b1a136e7bd [ticket/14487] Add missing use statement 
PHPBB3-14487
 2016-02-29 23:23:31 +01:00
Matt Friedman
637b02690d [ticket/12684] Update to use non-deprecated methods 
PHPBB3-12684
 2016-02-29 13:28:42 -08:00
Marc Alexander
b324cf1907 Merge branch '3.2.x' 2016-02-29 21:45:16 +01:00
Marc Alexander
b80cb8e796 Merge pull request #4194 from Nicofuma/ticket/14499 
[ticket/14499] Add command to update the board from CLI
 2016-02-29 21:45:11 +01:00
Matt Friedman
f32b4c0547 [ticket/12684] Add send email option 
PHPBB3-12684
 2016-02-29 11:42:23 -08:00
Matt Friedman
d373428180 [ticket/12684] Add input validation 
PHPBB3-12684
 2016-02-29 11:41:47 -08:00
Matt Friedman
6fe084a2fd [ticket/12684] Updates for 3.2 API 
PHPBB3-12684
 2016-02-29 11:41:07 -08:00
Tristan Darricau
52dffef03c [ticket/14499] Fix wording and comments 
PHPBB3-14499
 2016-02-29 20:27:12 +01:00
Tristan Darricau
8f7aba6582 [ticket/12684] Fix header file 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00
Tristan Darricau
df4a620ba1 [ticket/12684] Fix tests 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00