makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
25005 commits 18 branches 192 tags 206 MiB
Commit graph

9459 commits

Author SHA1 Message Date
Andreas Fischer
5069da8d52 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:11:40 +01:00
Andreas Fischer
4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php
 2015-01-20 23:11:29 +01:00
Andreas Fischer
3134b6b70e Merge pull request #3306 from marc1706/ticket/13519 
[ticket/13519] Correctly validate imagick path as path and not string

* marc1706/ticket/13519:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:10:19 +01:00
Joas Schilling
358ca14ade Merge branch 'develop-ascraeus' into develop 2015-01-20 20:58:21 +01:00
Joas Schilling
40006376f2 Merge pull request #3226 from prototech/ticket/13420 
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
 2015-01-20 20:58:12 +01:00
Joas Schilling
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +01:00
Joas Schilling
d99cd2d02e Merge pull request #3278 from rxu/ticket/13492 
[ticket/13492] Fix IDN support for custom BBCode URL tokens
 2015-01-20 17:31:06 +01:00
rxu
8002af7526 [ticket/13492] Add the migration to update custom bbcodes with IDN regexps 
Also fix the $utf8 checking regexp removing the curly braces.

PHPBB3-13492
 2015-01-20 08:47:56 +07:00
Nils Adermann
ebbe6a7791 Merge pull request #2990 from Senky/ticket/10985 
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
 2015-01-19 22:27:14 +01:00
Marc Alexander
6564446b0f [ticket/13519] Correctly validate imagick path as path and not string 
PHPBB3-13519
 2015-01-19 20:47:47 +01:00
Tristan Darricau
a537bf9619 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
 2015-01-19 17:52:37 +01:00
Tristan Darricau
add3d3e760 Merge pull request #3055 from marc1706/ticket/13192 
[ticket/13192] Add method for generating valid user page links based on mod_rewrite

* marc1706/ticket/13192:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
 2015-01-19 16:45:43 +01:00
Tristan Darricau
0344e61b8c Merge pull request #3237 from MGaetan89/ticket/12487 
[ticket/12487] Update PHP code

* MGaetan89/ticket/12487:
  [ticket/12487] Update PHP code
 2015-01-16 10:05:23 +01:00
Gaëtan Muller
17daaaf441 [ticket/13499] Move get_remote_file() to functions_compatibility.php 
PHPBB3-13499
 2015-01-15 18:55:51 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get() 
PHPBB3-13450
 2015-01-12 20:19:07 +01:00
rxu
17f4dce0fc [ticket/13492] Add IDN support for custom BBCode URL tokens 
Custom BBCode URL tokens does not support IDN.
Custom BBCodes added earlier than IDN has been applied are unaffected.

PHPBB3-13492
 2015-01-11 20:36:22 +07:00
Gaëtan Muller
63da128ee5 [ticket/12487] Update PHP code 
PHPBB3-12487
 2015-01-11 13:22:59 +01: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
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
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
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
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
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
Oliver Schramm
2532583765 [ticket/13466] Add bitfield and uid to event core.message_parser_check_message 
PHPBB3-13466
 2015-01-05 22:15:56 +01:00
Marc Alexander
3aad3f0b3f Merge branch 'develop-ascraeus' into develop 2015-01-04 12:21:28 +01:00
Marc Alexander
3638b2ff64 Merge pull request #3254 from VSEphpbb/ticket/13440 
[ticket/13440] Update event version to 3.1.3-RC1
 2015-01-04 12:21:09 +01:00
Marc Alexander
7b84b8bba8 Merge branch 'develop-ascraeus' into develop 2015-01-04 11:26:00 +01:00
Marc Alexander
8c27c7f10b Merge pull request #3253 from VSEphpbb/ticket/13439 
[ticket/13439] Update event version to 3.1.3-RC1
 2015-01-04 11:25:43 +01:00
Matt Friedman
88034ea2f0 [ticket/13440] Update event version to 3.1.3-RC1 
PHPBB3-13440
 2015-01-04 01:40:18 -08:00
Matt Friedman
86f66b5f72 [ticket/13439] Update event version to 3.1.3-RC1 
PHPBB3-13439
 2015-01-04 01:38:50 -08:00
Marc Alexander
dc39ccf525 Merge branch 'develop-ascraeus' into develop 2015-01-04 00:56:22 +01:00
Marc Alexander
838b1250f6 Merge pull request #3249 from VSEphpbb/ticket/13440 
[ticket/13440] Add event core.login_box_failed
 2015-01-04 00:43:11 +01:00
Marc Alexander
4749dbbc1a Merge branch 'develop-ascraeus' into develop 2015-01-04 00:39:21 +01:00
Matt Friedman
9d9b8139d0 [ticket/13440] Add event core.login_box_failed 
PHPBB3-13440
 2015-01-03 15:23:50 -08:00
Matt Friedman
179a7a4c71 [ticket/13439] Add event core.acp_users_overview_before 
PHPBB3-13439
 2015-01-03 15:21:47 -08:00
Marc Alexander
ddceaee772 Merge branch 'develop-ascraeus' into develop 2015-01-03 13:46:47 +01:00
Gaëtan Muller
0e0c649477 [ticket/13441] Functions_convert fails to set global moderators default group 
PHPBB3-13441
 2015-01-03 13:45:52 +01:00
Joas Schilling
8aadee60f7 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:46:46 +01:00
rxu
2929f28243 [ticket/13435] Add core event to modify submit_post() sql data 
PHPBB3-13435
 2014-12-13 21:08:01 +07:00
omniError
7b0cabc416 [ticket/13430] update event version 
https://tracker.phpbb.com/browse/PHPBB3-13430

PHPBB3-13430
 2014-12-12 17:39:30 -06:00
omniError
9f1493ce73 [ticket/13430] Add event core.prune_sql 
https://tracker.phpbb.com/browse/PHPBB3-13430

PHPBB3-13430
 2014-12-11 16:58:29 -06:00
Cesar G
75780d7fc8 [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users. 
PHPBB3-13420
 2014-12-09 18:27:04 -08:00