mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity
24,962 Commits 18 Branches 192 Tags
Commit Graph

1891 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
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
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
Joas Schilling
7e8bb68999 [ticket/13504] Fix invalid variable $user 
PHPBB3-13504
 2015-01-19 21:42:22 +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
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
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
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
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
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
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
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
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
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
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
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +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