mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00
Code Issues Releases Wiki Activity
28,174 Commits 17 Branches 190 Tags
Commit Graph

28174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f55a61d067 Merge pull request #4203 from Elsensee/ticket/14514 
[ticket/14514] Don't skip users when converting passwords
 2016-03-07 09:51:31 +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
Marc Alexander
3d7d0c40b8 [ticket/14437] Make sure attachments array is properly ordered before processing 
PHPBB3-14437
 2016-03-06 11:22:53 +01:00
Marc Alexander
f1772ce7e5 [ticket/14437] Preserve attachment ID order by ordering by attach_id 
PHPBB3-14437
 2016-03-06 10:40:42 +01:00
Marc Alexander
1e10664739 [ticket/14437] Sort attachments after assigning inline attachments 
This does not seem to cause any issues but prevents us from having to consider
the currenty display order.

PHPBB3-14437
 2016-03-06 00:14:47 +01:00
Marc Alexander
4e717c1725 [ticket/14497] Do not check for doctype on index and use correct return 
PHPBB3-14497
 2016-03-05 22:19:03 +01:00
Marc Alexander
5fc3177395 [ticket/14497] Add test for visiting installer 
PHPBB3-14497
 2016-03-05 21:23:24 +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
Marc Alexander
293a42e7c5 [ticket/14497] Use nginx sample config in travis tests 
PHPBB3-14497
 2016-03-05 15:46:40 +01:00
Marc Alexander
e5344ae135 Merge branch '3.2.x' 2016-03-05 12:12:36 +01:00
Marc Alexander
f53a27e891 Merge branch '3.1.x' into 3.2.x 2016-03-05 12:12:27 +01:00
Marc Alexander
ad23b2330c Merge pull request #4200 from RMcGirr83/ticket_14508 
[ticket/14508] Change language notice on account activation
 2016-03-05 12:12:20 +01:00
Richard McGirr
83fd8e88d6 [ticket/14508] Adjust account inactive language 
PHPBB3-14508
 2016-03-03 06:55:36 -05: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
Tristan Darricau
942383d743 Merge pull request #4201 from CHItA/ticket/14510 
[ticket/14510] Prevent infinite loop in add_bots task

* CHItA/ticket/14510:
  [ticket/14510] Prevent infinite loop in add_bots task
 2016-03-02 21:51:19 +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
Richard McGirr
65ce507dda [ticket/14508] Change language notice on account activation 
PHPBB3-14508
 2016-03-02 07:05:37 -05: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