mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00
Code Issues Releases Wiki Activity
25,092 Commits 18 Branches 192 Tags
Commit Graph

1957 Commits

Author SHA1 Message Date
Jakub Senko
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver 
PHPBB3-13570
 2015-02-16 20:25:11 +01:00
brunoais
957b23765f [ticket/13621] Prepend $where_sql and postpend closing parentheses on return 
Prepend $where_sql and postpend closing parentheses on statements with return

PHPBB3-13621
 2015-02-15 18:50:13 +00:00
Marc Alexander
25b54791f9 [ticket/13493] Append page name to base url if it doesn't contain it 
PHPBB3-13493
 2015-02-11 13:03:22 +01:00
brunoais
bf20fb03ef [ticket/13592] The name didn't make proper sense 
PHPBB3-13592
 2015-02-11 10:56:36 +00:00
brunoais
74385b8fce [ticket/13592] Empty line before event comment block. 
I had forgotten this one

PHPBB3-13592
 2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74 [ticket/13592] Removed unwanted space in self line. 
PHPBB3-13592
 2015-02-09 11:56:53 +00:00
brunoais
bb7d294190 [ticket/13592] Allow full override of get_visibility_sql() 
PHPBB3-13592
 2015-02-09 10:44:12 +00:00
brunoais
8a4df90dac [ticket/13592] Allow changing get_visibility_sql's result 
PHPBB3-13592
 2015-02-09 08:42:37 +00:00
brunoais
1bcce75633 [ticket/13592] Allow changing get_visibility_sql's result 
PHPBB3-13592
 2015-02-08 23:52:27 +00:00
Crizzo
fbc603861d [ticket/13588] Fixes wrong message in info fsockopen() disabled 
PHPBB3-13588
 2015-02-07 13:50:08 +01:00
Marc Alexander
a09d022d5e Merge branch 'ticket/13348-olympus' into ticket/13348 
Conflicts:
	phpBB/feed.php
 2015-02-03 18:30:45 +01:00
Marc Alexander
a166f6f42c [ticket/13569] Add missing sql_freeresults and remove unneeded results 
PHPBB3-13569
 2015-02-02 17:36:39 +01:00
Joas Schilling
7f99e1c857 [prep-release-3.1.3] Add migration for 3.1.3 2015-02-01 19:18:30 +01:00
Joas Schilling
9232367b35 [prep-release-3.1.3] Add migration for 3.1.3-RC2 2015-01-31 01:06:23 +01:00
Matt Friedman
e6bbde2bff [ticket/13553] Use defined title value in page headers too 
PHPBB3-13553
 2015-01-31 00:56:59 +01:00
Matt Friedman
ab4b1afd98 [ticket/13553] Make title var accept a lang key var 
PHPBB3-13553
 2015-01-31 00:56:54 +01:00
Matt Friedman
7127d08c8f [ticket/13553] Message helper should accept a lang key var 
PHPBB3-13553
 2015-01-31 00:56:47 +01:00
Joas Schilling
9628e8df3b [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1 
PHPBB3-13557
 2015-01-30 22:57:15 +01:00
Joas Schilling
69450c7152 [ticket/13556] Fix exception translation with filedownloader 
PHPBB3-13556
 2015-01-30 18:05:13 +01:00
Joas Schilling
e5f2eee167 Merge pull request #3341 from brunoais/ticket/13544 
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
 2015-01-30 17:45:21 +01:00
Andreas Fischer
b6786f8ba1 Merge branch 'prep-release-3.0.13' into prep-release-3.1.3 
* prep-release-3.0.13:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
  [ticket/12933] Handle case when * is last character of word
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	build/build.xml
	phpBB/adm/style/acp_update.html
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/includes/startup.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	tests/security/trailing_path_test.php
 2015-01-30 13:34:40 +01:00
Joas Schilling
afe99f9050 [ticket/13553] Add a method to the controller helper to display a message 
PHPBB3-13553
 2015-01-29 19:08:32 +01:00
brunoais
4b16add055 [ticket/13544] Use integer case because $role_id is an int 
PHPBB3-13544
 2015-01-26 22:00:20 +00:00
brunoais
73d1bf9fea [ticket/13544] Fixing wrong SQL query for permission_unset for roles 
PHPBB3-13544
 2015-01-26 19:21:22 +00:00
Joas Schilling
32b25d7b11 [prep-release-3.1.3] Add migration for 3.1.3-RC1 2015-01-26 19:43:36 +01:00
Marc Alexander
874f3584e2 [ticket/13522] Remove unused variables and unexpected returns 
PHPBB3-13522
 2015-01-24 13:40:42 +01:00
Marc Alexander
9a03b3aab6 [ticket/13522] Remove empty answers from possible answers in Q&A 
PHPBB3-13522
 2015-01-24 13:09:00 +01:00
Joas Schilling
9cdbb69f9e Merge pull request #3321 from marc1706/ticket/13282 
[ticket/13282] Use 0 as default for integer type columns in postgresql
 2015-01-23 17:32:28 +01:00
Nils Adermann
40ab75478e Merge pull request #3173 from Nicofuma/ticket/13361 
[ticket/13361] Improve the exception listener
 2015-01-22 16:16:21 +01:00
Marc Alexander
816465bfe9 [ticket/13282] Use strpos() instead of preg_match() 
PHPBB3-13282
 2015-01-22 10:11:08 +01:00
Marc Alexander
1367fc234f [ticket/13282] Use 0 as default for integer type columns in postgresql 
PHPBB3-13282
 2015-01-22 00:06:48 +01:00
Andreas Fischer
7ed065a630 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.14-dev.
  [develop-olympus] Add changelog for 3.0.13 release.
  [develop-olympus] Bump version numbers for 3.0.13-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.13 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2015-01-21 16:07:12 +01:00
Tristan Darricau
7fef91afd2 [ticket/13361] Rename exception to runtime_exception 
PHPBB3-13361
 2015-01-21 08:41:02 +01:00
Tristan Darricau
08e186af8e Merge pull request #3314 from VSEphpbb/ticket/13133 
[ticket/13133] Fix variable name in set_custom_style()

* VSEphpbb/ticket/13133:
  [ticket/13133] Fix variable name in set_custom_style()
 2015-01-20 23:47:44 +01:00
Tristan Darricau
f6057c5eab Merge pull request #3315 from nickvergessen/ticket/13530 
[ticket/13530] Fix undefined variables

* nickvergessen/ticket/13530:
  [ticket/13530] Fix undefined variables
 2015-01-20 23:43:57 +01:00
Joas Schilling
ed6b8f84ad [ticket/13530] Fix undefined variables 
PHPBB3-13530
 2015-01-20 23:36:45 +01:00
Tristan Darricau
9334100cb3 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:36:23 +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
Matt Friedman
41966c481f [ticket/13133] Fix variable name in set_custom_style() 
PHPBB3-13133
 2015-01-20 14:21:02 -08: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
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
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
Joas Schilling
7e8bb68999 [ticket/13504] Fix invalid variable $user 
PHPBB3-13504
 2015-01-19 21:42:22 +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
ce47170c29 [ticket/13489] Update migrations 
PHPBB3-13489
 2015-01-14 12:16:24 +01:00
Tristan Darricau
8ef238ea73 [ticket/13361] Fix the JsonResponse in the exception listener 
PHPBB3-13361
 2015-01-14 11:13:28 +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
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