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
dad531e4b2 [ticket/14527] Add tests for reverted improper fix 
PHPBB3-14527
 2016-03-13 12:29:55 +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
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
Máté Bartus
ebbc730c73 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14523] Replace prototype definition with shared services
 2016-03-11 23:14:23 +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
5dd11735fb Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14529] Stop using --prefer-source for composer
 2016-03-11 18:54:02 +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
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
Marc Alexander
2c28138329 Merge branch '3.2.x' 2016-03-10 22:11:14 +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
6a90172e1a Merge branch '3.2.x' 2016-03-10 18:43:51 +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
Marc Alexander
f22bd4e511 [ticket/14481] Add tests for x_forwarded_proto header 
PHPBB3-14481
 2016-03-10 14:49:23 +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
Callum Macrae
8058967e7f [ticket/14422] Support cmd+enter for submitting message 
PHPBB3-14422
 2016-03-10 12:31:04 +01:00
Marc Alexander
8a6c82a0ef Merge branch '3.2.x' 2016-03-10 12:19:34 +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
Marc Alexander
b758c098d3 [ticket/14523] Replace prototype definition with shared services 
PHPBB3-14523
 2016-03-10 10:41:00 +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
Tristan Darricau
a9df243772 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
 2016-03-09 21:54:25 +01:00
Tristan Darricau
2c813e6e5e Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
 2016-03-09 21:53:45 +01:00
Tristan Darricau
61e0247f22 Merge pull request #4192 from marc1706/ticket/14496 
[ticket/14496] Cache last update of update list instead of using filemtime

* marc1706/ticket/14496:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
 2016-03-09 21:53:14 +01:00
Marc Alexander
0a983d219a Merge branch '3.2.x' 2016-03-09 21:00:18 +01:00
Marc Alexander
5d0f02ce7f Merge pull request #4208 from CHItA/ticket/13264 
[ticket/13264]  Don't force approved state if post visibility is known (3.2)
 2016-03-09 20:59:57 +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
98ea7252d3 Merge branch '3.2.x' 
* 3.2.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:43:32 +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
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
Matt Friedman
00bf1ef8b8 [ticket/12684] Update option help 
PHPBB3-12684
 2016-03-08 10:46:34 -08: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
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
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
e6e87ab214 Merge branch '3.2.x' 
* 3.2.x:
  [release-3.2.0-b2] Update versions to 3.2.0-3-dev
 2016-03-07 17:38:34 +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