Marc Alexander
ddc96a7d07
Merge branch '3.1.x'
2015-02-18 00:19:10 +01:00
Marc Alexander
13948718c6
Merge pull request #3414 from rxu/ticket/13433
...
[ticket/13433] Fix parsing of email addresses
2015-02-18 00:03:25 +01:00
Andreas Fischer
978b96cbf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Andreas Fischer
f3d332b78f
Merge pull request #3411 from Senky/ticket/13570
...
[ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0
* Senky/ticket/13570:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
rxu
950c72a8a5
[ticket/13433] Add make_clickable() test for emails
...
PHPBB3-13433
2015-02-18 01:03:07 +07:00
Marc Alexander
b84dee2667
Merge branch 'develop-ascraeus' into develop
2015-02-17 17:13:34 +01:00
Marc Alexander
6322970766
Merge pull request #3412 from Senky/ticket/13618
...
[ticket/13618] Small grammatical typo in the English FAQ
2015-02-17 17:13:13 +01:00
rxu
fa1c61f608
[ticket/13433] Fix parsing of email addresses
...
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.
PHPBB3-13433
2015-02-17 17:24:30 +07:00
Jakub Senko
ec8aeaf2cd
[ticket/13618] Fix typo in English FAQ
...
PHPBB3-13618
2015-02-16 20:27:52 +01:00
Jakub Senko
f23d2ec42f
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
...
PHPBB3-13570
2015-02-16 20:25:11 +01:00
Joas Schilling
c489c6090b
Merge pull request #3401 from marc1706/ticket/13619
...
[ticket/13619] Remove unneeded files and folders from vendor in release package
2015-02-16 09:25:22 +01:00
Marc Alexander
9b6e57de3d
Merge pull request #3394 from nickvergessen/ticket/10748-postgresql
...
[ticket/10748][Part2] Split postgres DB tools into it's own class
2015-02-15 22:32:39 +01:00
Marc Alexander
2042bfc5db
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
2015-02-15 18:52:05 +01:00
Marc Alexander
088907fe8e
Merge pull request #3403 from marc1706/ticket/13615
...
[ticket/13615] Correctly display images for gallery avatar in subsilver2
2015-02-15 18:50:58 +01:00
kamijoutouma
4398a51dc6
[ticket/13615] Correctly display images for gallery avatar in subsilver2
...
Avatar Gallery shows categories but no images in subsilver2.
The ID was not specified in the template. Also, the correct parent template
loop is called avatar_local_row and not avatar_local_col.
PHPBB3-13615
2015-02-15 18:18:56 +01:00
Joas Schilling
1e3175cca3
[ticket/10748] Fix class type hinting
...
PHPBB3-10748
2015-02-15 17:01:20 +01:00
Marc Alexander
8793d2f2c8
[ticket/13619] Remove unneeded files and folders from vendor in release package
...
PHPBB3-13619
2015-02-15 14:52:12 +01:00
Joas Schilling
ec1fb0423d
[ticket/10748] Split postgres DB tools into it's own class
...
PHPBB3-10748
2015-02-13 22:49:29 +01:00
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
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
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
Marc Alexander
3df25babce
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
...
PHPBB3-13597
2015-02-11 12:03:54 +01: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
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
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
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
