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

333 Commits

Author SHA1 Message Date
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +01:00
Joas Schilling
6e2838a4ca Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
 2015-02-01 20:24:32 +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
bacb38b161 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-01-31 12:12:56 +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
Joas Schilling
14ab007128 Merge branch 'develop-ascraeus' into develop 2015-01-31 00:43:30 +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
1b185413bf Merge branch 'develop-ascraeus' into develop 2015-01-30 17:48:54 +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
b78ae290e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-01-30 13:14:33 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log() 
PHPBB3-13468
 2015-01-27 18:34:33 +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
Andreas Fischer
768d0a0641 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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.
 2015-01-21 16:07:22 +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
fd25d00fac Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13530] Fix undefined variables
 2015-01-20 23:44:17 +01:00
Joas Schilling
ed6b8f84ad [ticket/13530] Fix undefined variables 
PHPBB3-13530
 2015-01-20 23:36:45 +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
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +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
Tristan Darricau
ce47170c29 [ticket/13489] Update migrations 
PHPBB3-13489
 2015-01-14 12:16:24 +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
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
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
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
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
Joas Schilling
dbbcf3f372 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:17:03 +01:00
n-aleha
6463354a39 [ticket/13098] Repair Yahoo contact field 
Update the Yahoo link of the yahoo profile field.

PHPBB3-13098
 2014-12-12 13:54:35 +02:00
Cesar G
54b5ee5806 [ticket/13366] Ensure plupload_last_gc config entry is dynamic. 
PHPBB3-13366
 2014-12-09 18:50:29 -08:00
Marc Alexander
d22fa412c4 Merge pull request #3220 from nickvergessen/ticket/13421 
Ticket/13421 Introduce an interface for db\tools.php
 2014-12-10 00:03:24 +01:00
Joas Schilling
ec90f2b380 [ticket/13421] Move tools to subdirectory 
PHPBB3-13421
 2014-12-06 17:10:07 +01:00
Joas Schilling
d78bb2865b [ticket/13421] Always require the interface when possible 
PHPBB3-13421
 2014-12-06 16:17:04 +01:00
rxu
499c1467df [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php 
PHPBB3-13405
 2014-11-30 11:27:47 +07:00
Joas Schilling
aab98b8626 [ticket/13238] Do not drop indexes that do not exist from fulltext search 
PHPBB3-13238
 2014-11-28 20:13:49 +01:00
Joas Schilling
1145af71bf [ticket/12866] Update existing profile fields with the new validation 
PHPBB3-12866
 2014-11-28 20:00:49 +01:00
Joas Schilling
eb83bd5797 [ticket/13381] Fix header intendation of v312.php 
PHPBB3-13381
 2014-11-25 22:42:52 +01:00
Joas Schilling
0fbe8e8e69 [prep-release-3.1.2] Add migration to update version to 3.1.2 2014-11-24 21:32:17 +01:00
Joas Schilling
dcd0f200d6 [prep-release-3.1.2] Add migration for 3.1.2-RC1 2014-11-22 19:27:34 +01:00
Tristan Darricau
acfe6dd37d Merge pull request #3149 from prototech/ticket/13342 
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha

* prototech/ticket/13342:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
 2014-11-18 16:28:59 +01:00
Cesar G
7c68964153 [ticket/13315] Check for the includes/captcha/plugins/ directory instead. 
PHPBB3-13315
 2014-11-18 00:37:07 -08:00
Cesar G
7b33018ade [ticket/13315] Fix loss of CAPTCHA plugin config value. 
The plugins were moved to phpbb/captcha/plugins/ after this migration was
created, thus the check is no longer valid and ends up resetting the value
prematurely.

PHPBB3-13315
 2014-11-16 17:01:38 -08:00