mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
25,223 Commits 17 Branches 190 Tags
Commit Graph

25223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
f31d12ddf2 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:00:48 +01:00
Joas Schilling
7254a52812 Merge pull request #3282 from Elsensee/ticket/13313 
[ticket/13313] Add event core.acp_email_display
 2015-02-02 23:00:29 +01:00
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count() 
PHPBB3-13496
 2015-02-02 21:52:59 +01:00
Marc Alexander
8569e1c77a Merge branch 'develop-ascraeus' into develop 2015-02-02 21:06:02 +01:00
Marc Alexander
5182d02da5 Merge pull request #3334 from paul999/ticket/13542 
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
 2015-02-02 21:05:44 +01:00
Andreas Fischer
df77174a2b Merge pull request #3280 from MGaetan89/ticket/13494 
[ticket/13494] Change set_config() calls with $config->set()

* MGaetan89/ticket/13494:
  [ticket/13494] Update calls to `set_config()`
 2015-02-02 20:07:46 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +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
6e2838a4ca Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
 2015-02-01 20:24:32 +01:00
Joas Schilling
9f59aa59d9 Merge branch 'prep-release-3.1.3' into develop-ascraeus 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-02-01 20:23:16 +01:00
Joas Schilling
7f99e1c857 [prep-release-3.1.3] Add migration for 3.1.3 release-3.1.3 2015-02-01 19:18:30 +01:00
Joas Schilling
036b5c4244 [prep-release-3.1.3] Update version to 3.1.3 2015-02-01 19:15:42 +01:00
Marc Alexander
a893dfa46b Merge pull request #3352 from VSEphpbb/ticket/10388 
Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
 2015-01-31 12:59:40 +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
3c23242bfe Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 12:11:43 +01:00
Matt Friedman
9f4c2effe9 [ticket/10388] Update deprecation comment 
PHPBB3-10388
 2015-01-31 01:11:28 -08:00
Joas Schilling
be30d8251a [prep-release-3.1.3] Add changelog for 3.1.3-RC2 release-3.1.3-RC2 2015-01-31 01:08:29 +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
dd182c5433 [prep-release-3.1.3] Update version to 3.1.3-RC2 2015-01-31 01:03:55 +01:00
Joas Schilling
c14cf0457d Merge branch 'develop-ascraeus' into develop 2015-01-31 00:57:32 +01:00
Joas Schilling
67478a0f94 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 00:57:25 +01:00
Joas Schilling
e72c1540cb Merge branch 'ticket/13553' into prep-release-3.1.3 2015-01-31 00:57:15 +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
14ab007128 Merge branch 'develop-ascraeus' into develop 2015-01-31 00:43:30 +01:00
Joas Schilling
b16854ab8c Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 00:43:20 +01:00
Joas Schilling
bb4287ab2d Merge pull request #3355 from nickvergessen/ticket/13557 
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
 2015-01-31 00:43:04 +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
Andreas Fischer
7531bfb291 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13556] Fix exception translation with filedownloader
 2015-01-30 19:00:15 +01:00
Andreas Fischer
2690038d40 Merge branch 'prep-release-3.1.3' into develop-ascraeus 
* prep-release-3.1.3:
  [ticket/13556] Fix exception translation with filedownloader
 2015-01-30 19:00:15 +01:00
Andreas Fischer
3fef570950 Merge pull request #3354 from nickvergessen/ticket/13556 
[ticket/13556] Fix exception translation with filedownloader

* nickvergessen/ticket/13556:
  [ticket/13556] Fix exception translation with filedownloader
 2015-01-30 19:00: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
1b185413bf Merge branch 'develop-ascraeus' into develop 2015-01-30 17:48:54 +01:00
Joas Schilling
3e710fe393 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 17:48:45 +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
3d4555296d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
 2015-01-30 13:43:14 +01:00
Andreas Fischer
899173eebd Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-01-30 13:43:05 +01:00
Andreas Fischer
7273591560 Merge branch 'prep-release-3.0.13' into develop-olympus 
* 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.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-01-30 13:40:44 +01:00
Andreas Fischer
0b8a4e04d3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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.

Conflicts:
	build/build.xml
 2015-01-30 13:36:55 +01:00
Andreas Fischer
c46a6443be Merge branch 'prep-release-3.1.3' into develop-ascraeus 
* prep-release-3.1.3:
  [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.
 2015-01-30 13:36:20 +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
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
Dhruv
ab07be8157 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
Dhruv Goel
c130165bfa Merge pull request #3353 from nickvergessen/ticket/13553 
[ticket/13553] Add a method to the controller helper to display a message
 2015-01-30 13:09:14 +05:30
Andreas Fischer
5f237a0426 [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. release-3.0.13-PL1 2015-01-30 01:32:34 +01:00
Andreas Fischer
1e94b0ae71 [prep-release-3.0.13] Also update version in references to files. 2015-01-29 23:32:05 +01:00
Andreas Fischer
5fea945b5b [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. 2015-01-29 23:27:12 +01:00
Andreas Fischer
1642e560dc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13554] Show feature release upgrades in blue rather than red.
 2015-01-29 23:22:48 +01:00
Andreas Fischer
05d8264de6 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	phpBB/adm/style/acp_update.html
 2015-01-29 23:21:59 +01:00