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

25837 commits

Author SHA1 Message Date
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
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
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
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
Tristan Darricau
480a1be94c [prep-release-3.2.0-b2] Add schema.json 2016-03-03 22:54:13 +01:00
Tristan Darricau
97bf5e8a8d [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 2016-03-03 22:54:13 +01: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
Richard McGirr
83fd8e88d6 [ticket/14508] Adjust account inactive language 
PHPBB3-14508
 2016-03-03 06:55:36 -05:00
Tristan Darricau
20dd65ff1a [prep-release-3.2.0-b2] Update version to 3.2.0-b2 2016-03-02 22:05:58 +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
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
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
Matt Friedman
d17a8ab523 [ticket/12684] Fix merge errors 
PHPBB3-12684
 2016-02-29 08:28:37 -08:00