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

25509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
e5104b5d53 Merge pull request #3285 from MGaetan89/ticket/13497 
[ticket/13497] Change get_tables() calls with $db_tools->sql_list_tables()
 2015-02-13 12:09:40 +01:00
Marc Alexander
4756fa5262 Merge branch 'develop-ascraeus' into develop 2015-02-13 12:06:42 +01:00
Marc Alexander
9e3bc9a3f9 Merge branch 'develop-olympus' into develop-ascraeus 
Conflicts:
	.travis.yml
	travis/phpunit-mysqli-travis.xml
 2015-02-13 12:06:07 +01:00
Marc Alexander
877774a296 Merge pull request #3393 from bantu/ticket/13599 
[ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
 2015-02-13 12:02:25 +01:00
Andreas Fischer
0a775e0433 [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported. 
PHPBB3-13599
 2015-02-12 22:12:32 +01:00
Gaëtan Muller
50478e68b0 [ticket/13497] Update calls to get_tables() 
PHPBB3-13497
 2015-02-11 21:28:11 +01:00
Andreas Fischer
39a3f4f6c8 Merge pull request #3391 from marc1706/ticket/13597 
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7

* marc1706/ticket/13597:
  [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
 2015-02-11 16:53:25 +01:00
Andreas Fischer
069738a1f2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
 2015-02-11 16:53:25 +01:00
brunoais
93185574b5 [ticket/13142] BUMPed version 
PHPBB3-13142
 2015-02-11 11:42:43 +00:00
Marc Alexander
3df25babce [ticket/13597] Modify variable-variable syntax to be compatible with PHP7 
PHPBB3-13597
 2015-02-11 12:03:54 +01:00
brunoais
bf20fb03ef [ticket/13592] The name didn't make proper sense 
PHPBB3-13592
 2015-02-11 10:56:36 +00:00
rxu
67a963ac42 [ticket/13596] Add display_forums() event to allow modifying forums list data 
Add display_forums() core event in includes/functions_display.php to allow
modifying forums list data before the list is being generated and dumped
to the template.

PHPBB3-13596
 2015-02-10 10:05:44 +07:00
Nicofuma
acf3744297 Merge pull request #3332 from nickvergessen/ticket/10748-mssql 
[ticket/10748] Split MS SQL from the db tools file into it's own
 2015-02-09 17:11:09 +01:00
brunoais
74385b8fce [ticket/13592] Empty line before event comment block. 
I had forgotten this one

PHPBB3-13592
 2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74 [ticket/13592] Removed unwanted space in self line. 
PHPBB3-13592
 2015-02-09 11:56:53 +00:00
brunoais
bb7d294190 [ticket/13592] Allow full override of get_visibility_sql() 
PHPBB3-13592
 2015-02-09 10:44:12 +00:00
brunoais
8a4df90dac [ticket/13592] Allow changing get_visibility_sql's result 
PHPBB3-13592
 2015-02-09 08:42:37 +00:00
brunoais
1bcce75633 [ticket/13592] Allow changing get_visibility_sql's result 
PHPBB3-13592
 2015-02-08 23:52:27 +00:00
rxu
072df2217c [ticket/13591] Add core events to the function obtain_users_online_string() 
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.

PHPBB3-13591
 2015-02-08 12:28:28 +07:00
n-aleha
e1eac80b8f [ticket/13586] Allow '0' as username with Jabber notifications 
PHPBB3-13586
 2015-02-07 19:33:19 +02:00
Joas Schilling
74d1b1812f [ticket/10748] Overwrite the type map correctly 
PHPBB3-10748
 2015-02-07 14:41:40 +01:00
Joas Schilling
37ae99c75d [ticket/10748] Replace direct creations of tools(); 
PHPBB3-10748
 2015-02-07 14:41:39 +01:00
Joas Schilling
4ea90ca44d [ticket/10748] Split MS SQL from the db tools file into it's own 
PHPBB3-10748
 2015-02-07 14:36:26 +01:00
Joas Schilling
b0c910e49c Merge branch 'develop-ascraeus' into develop 2015-02-07 14:33:37 +01:00
Joas Schilling
c6a371531b Merge pull request #3379 from Crizz0/ticket/13588 
[ticket/13588] Fixes wrong message in info fsockopen() disabled
 2015-02-07 14:33:34 +01:00
Crizzo
fbc603861d [ticket/13588] Fixes wrong message in info fsockopen() disabled 
PHPBB3-13588
 2015-02-07 13:50:08 +01:00
Marc Alexander
1da6b30cf0 [ticket/13568] Add unit tests for validating absolute path 
PHPBB3-13568
 2015-02-06 10:39:55 +01:00
Marc Alexander
cd85f1b632 Merge branch 'ticket/13568' into ticket/13568-asc 
Conflicts:
	phpBB/adm/index.php
	phpBB/includes/acp/acp_attachments.php
 2015-02-06 10:19:39 +01:00
Marc Alexander
7c5d872344 [ticket/13568] Also check if absolute_path_writable is writable 
PHPBB3-13568
 2015-02-06 10:15:36 +01:00
Marc Alexander
48b64b0a61 [ticket/13577] Skip filespec test requiring mimetype check on windows 
PHPBB3-13577
 2015-02-05 13:37:34 +01:00
Andreas Fischer
e4064ca839 Merge pull request #3207 from Nicofuma/ticket/13407 
[ticket/13407] Update Symfony to 2.7.*@dev

* Nicofuma/ticket/13407:
  [ticket/13407] Update composer.lock file
  [ticket/13407] Bump minimal version to php 5.3.9
  [ticket/13407] Introduce a request_stack service
  [ticket/13407] Remove the last occurence of pattern in routing files
  [ticket/13407] Update Symfony to 2.7.*@dev
 2015-02-04 21:14:01 +01:00
Andreas Fischer
3267c6a61a Merge pull request #3257 from MGaetan89/ticket/13455 
[ticket/13455] Change request_var() calls with $request->variable()

* MGaetan89/ticket/13455:
  [ticket/13455] Remove `request_var()` references from comments
  [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
  [ticket/13455] Update calls to `request_var()`
 2015-02-04 21:09:54 +01:00
Nicofuma
e323c7c23a [ticket/13407] Update composer.lock file 
PHPBB3-13407
 2015-02-04 17:48:10 +01:00
Nicofuma
b8939da242 [ticket/13407] Bump minimal version to php 5.3.9 
PHPBB3-13407
 2015-02-04 17:40:18 +01:00
Nicofuma
73d3d02af1 [ticket/13407] Introduce a request_stack service 
PHPBB3-13407
 2015-02-04 17:40:14 +01:00
Nicofuma
216fb13c2a [ticket/13407] Remove the last occurence of pattern in routing files 
PHPBB3-13407
 2015-02-04 17:40:11 +01:00
Nicofuma
9e104b0915 [ticket/13407] Update Symfony to 2.7.*@dev 
PHPBB3-13407
 2015-02-04 17:40:06 +01:00
Marc Alexander
c1d644769f [ticket/13577] Skip functional tests requiring fileinfo if not enabled 
PHPBB3-13577
 2015-02-04 15:24:25 +01:00
Gaëtan Muller
52446c8327 [ticket/13455] Remove request_var() references from comments 
PHPBB3-13455
 2015-02-03 20:56:48 +01:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Andreas Fischer
f9ab676530 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
 2015-02-03 20:36:53 +01:00
Andreas Fischer
1e4853507a Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2015-02-03 20:36:46 +01:00
Andreas Fischer
8832851b8e Merge pull request #3366 from marc1706/ticket/13348 
[ticket/13348] Use close method to free feed query result handle

* marc1706/ticket/13348:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
 2015-02-03 20:36:41 +01:00
Andreas Fischer
2787e799e1 Merge pull request #3365 from marc1706/ticket/13348-olympus 
[ticket/13348] Use close method to free query result handle

* marc1706/ticket/13348-olympus:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
 2015-02-03 20:36:27 +01:00
Marc Alexander
a09d022d5e Merge branch 'ticket/13348-olympus' into ticket/13348 
Conflicts:
	phpBB/feed.php
 2015-02-03 18:30:45 +01:00
Marc Alexander
4e06ab16f0 [ticket/13348] Remove unnecessary global $cache 
$cache is not used in the method get_item().

PHPBB3-13348
 2015-02-03 18:24:16 +01:00
Marc Alexander
1f2cb69c8a [ticket/13348] Use close method to free query result handle 
PHPBB3-13348
 2015-02-03 18:23:13 +01:00
Andreas Fischer
284aa8c496 Merge pull request #3281 from MGaetan89/ticket/13496 
[ticket/13496] Change set_config_count() calls with $config->increment()

* MGaetan89/ticket/13496:
  [ticket/13496] Update calls to `set_config_count()`
 2015-02-03 18:13:20 +01:00
Andreas Fischer
3fb6d5b838 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13538] Add tests for double nested pagination loop
  [ticket/13538] Fix tests for pagination in nested loop
  [ticket/13538] Add test for pagination in nested loop
 2015-02-03 17:53:47 +01:00