mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-15 00:44:53 +02:00
Code Issues Releases Wiki Activity
25,226 Commits 10 Branches 193 Tags
0dab7e255233c99aba68da8b60ebfbbdcfd20ea9
Commit Graph

21473 Commits

Author SHA1 Message Date
Joas Schilling
0dab7e2552 Merge branch '3.1.x' 2015-02-20 20:29:45 +01:00
Joas Schilling
c24a840048 Merge pull request #3277 from dhruvgoel92/ticket/13472 
[ticket/13472] Delete admin activation notification when deleting user
 2015-02-20 20:29:05 +01:00
Joas Schilling
a1ecb10c5c Merge branch '3.1.x' 2015-02-20 20:22:18 +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
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
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
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
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
Marc Alexander
b84dee2667 Merge branch 'develop-ascraeus' into develop 2015-02-17 17:13:34 +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
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
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
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
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
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
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
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
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
63d863a883 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
 2015-02-03 17:38:02 +01:00
Andreas Fischer
2864e77d6c Merge pull request #3361 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