mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-30 21:42:55 +02:00
Code Issues Releases Wiki Activity
28,091 Commits 18 Branches 191 Tags
Commit Graph

23837 Commits

Author SHA1 Message Date
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
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
lavigor
40bd4c8b72 [ticket/14486] Use empty() and move error check. 
PHPBB3-14486
 2016-02-27 20:05:59 +03:00
Martin Beckmann
5d579631d7 [ticket/14443] substr($var, 0, 1) -> $var[0] 
PHPBB3-14443
 2016-02-27 15:17:17 +01:00
lavigor
276d48ed4f [ticket/14134] Fix code comments. 
PHPBB3-14134
 2016-02-27 16:55:05 +03: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
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
 2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316 
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
 2016-02-27 10:52:09 +01:00
rxu
cd3b93b9e2 [ticket/14366] Add core events to the function decode_message() 
Remove match/replace vars, use alternative var for the message var,
update the target phpBB version.

PHPBB3-14366
 2016-02-27 12:08:58 +07:00
rxu
2076280947 [ticket/14365] Fix a typo in the docblock. 
PHPBB3-14365
 2016-02-27 11:55:41 +07:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view 
PHPBB3-14316
 2016-02-27 11:53:19 +07:00
Marc Alexander
119d0e60e8 Merge branch '3.2.x' 2016-02-26 23:11:22 +01:00
Marc Alexander
30db51a86e Merge branch '3.1.x' into 3.2.x 2016-02-26 23:11:16 +01:00
Jakub Senko
ec70ec96e7 [ticket/14189] Add core.gen_sort_selects_after event 
PHPBB3-14189
 2016-02-26 23:10:18 +01:00
Marc Alexander
db1b73a3f4 [ticket/14496] Destroy update_list_time cache variable on intro 
PHPBB3-14496
 2016-02-26 16:58:04 +01:00
Marc Alexander
b6cf2d7284 [ticket/14496] Cache last update of update list instead of using filemtime 
PHPBB3-14496
 2016-02-26 12:07:35 +01:00
Tristan Darricau
5bdfc6167b [ticket/14499] Add command to update the board from CLI 
PHPBB3-14499
 2016-02-25 22:39:42 +01:00
Marc Alexander
37b2791837 [ticket/14497] Support second app.php script in install folder 
PHPBB3-14497
 2016-02-25 15:34:32 +01:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev 
PHPBB3-14495
 2016-02-24 22:25:41 +01:00
Tristan Darricau
49d42e2881 Merge pull request #4188 from marc1706/ticket/13842 
[ticket/13842] Prevent internal server errors without rewrite module on IIS

* marc1706/ticket/13842:
  [ticket/13842] Prevent internal server errors without rewrite module on IIS
 2016-02-22 21:36:46 +01:00