mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity
28,483 Commits 18 Branches 192 Tags
Commit Graph

3048 Commits

Author SHA1 Message Date
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
Tristan Darricau
8f7aba6582 [ticket/12684] Fix header file 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00
Tristan Darricau
df4a620ba1 [ticket/12684] Fix tests 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00
LEZY Thomas
50761104ba [ticket/12684] Add doc blocks and test file for user:add 
PHPBB3-12684
 2016-02-29 08:13:42 -08:00
LEZY Thomas
0102fa3f2d [ticket/12684] Add command user:add 
PHPBB3-12684
 2016-02-29 08:13:42 -08:00
Tristan Darricau
8ec1a60156 [ticket/14499] Add missing config settings 
PHPBB3-14499
 2016-02-28 20:49:18 +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
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
Tristan Darricau
5bdfc6167b [ticket/14499] Add command to update the board from CLI 
PHPBB3-14499
 2016-02-25 22:39:42 +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
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
Tristan Darricau
b7deef46ac Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
 2016-02-18 22:00:10 +01:00
Tristan Darricau
6e4ab6509b Merge pull request #4185 from marc1706/ticket/13681 
[ticket/13681] Invalidate and reset opcache where necessary

* marc1706/ticket/13681:
  [ticket/13681] Invalidate and reset opcache where necessary
 2016-02-18 21:55:11 +01:00
Marc Alexander
f6fd819764 Merge pull request #4165 from Nicofuma/ticket/14457 
[ticket/14457] Uses a random placeholder to inject css and js
 2016-02-18 21:52:48 +01:00
Marc Alexander
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary 
PHPBB3-13681
 2016-02-18 19:03:56 +01:00
Joas Schilling
ab6e0bbef9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/composer.lock
 2016-02-18 18:42:39 +01:00
Joas Schilling
9745d8d80e Add migration for 3.1.8 2016-02-18 18:04:47 +01:00
Tristan Darricau
97bbf2d2b8 [ticket/14457] Handle the case where there isn't any 'definition' bag 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
f7c5098c60 [ticket/14457] CS 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
f253a853b8 [ticket/14457] Fix twig/twig::assign_display 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
d0ce6a18df Merge pull request #4171 from CHItA/ticket/14462 
[ticket/14462] Try to prevent timeouts in the installer

* CHItA/ticket/14462:
  [ticket/14462] Not show timeout messages in convertors
  [ticket/14462] Make timeout error translateable
  [ticket/14462] Update ordering in install db config
  [ticket/14462] Fix comments
  [ticket/14462] Fix tests
  [ticket/14462] Fix CS and typo
  [ticket/14462] Set instance of db driver for database access using global
  [ticket/14462] Fix installation in tests
  [ticket/14462] Refactor tasks to be more modular
  [ticket/14462] Further speed improvements
 2016-02-16 00:06:52 +01:00
Marc Alexander
accf8f8625 [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https 
PHPBB3-14481
 2016-02-15 22:06:25 +01:00
Joas Schilling
8663edce76 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2016-02-13 18:08:01 +01:00
Joas Schilling
9590ff3c18 Merge pull request #4176 from Elsensee/ticket/14409 
[ticket/14409] Update session page info before displaying online list
 2016-02-13 16:45:04 +01:00
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list 
PHPBB3-14409
 2016-02-13 15:58:05 +01:00
Joas Schilling
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
Mate Bartus
2efceffaeb [ticket/14462] Fix comments 
PHPBB3-14462
 2016-02-12 23:30:32 +01:00
Mate Bartus
7c0fb563ec [ticket/14462] Fix CS and typo 
PHPBB3-14462
 2016-02-12 15:38:34 +01:00
Mate Bartus
68091561ab [ticket/14462] Refactor tasks to be more modular 
PHPBB3-14462
 2016-02-12 14:31:28 +01:00