Joas Schilling
de061b5e11
Merge branch '3.1.x'
2015-02-20 19:56:36 +01:00
Joas Schilling
31ae574830
Merge pull request #3197 from brunoais/ticket/13142
...
[ticket/13142] Before query to list unapproved and deleted posts
2015-02-20 19:54:02 +01:00
Andreas Fischer
19f8e25515
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13634] Update links to travis build icons
[ticket/13634] Update branch names on README
2015-02-19 19:27:15 +01:00
Andreas Fischer
e4b4428173
Merge branch '3.0.x' into 3.1.x
...
* 3.0.x:
[ticket/13634] Update links to travis build icons
[ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
Andreas Fischer
3db7ac0aad
Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x
...
[ticket/13634] Update branch names on README
* VSEphpbb/ticket/13634-3.0.x:
[ticket/13634] Update links to travis build icons
[ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
Marc Alexander
a43c1a46c3
Merge branch '3.1.x'
2015-02-18 21:11:04 +01:00
Marc Alexander
7fd3767bbd
Merge pull request #3417 from nickvergessen/ticket/13600
...
[ticket/13600] Allow extensions to create a custom help page
2015-02-18 21:10:43 +01:00
Marc Alexander
5ad4685f00
Merge branch '3.1.x'
2015-02-18 18:04:46 +01:00
Marc Alexander
098854a822
Merge pull request #3395 from s9e/ticket/13595
...
[ticket/13595] Remove unused instances of the bbcode class
2015-02-18 18:02:23 +01:00
Matt Friedman
bbf4bcc986
[ticket/13634] Update links to travis build icons
...
PHPBB3-13634
2015-02-18 08:42:14 -08:00
Matt Friedman
03f9c69e60
[ticket/13634] Update branch names on README
...
PHPBB3-13634
2015-02-18 08:37:36 -08:00
Marc Alexander
21c6223eb3
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
2015-02-18 17:35:03 +01:00
Marc Alexander
60f60acea3
Merge pull request #3420 from marc1706/ticket/13628
...
[ticket/13628] Allow ability for extension to add entries to user's profile
2015-02-18 17:30:13 +01:00
RMcGirr83
153d1691ae
[ticket/13628] Allow ability for extension to add entries to user's profile
...
PHPBB3-13628
2015-02-18 16:35:10 +01:00
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
Joas Schilling
02d28c28cd
[ticket/13600] Allow extensions to create a custom help page
...
PHPBB3-13600
2015-02-17 23:57:30 +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
JoshyPHP
4559aca723
[ticket/13595] Removed unused code
...
PHPBB3-13595
2015-02-13 22:55:04 +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
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
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
