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
24,868 Commits 17 Branches 190 Tags
Commit Graph

24868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get() 
PHPBB3-13450
 2015-01-12 20:19:07 +01:00
Dhruv
ef1be6e247 Merge branch 'develop-ascraeus' into develop 2015-01-11 15:43:51 +05:30
Dhruv Goel
e8464d7fe2 Merge pull request #3276 from nickvergessen/ticket/13272 
[ticket/13272] Add vendor/ folder to "changed files" package
 2015-01-11 15:42:58 +05:30
Dhruv
54b8c1626e Merge branch 'develop-ascraeus' into develop 2015-01-11 14:44:11 +05:30
Dhruv Goel
fbf7726642 Merge pull request #3176 from Senky/ticket/13346 
[ticket/13346] Fix indentation, spacing and missing divs
 2015-01-11 14:42:40 +05:30
Joas Schilling
93b3e72f54 Merge branch 'develop-ascraeus' into develop 2015-01-10 22:01:30 +01:00
Joas Schilling
bfba52781b Merge pull request #3210 from brunoais/ticket/13147 
[ticket/13147] Change get_global_visibility_sql()'s results
 2015-01-10 22:00:07 +01:00
Joas Schilling
659e15656f [ticket/13272] Add vendor/ folder to "changed files" package 
PHPBB3-13272
 2015-01-10 21:17:16 +01:00
Jakub Senko
10e72a36a3 [ticket/13346] Remove unnecessary divs 
PHPBB3-13346
 2015-01-10 21:05:30 +01:00
brunoais
e0733ae435 [ticket/13147] New line before comment block 
PHPBB3-13147
 2015-01-10 17:15:54 +00:00
brunoais
ef9abd7165 [ticket/13147] Override variable name changed by request 
PHPBB3-13147
 2015-01-10 17:15:22 +00:00
Marc Alexander
b4a2beff24 Merge branch 'develop-ascraeus' into develop 2015-01-10 16:25:44 +01:00
Marc Alexander
a415a4ec2b Merge pull request #3274 from nickvergessen/ticket/13486 
[ticket/13486] Fix typo in method name
 2015-01-10 16:25:27 +01:00
Joas Schilling
f756632185 [ticket/13486] Fix typo in method name 
PHPBB3-13486
 2015-01-10 15:14:58 +01:00
Marc Alexander
45ccd2d44a Merge branch 'develop-ascraeus' into develop 2015-01-10 13:18:21 +01:00
Marc Alexander
c28ef9afdd Merge pull request #3195 from nickvergessen/ticket/13238-asc 
[ticket/13238] Do not drop indexes that do not exist from fulltext search
 2015-01-10 13:17:59 +01:00
Marc Alexander
86620c1e80 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
 2015-01-10 13:12:03 +01:00
Marc Alexander
ba477f77c7 Merge pull request #3272 from nickvergessen/ticket/13307 
[ticket/13307] Update mysql_upgrader.php to work without the schema_data...
 2015-01-10 13:06:46 +01:00
brunoais
8ed5a047ec [ticket/13147] Wrong extra new line 
PHPBB3-13147
 2015-01-10 11:48:01 +00:00
brunoais
9caec668af [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwrite 
Renamed content_replaced to get_global_visibility_sql_overwrite in order to
follow the convention in other events' variables that have the same basic
function

PHPBB3-13147
 2015-01-10 11:44:55 +00:00
brunoais
a09c38f1cc [ticket/13147] Removing globals and using injection 
Using globals is NG. Using a parameter instead.

PHPBB3-13147
 2015-01-10 11:44:54 +00:00
brunoais
0f6a0d820e [ticket/13147] Using $phpbb_dispatcher global var 
PHPBB3-13147
 2015-01-10 11:44:54 +00:00
brunoais
8f5e3d5efb [ticket/13147] Allow changing the result of calling get_global_visibility_sql 
PHPBB3-13147
 2015-01-10 11:44:52 +00:00
Marc Alexander
3cfbe7bb4f Merge branch 'develop-ascraeus' into develop 2015-01-10 12:37:11 +01:00
Marc Alexander
67c987f0d0 Merge pull request #3166 from nickvergessen/Senky-ticket/12866 
[ticket/12866] Wrong profile field validation options
 2015-01-10 12:36:49 +01:00
Joas Schilling
56eae4660c Merge branch 'develop-ascraeus' into develop 2015-01-10 12:30:06 +01:00
Joas Schilling
bf59d8dd74 Merge pull request #3209 from brunoais/ticket/13146 
[ticket/13146] Allow changing the result of calling get_forums_visibility_sql
 2015-01-10 12:29:48 +01:00
brunoais
cea35c486c [ticket/13146] Removed stray empty line 
PHPBB3-13146
 2015-01-10 09:55:43 +00:00
brunoais
b64d8c59b0 [ticket/13146] dispatcher, not phpbb_dispatcher 
PHPBB3-13146
 2015-01-10 09:18:03 +00:00
brunoais
349aaab6ac [ticket/13146] Even more missing phpbb_mock_event_dispatcher() 
PHPBB3-13146
 2015-01-10 08:32:22 +00:00
brunoais
da9ac2da72 [ticket/13146] Last missing phpbb_mock_event_dispatcher() 
Thank you nickvergessen

PHPBB3-13146
 2015-01-10 08:11:51 +00:00
Joas Schilling
6b328912ce Merge branch 'develop-ascraeus' into develop 2015-01-10 00:12:59 +01:00
Joas Schilling
8ae1b0c52e Merge pull request #3189 from rxu/ticket/12926 
[ticket/12926] Support for IDN (IRI)
 2015-01-10 00:09:57 +01:00
Joas Schilling
a8259f7c82 Merge branch 'develop-ascraeus' into develop 2015-01-09 21:41:32 +01:00
Joas Schilling
58d8ea5b0b Merge pull request #3265 from tas2580/develop-ascraeus 
[ticket/13453] Sort param in Canonical URL
 2015-01-09 21:41:19 +01:00
rxu
d86bdcb2a7 [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.php 
Get rid of the $scheme and $inline vars, fix regex_idn.php to generate
both common and inline mode regexes all at once.

PHPBB3-12926
 2015-01-10 03:21:36 +07:00
Joas Schilling
d2a4d6624f [ticket/13307] Update mysql_upgrader.php to work without the schema_data.php 
The file has been delete quite some time ago.

PHPBB3-13307
 2015-01-09 19:46:14 +01:00
Joas Schilling
1981f4f966 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:39:26 +01:00
Joas Schilling
d9bdd05c80 Merge pull request #3128 from omniError/ticket/13306 
[ticket/13306] add error level to collector
 2015-01-09 18:39:11 +01:00
Joas Schilling
a5007b7abd Merge branch 'develop-ascraeus' into develop 2015-01-09 18:12:02 +01:00
Joas Schilling
3350df131f Merge pull request #3227 from prototech/ticket/13366 
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
 2015-01-09 18:11:41 +01:00
Joas Schilling
88c86ff324 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:07:03 +01:00
Joas Schilling
9ce8b62894 Merge pull request #3242 from lavigor/ticket/13442 
[ticket/13442] UTF-8 symbols for database host
 2015-01-09 18:07:00 +01:00
Joas Schilling
8f5bbc95dc Merge branch 'develop-ascraeus' into develop 2015-01-09 18:03:34 +01:00
Joas Schilling
65ffc76e2f Merge pull request #3258 from marc1706/ticket/13385 
[ticket/13385] Free result in \phpbb\config\db::set_atomic()
 2015-01-09 18:03:21 +01:00
Joas Schilling
24058dfefc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/includes/bbcode.php
 2015-01-09 17:49:30 +01:00
Joas Schilling
b64da23fe1 Merge pull request #3267 from Elsensee/ticket/13478 
[ticket/13478] Add event core.bbcode_cache_init_end
 2015-01-09 17:47:46 +01:00
Joas Schilling
ff44579523 Merge branch 'develop-ascraeus' into develop 2015-01-09 17:41:47 +01:00
Joas Schilling
67c9f4d064 Merge pull request #3268 from Elsensee/ticket/13470 
[ticket/13470] Fix non-empty username array if no usernames are given
 2015-01-09 17:41:42 +01:00
Joas Schilling
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +01:00