Commit graph

25617 commits

Author SHA1 Message Date
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
Joas Schilling
d4c078cc78 Merge pull request #3271 from marc1706/ticket/13432
[ticket/13432] Make sure to add language file when including acp_modules
2015-01-09 17:36:07 +01:00
Marc Alexander
9d9c57f334 [ticket/13432] Make sure to add language file when including acp_modules
PHPBB3-13432
2015-01-09 13:47:36 +01:00
Marc Alexander
38f184ad6b [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()
PHPBB3-13385
2015-01-09 13:41:36 +01:00
Marc Alexander
7ba1a96427 [ticket/13192] Order test cases consistently
PHPBB3-13192
2015-01-09 13:38:52 +01:00
Oliver Schramm
e3571fc6eb [ticket/13470] Fix non-empty username array if no usernames are given
PHPBB3-13470
2015-01-08 22:17:05 +01:00
Oliver Schramm
953a98dc0b [ticket/13478] Add event core.bbcode_cache_init_end
PHPBB3-13478
2015-01-08 00:13:58 +01:00
Tobi Schäfer
de3d7aca16 [ticket/13453] Sort param in Canonical URL
PHPBB3-13453
2015-01-06 15:31:27 +01:00
brunoais
346f654b2e [ticket/13146] Use the correct phpbb_mock_event_dispatcher, instead of builder
PHPBB3-13146
2015-01-06 12:58:01 +00:00
Joas Schilling
778c8e89d3 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:29:18 +01:00
Joas Schilling
87578e90eb Merge pull request #3262 from Elsensee/ticket/13466
[ticket/13466] Add bitfield and uid to event core.message_parser_check_message
2015-01-06 11:29:11 +01:00
Joas Schilling
ba90746ce5 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-01-06 11:25:26 +01:00
Joas Schilling
874356e57f Merge pull request #3243 from kinerity/ticket/13437
[ticket/13437] Add template event viewtopic_body_post_author_before/after
2015-01-06 11:24:25 +01:00
Joas Schilling
1ed61fc39f Merge branch 'develop-ascraeus' into develop 2015-01-06 11:08:06 +01:00
Joas Schilling
26bf79425c Merge pull request #3231 from rxu/ticket/13435
[ticket/13435] Add core event to modify submit_post() sql data
2015-01-06 11:08:01 +01:00
Joas Schilling
ba11a91524 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:05:12 +01:00
Joas Schilling
d36b0452bd Merge pull request #3230 from omniError/ticket/13430
[ticket/13430] Add event core.prune_sql
2015-01-06 11:05:08 +01:00
Joas Schilling
2edf947415 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:01:53 +01:00
Joas Schilling
64d880a15c Merge branch 'Wolfsblvt-ticket/13428' into develop-ascraeus 2015-01-06 11:01:40 +01:00
Wolfsblvt
387e4b942b [ticket/13428] Add core events to memberlist.php for teampage
PHPBB3-13428
2015-01-06 11:01:18 +01:00
Joas Schilling
d9109355a3 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:48:34 +01:00
Joas Schilling
6fd8f1b835 Merge pull request #3221 from MasterShredder/ticket/13422
[ticket/13422] New events for save custom cookies and set custom ban type
2015-01-06 10:48:14 +01:00
Joas Schilling
93a85a65d0 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:43:37 +01:00
Joas Schilling
2dab3c8c52 Merge pull request #3211 from brunoais/ticket/13148
[ticket/13148] Creating a final way to modify edit logs output
2015-01-06 10:25:10 +01:00