1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Commit Graph

20609 Commits

Author SHA1 Message Date
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
f02dc44a23 Merge pull request #3138 from prototech/ticket/12642
[ticket/12642] Ensure CPF type specific options are set when editing booleans.
2015-01-20 22:46:08 +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
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
Joas Schilling
7e8bb68999 [ticket/13504] Fix invalid variable $user
PHPBB3-13504
2015-01-19 21:42:22 +01:00
Joas Schilling
ff39ffacf6 Merge pull request #3296 from PayBas/ticket/13431
[ticket/13431] Fix responsive RTL media queries for <IE11
2015-01-19 21:37:14 +01:00
Joas Schilling
c29db8e7a4 Merge pull request #3294 from PayBas/ticket/13507
[ticket/13507] Fix horizontal scrollbar for large images in posts
2015-01-19 21:13:41 +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
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
PayBas
4e5e356555 [ticket/13431] Fix responsive RTL media queries for <IE11
PHPBB3-13431
2015-01-16 19:25:45 +01:00
PayBas
9e38e9dc6f [ticket/13507] Fix horizontal scrollbar for large images in posts
PHPBB3-13507
2015-01-16 19:10:04 +01:00
Joas Schilling
e3e16a0166 Merge pull request #3234 from brunoais/ticket/13154
[ticket/13154] Event to edit user list for notification in notifications
2015-01-13 23:31:28 +01:00
Joas Schilling
2a08c60a62 Merge pull request #3233 from brunoais/ticket/13160
[ticket/13160] Viewtopic; before viewing permissions event
2015-01-13 23:27:30 +01:00
brunoais
1d49ccd920 [ticket/13160] New line before comment block
PHPBB3-13160
2015-01-11 19:12:08 +00:00
Oliver Schramm
f075fb78f6 [ticket/13490] Allow multibyte characters in edit reason
PHPBB3-13490
2015-01-11 19:29:33 +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
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
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
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
brunoais
9cc4d60b88 [ticket/13146] Remove empty line
PHPBB3-13146
2015-01-10 17:08:46 +00:00
brunoais
ec749a2b39 [ticket/13146] "Make it" -> "Set it to"
PHPBB3-13146
2015-01-10 17:08:46 +00:00
brunoais
6d3fca9a41 [ticket/13146] Forced line feed on long line
PHPBB3-13146
2015-01-10 17:08:45 +00:00
brunoais
9cbb9b4253 [ticket/13146] Fixed wrong tab + space into only tab
PHPBB3-13146
2015-01-10 17:08:44 +00:00
brunoais
fce1be2684 [ticket/13160] Appending "_check" to override variable names
PHPBB3-13160
2015-01-10 17:08:43 +00:00
brunoais
f02e3a4076 [ticket/13160] lowercase null
PHPBB3-13160
2015-01-10 17:08:43 +00:00
brunoais
3d8aaf6aaf [ticket/13160] Wrong variable types fixed
PHPBB3-13160
2015-01-10 17:08:42 +00:00
brunoais
ffb7d618ac [ticket/13160] Removed an unwanted tab char.
PHPBB3-13160
2015-01-10 17:08:41 +00:00
brunoais
11269fe62a [ticket/13160] Allow override topic_tracking_info
PHPBB3-13160
2015-01-10 17:08:40 +00:00
brunoais
a5a6855a0d [ticket/13160] Allow override f_read and forum password
Adds a couple of variables to the event that allows  extension authors to
bypass the f_read and forum password checks as if the user had those permissions
whether or not he actually has them.

PHPBB3-13160
2015-01-10 17:08:40 +00:00
brunoais
a0287a62c1 [ticket/13160] Viewtopic; before viewing permissions event
An event before the f_Read permissions check in viewtopic

PHPBB3-13160
2015-01-10 17:08:39 +00:00
Joas Schilling
f756632185 [ticket/13486] Fix typo in method name
PHPBB3-13486
2015-01-10 15:14:58 +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
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
Marc Alexander
e6509aaf60 [ticket/13192] Use ltrim() instead of preg_replace()
PHPBB3-13192
2015-01-10 12:46:40 +01: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
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
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
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
58d8ea5b0b Merge pull request #3265 from tas2580/develop-ascraeus
[ticket/13453] Sort param in Canonical URL
2015-01-09 21:41:19 +01:00