mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-03 14:17:56 +02:00
Code Issues Releases Wiki Activity
24,153 Commits 18 Branches 192 Tags
059790f386
Commit Graph

24153 Commits

Author SHA1 Message Date
Joas Schilling
059790f386 Merge pull request from dragosvr92/patch-4 
Update colours.css
 2015-02-20 20:55:23 +01:00
Joas Schilling
835ee2ba63 Merge pull request from n-aleha/ticket/13586 
[ticket/13586] Allow '0' as username with Jabber notifications
 2015-02-20 20:52:54 +01:00
Joas Schilling
5e215aef26 Merge pull request from marc1706/ticket/13577 
[ticket/13577] Skip tests requiring fileinfo if not enabled
 2015-02-20 20:50:10 +01:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results 
PHPBB3-13533
 2015-02-20 20:41:17 +01:00
Joas Schilling
c24a840048 Merge pull request from dhruvgoel92/ticket/13472 
[ticket/13472] Delete admin activation notification when deleting user
 2015-02-20 20:29:05 +01:00
Joas Schilling
8a06f21ea9 Merge branch 'ticket/13640' into 3.1.x 2015-02-20 20:22:03 +01:00
Dragos-Valentin Radulescu
5c3ca7404d [ticket/13640] Rearrange css in a better order 
PHPBB3-13640
 2015-02-20 20:21:31 +01:00
Joas Schilling
31ae574830 Merge pull request from brunoais/ticket/13142 
[ticket/13142] Before query to list unapproved and deleted posts
 2015-02-20 19:54:02 +01:00
Dragos-Valentin Radulescu
eff928c29b [ticket/13639] Update colours.css 
The rule is a left over from development. it should be removed from colours.css

.icon-search-advanced { background-image: url("./images/icon_search_adv.gif");}

Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166

PHPBB3-13639
 2015-02-20 20:26:33 +02: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 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
7fd3767bbd Merge pull request from nickvergessen/ticket/13600 
[ticket/13600] Allow extensions to create a custom help page
 2015-02-18 21:10:43 +01:00
Marc Alexander
098854a822 Merge pull request 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
60f60acea3 Merge pull request 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
13948718c6 Merge pull request 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
f3d332b78f Merge pull request 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
6322970766 Merge pull request 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
Marc Alexander
088907fe8e Merge pull request 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
JoshyPHP
4559aca723 [ticket/13595] Removed unused code 
PHPBB3-13595
 2015-02-13 22:55:04 +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 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
Andreas Fischer
39a3f4f6c8 Merge pull request 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
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
n-aleha
e1eac80b8f [ticket/13586] Allow '0' as username with Jabber notifications 
PHPBB3-13586
 2015-02-07 19:33:19 +02:00
Joas Schilling
c6a371531b Merge pull request 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
48b64b0a61 [ticket/13577] Skip filespec test requiring mimetype check on windows 
PHPBB3-13577
 2015-02-05 13:37:34 +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
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 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 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
5347eac69c Merge pull request from marc1706/ticket/13538 
[ticket/13538] Add tests for pagination in nested loops

* marc1706/ticket/13538:
  [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:46 +01:00
Andreas Fischer
2864e77d6c Merge pull request from marc1706/ticket/13569 
[ticket/13569] Add missing sql_freeresults and remove unneeded results

* marc1706/ticket/13569:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
 2015-02-03 17:38:00 +01:00
Andreas Fischer
427d2de3ea Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13572] Update composer to version 1.0.0-alpha9
 2015-02-03 10:30:03 +01:00
Andreas Fischer
e86b7ce562 Merge pull request from Nicofuma/ticket/13572 
[ticket/13572] Update composer to version 1.0.0-alpha9

* Nicofuma/ticket/13572:
  [ticket/13572] Update composer to version 1.0.0-alpha9
 2015-02-03 10:30:02 +01:00