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

21364 Commits

Author SHA1 Message Date
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
Joas Schilling
be30d8251a [prep-release-3.1.3] Add changelog for 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
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
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
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
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
Andreas Fischer
5f237a0426 [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. 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
208923563e [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. 2015-01-29 23:16:34 +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
Andreas Fischer
40e676ad03 [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. 2015-01-29 18:17:29 +01:00
Dhruv Goel
36f8fb2b37 Merge pull request #3347 from bantu/ticket/13554 
[ticket/13554] Show feature release upgrades in blue rather than red.
 2015-01-29 11:47:37 +05:30
Andreas Fischer
872caf805c Merge pull request #3348 from bantu/ticket/13549 
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME...

* bantu/ticket/13549:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
 2015-01-29 00:06:00 +01:00
Andreas Fischer
d7741cea60 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:02:42 +01:00
Andreas Fischer
f0f88c287c Merge pull request #3338 from dhruvgoel92/ticket/12933 
[ticket/12933] Handle *wildcard character in native search

* dhruvgoel92/ticket/12933:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:02:41 +01:00
Marc Alexander
7495055907 [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. 
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.

PHPBB3-13549
 2015-01-28 22:07:16 +01:00
Dhruv
5eb0d422c8 [ticket/12933] Handle case when * is last character of word 
PHPBB3-12933
 2015-01-28 21:59:58 +01:00
Andreas Fischer
dff1ea6b85 [ticket/13554] Show feature release upgrades in blue rather than red. 
PHPBB3-13554
 2015-01-28 21:59:03 +01:00
Andreas Fischer
91ff42d501 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13414] Set Content-Length header only if status is not 304
 2015-01-28 19:57:29 +01:00
Andreas Fischer
e3e427fa24 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13414] Set Content-Length header only if status is not 304

Conflicts:
	phpBB/download/file.php
 2015-01-28 19:56:47 +01:00
Dhruv
252018b813 Merge branch 'ticket/12933-olympus' into ticket/12933 2015-01-28 21:41:24 +05:30
Dhruv
be90e97452 [ticket/12933] Handle case when * is last character of word 
PHPBB3-12933
 2015-01-28 21:37:03 +05:30
Marc Alexander
a9fa20bb91 [ticket/13414] Set Content-Length header only if status is not 304 
PHPBB3-13414
 2015-01-28 15:50:48 +01:00
Tristan Darricau
0bdb4c1ed6 Merge pull request #3263 from MGaetan89/ticket/13468 
[ticket/13468] Change add_log() calls with $phpbb_log->add()

* MGaetan89/ticket/13468:
  [ticket/13468] Update calls to `add_log()`
 2015-01-28 09:27:16 +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
b2b5addd09 [prep-release-3.1.3] Add changelog for 3.1.3-RC1 2015-01-26 20:09:46 +01:00
Joas Schilling
513b2f8296 [prep-release-3.1.3] Prepare Changelog 2015-01-26 20:00:11 +01:00
Joas Schilling
32b25d7b11 [prep-release-3.1.3] Add migration for 3.1.3-RC1 2015-01-26 19:43:36 +01:00
Joas Schilling
acfb9b9539 [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01:00