makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 04:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
24962 commits 18 branches 192 tags 207 MiB
Commit graph

21273 commits

Author SHA1 Message Date
Tristan Darricau
f8c3440344 Merge pull request #3313 from nickvergessen/ticket/13528 
[ticket/13528] Return correct translation instead of is_set()

* nickvergessen/ticket/13528:
  [ticket/13528] Return correct translation instead of is_set()
 2015-01-20 23:37:38 +01:00
Joas Schilling
b566686b51 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php
 2015-01-20 23:32:36 +01:00
Joas Schilling
a5fae1b1f0 Merge pull request #3293 from Nicofuma/ticket/13489 
[ticket/13489] Disable the event dispatcher in the migrator
 2015-01-20 23:27:54 +01:00
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
d1bff80dd1 [ticket/13528] Return correct translation instead of is_set() 
PHPBB3-13528
 2015-01-20 22:56:33 +01:00
Joas Schilling
5d69f6159c Merge branch 'develop-ascraeus' into develop 2015-01-20 22:50:30 +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
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
Tristan Darricau
dab0728357 [ticket/13489] Fix service configuration 
PHPBB3-13489
 2015-01-20 14:19:55 +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
Andreas Fischer
2535e9da00 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13504] Fix invalid variable $user
 2015-01-19 23:23:57 +01: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
54e3b14583 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:37:25 +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
8e75133d79 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:14:02 +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
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
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
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
Tristan Darricau
98937a7a18 Merge pull request #3289 from MGaetan89/ticket/13450 
[ticket/13450] Type-hint return value of $phpbb_container->get()

* MGaetan89/ticket/13450:
  [ticket/13450] Type-hint return value of $phpbb_container->get()
 2015-01-14 12:34:28 +01:00
Tristan Darricau
ce47170c29 [ticket/13489] Update migrations 
PHPBB3-13489
 2015-01-14 12:16:24 +01:00
Tristan Darricau
c99ed64473 [ticket/13489] Disable the event dispatcher in the migrator 
PHPBB3-13489
 2015-01-14 11:09:44 +01:00
Joas Schilling
853733a0eb Merge branch 'develop-ascraeus' into develop 2015-01-13 23:31:37 +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
26beafa564 Merge branch 'develop-ascraeus' into develop 2015-01-13 23:29:25 +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
Joas Schilling
ae54d3d01f Merge branch 'develop-ascraeus' into develop 2015-01-12 23:56:48 +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
Gaëtan Muller
35d37fdff4 [ticket/13498] Update calls to get_user_avatar() 
PHPBB3-13498
 2015-01-11 21:09:21 +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
Gaëtan Muller
63da128ee5 [ticket/12487] Update PHP code 
PHPBB3-12487
 2015-01-11 13:22:59 +01:00
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
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