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

27944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f0a33dca72 Merge pull request #4197 from marc1706/ticket/14503 
[ticket/14503] Enable superglobals in cli
 2016-02-28 14:45:04 +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
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
Marc Alexander
e8f29d9fb6 Merge branch '3.2.x' 2016-02-27 10:47:05 +01:00
Marc Alexander
24fd031648 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
 2016-02-27 10:46:45 +01:00
Marc Alexander
3a6e6b997a Merge pull request #4195 from marc1706/ticket/14500 
[ticket/14500] Specify prevversion instead of duplicate newversion
 2016-02-27 10:45:12 +01:00
Marc Alexander
8e6a21955a [ticket/14500] Specify prevversion instead of duplicate newversion 
PHPBB3-14500
 2016-02-27 09:48:29 +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
Tristan Darricau
5bdfc6167b [ticket/14499] Add command to update the board from CLI 
PHPBB3-14499
 2016-02-25 22:39:42 +01:00
Máté Bartus
f249c52af6 Merge pull request #4191 from Nicofuma/ticket/14495 
[ticket/14495] Updates the version to 3.3.0-a1-dev
 2016-02-25 12:30:04 +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
68996e527e Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13842] Prevent internal server errors without rewrite module on IIS
 2016-02-22 21:37:21 +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
Tristan Darricau
d17257c346 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14488] Delete cookies to get correct session ID during login
 2016-02-22 21:34:36 +01:00
Tristan Darricau
58e3c06a24 Merge pull request #4186 from marc1706/ticket/14488 
[ticket/14488] Delete cookies to get correct session ID during login

* marc1706/ticket/14488:
  [ticket/14488] Delete cookies to get correct session ID during login
 2016-02-22 21:34:04 +01:00
Marc Alexander
43e87e3e63 [ticket/13842] Prevent internal server errors without rewrite module on IIS 
PHPBB3-13842
 2016-02-19 17:01:58 +01:00
Marc Alexander
811f1573de Merge branch '3.2.x' 2016-02-19 10:10:55 +01:00
Marc Alexander
078116e189 Merge pull request #4187 from markshawtoronto/ticket/14489 
[ticket/14489] Fix bug where extension custom compiler pass cannot be found
 2016-02-19 10:10:52 +01:00
Mark Shaw
632418ad6e [ticket/14489] Fix bug where extension custom compiler pass cannot be found. 
This is returning an extra / on my machine which throws off the next code block, and then the class can't be found.

PHPBB3-14489
 2016-02-18 23:56:53 -05:00