makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
27976 commits 18 branches 192 tags 207 MiB
Commit graph

23741 commits

Author SHA1 Message Date
Marc Alexander
0a983d219a Merge branch '3.2.x' 2016-03-09 21:00:18 +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
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
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
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
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
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
Máté Bartus
b1a136e7bd [ticket/14487] Add missing use statement 
PHPBB3-14487
 2016-02-29 23:23:31 +01: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
Tristan Darricau
52dffef03c [ticket/14499] Fix wording and comments 
PHPBB3-14499
 2016-02-29 20:27:12 +01:00
Máté Bartus
dacbf09227 [ticket/14487] Add loading indicator while polling status 
PHPBB3-14487
 2016-02-29 16:40:09 +01:00
Máté Bartus
8993fef9c0 [ticket/14487] Update javascript 
PHPBB3-14487
 2016-02-29 16:18:35 +01:00
Tristan Darricau
8ec1a60156 [ticket/14499] Add missing config settings 
PHPBB3-14499
 2016-02-28 20:49:18 +01:00
Máté Bartus
72bdbf52cc Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14503] Enable superglobals in cli
 2016-02-28 14:50:32 +01:00
Máté Bartus
062358f8b1 [ticket/14487] Try to handle connection timeouts 
PHPBB3-14487
 2016-02-28 14:05:07 +01:00
Marc Alexander
f65207b935 [ticket/14503] Enable superglobals in cli 
This is for example needed for outputting help on commands.

PHPBB3-14503
 2016-02-28 12:28:21 +01:00
Marc Alexander
f259a451bb Merge branch '3.2.x' 2016-02-28 10:16:09 +01:00
Marc Alexander
b490be1f81 Merge branch '3.1.x' into 3.2.x 2016-02-28 10:15:47 +01:00
Marc Alexander
a4040e53b7 Merge pull request #4153 from gn36/ticket/14443 
[ticket/14443] Introduce additional parameter to messenger
 2016-02-28 10:15:41 +01:00
Martin Beckmann
5d579631d7 [ticket/14443] substr($var, 0, 1) -> $var[0] 
PHPBB3-14443
 2016-02-27 15:17:17 +01:00
Marc Alexander
af99569432 Merge branch '3.2.x' 2016-02-27 12:44:54 +01:00
Marc Alexander
cb6ae863f5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/functions_content.php
 2016-02-27 12:44:28 +01:00
Marc Alexander
747a70964e Merge pull request #4086 from rxu/ticket/14366 
[ticket/14366] Add core events to the function decode_message()
 2016-02-27 11:41:50 +01:00
Marc Alexander
a21d1680d2 Merge branch '3.2.x' 2016-02-27 11:05:10 +01:00
Marc Alexander
7c41be4f51 Merge branch '3.1.x' into 3.2.x 2016-02-27 11:04:55 +01:00
Marc Alexander
ee7cba5df7 Merge pull request #4085 from rxu/ticket/14365 
[ticket/14365] Add core event to the function topic_review()
 2016-02-27 11:04:52 +01:00
Marc Alexander
47f70a4cfd Merge branch '3.2.x' 2016-02-27 10:55:17 +01:00