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
19,682 Commits 17 Branches 190 Tags
Commit Graph

19682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
36c41d8848 [prep-release-3.1.0-a3] Prepare Changelog 2014-02-05 16:55:21 +01:00
Joas Schilling
7f70a73634 [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 2014-02-05 16:55:21 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Andreas Fischer
0b6b7fc486 Merge pull request #2004 from prototech/ticket/12163 
[ticket/12163] Use posts_per_page to calculate current page in viewtopic.php

* prototech/ticket/12163:
  [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php
 2014-02-04 17:40:57 +01:00
Cesar G
32ddbf374f [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php 
PHPBB3-12163
 2014-02-04 07:15:15 -08:00
Nils Adermann
f5f6b834f8 [develop] Remove left over conflict marker from merge 1a31f03 2014-02-04 16:01:49 +01:00
Nils Adermann
1a31f03a7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12162] Set language to C before running diff to ensure its english
  [ticket/11509] Be exact when referencing the branch name.
  [ticket/12161] Do not use subdirectories in build/save directory.
  [ticket/11509] Run commit message checker only in one environment.
  [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.

Conflicts:
	.travis.yml
 2014-02-04 13:05:20 +01:00
Nils Adermann
c955d01456 Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into develop-olympus 
* github-nickvergessen/ticket/12162:
  [ticket/12162] Set language to C before running diff to ensure its english
 2014-02-04 13:03:02 +01:00
Joas Schilling
aae4d4c90d [ticket/12162] Set language to C before running diff to ensure its english 
PHPBB3-12162
 2014-02-04 12:32:25 +01:00
Nils Adermann
39b9274a94 Merge pull request #2001 from bantu/ticket/12161 
[ticket/12161] Do not use subdirectories in build/save directory.
 2014-02-04 02:59:52 -08:00
Nils Adermann
2dc2476070 Merge pull request #1999 from bantu/ticket/11509 
[ticket/11509] Further improvements/fixes for the Travis CI commit message checker
 2014-02-04 02:59:11 -08:00
Nils Adermann
db9fd30e7c Merge pull request #1998 from bantu/ticket/12141 
[ticket/12141] Disable opcache extension on PHP 5.5.7
 2014-02-04 02:57:35 -08:00
Andreas Fischer
33593a508c [ticket/11509] Be exact when referencing the branch name. 
PHPBB3-11509
 2014-02-04 02:18:46 +01:00
Andreas Fischer
cb544ed7ae [ticket/12141] Disable broken opcache extension on PHP 5.5.7. 
PHPBB3-12141
 2014-02-04 02:16:36 +01:00
Andreas Fischer
ac954a7c4b [ticket/12141] PHP extension setup must happen before webserver + PHP-FPM. 
PHPBB3-12141
 2014-02-04 02:16:00 +01:00
Andreas Fischer
78116a5298 [ticket/12161] Do not use subdirectories in build/save directory. 
This is pretty much pointless because a new build will wipe the save directory
and there are only a few files in there anyway.

PHPBB3-12161
 2014-02-04 02:07:45 +01:00
Andreas Fischer
b6d45c5d71 [ticket/11985] Do not try to setup PHP extensions on HHVM. 
PHPBB3-11985
 2014-02-04 00:13:36 +01:00
Andreas Fischer
116ff19185 [ticket/11985] Rename install -> setup. This is more generic and consistent. 
PHPBB3-11985
 2014-02-04 00:12:28 +01:00
Andreas Fischer
5069922e24 [ticket/11509] Run commit message checker only in one environment. 
PHPBB3-11509
 2014-02-03 23:50:48 +01:00
Andreas Fischer
6f727bc0f9 [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode. 
PHPBB3-11509
 2014-02-03 23:44:15 +01:00
Andreas Fischer
d50b8df364 Merge pull request #1997 from marc1706/ticket/12159 
[ticket/12159] Fix codesniffer complaints due to profilefields and passwords

* marc1706/ticket/12159:
  [ticket/12159] Fix codesniffer complaints due to profilefields and passwords
 2014-02-03 22:33:51 +01:00
Marc Alexander
6f92996d98 [ticket/12159] Fix codesniffer complaints due to profilefields and passwords 
The two PRs regarding profilefields and passwords manager that were recently
merged caused a few codesniffer complaints that are fixed by these changes.

PHPBB3-12159
 2014-02-03 22:25:43 +01:00
Nathan Guse
ad2d1fcbcb Merge pull request #1942 from nickvergessen/ticket/11996 
[ticket/11996] Add explanation how to correctly remove and update an extension
 2014-02-03 11:49:24 -08:00
Joas Schilling
c7f6cccdf1 [ticket/11996] Remove note until we really do disable the board 
PHPBB3-11996
 2014-02-03 20:48:01 +01:00
Nathan Guse
2cc6d03cca Merge pull request #1991 from marc1706/ticket/12156 
[ticket/12156] Add missing passwords manager to oauth
 2014-02-03 09:57:59 -08:00
Marc Alexander
2c9e6f196b [ticket/12156] Add missing passwords manager to oauth 
PHPBB3-12156
 2014-02-03 18:08:13 +01:00
Nathan Guse
2fa491f965 Merge pull request #1993 from bantu/ticket/11509-develop 
[ticket/11509] Perform commit message checking after PHPUnit (fixes path...
 2014-02-03 08:31:41 -08:00
Andreas Fischer
1594c09971 [ticket/11509] Perform commit message checking after PHPUnit (fixes path). 
PHPBB3-11509
 2014-02-03 17:19:35 +01:00
Andreas Fischer
b16448b3f8 [ticket/11985] Don't try to install APC on PHP 5.5 or higher. 
PHPBB3-11985
 2014-02-03 16:53:15 +01:00
Nathan Guse
b5c1a52368 Merge pull request #1990 from nickvergessen/ticket/12154 
[ticket/12154] Update schema files with lastest database schema
 2014-02-03 07:51:02 -08:00
Andreas Fischer
3b6542adf8 [ticket/11985] Enable APC on command line so it can be used by PHPUnit. 
PHPBB3-11985
 2014-02-03 15:33:46 +01:00
Andreas Fischer
a012293462 [ticket/11985] Reorganise travis/install-php-extensions.sh 
PHPBB3-11985
 2014-02-03 15:33:46 +01:00
Nils Adermann
1f93d940fd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.

Conflicts:
	.travis.yml
 2014-02-03 01:08:25 +01:00
Nils Adermann
32536880f4 Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympus 
* github-bantu/ticket/11509:
  [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
 2014-02-03 01:07:19 +01:00
Joas Schilling
76708be47e [ticket/12154] Update schema files with lastest database schema 
PHPBB3-12154
 2014-02-02 22:05:58 +01:00
Nathan Guse
b88e070116 Merge pull request #1989 from nickvergessen/ticket/12151 
[ticket/12151] Remove old dependency from profile type in tests
 2014-02-02 11:15:47 -08:00
Joas Schilling
360862fad0 [ticket/12151] Remove old dependency from profile type in tests 
PHPBB3-12151
 2014-02-02 19:52:23 +01:00
Andreas Fischer
bc98118f92 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12146] Added a missing # to inline css-style of <span>

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
 2014-02-02 17:20:07 +01:00
Andreas Fischer
34c6677d14 Merge remote-tracking branch 'Crizz0/ticket/12146' into develop-olympus 
* Crizz0/ticket/12146:
  [ticket/12146] Added a missing # to inline css-style of <span>
 2014-02-02 17:15:46 +01:00
Andreas Fischer
16e81d4d18 [ticket/11509] Fail on Travis CI if commit messages are improperly formatted. 
PHPBB3-11509
 2014-02-02 17:11:30 +01:00
Crizz0
88fad5856a [ticket/12146] Added a missing # to inline css-style of <span> 
PHPBB3-12146
 2014-02-02 16:44:52 +01:00
Nils Adermann
38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop 
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
 2014-02-02 16:34:55 +01:00
Joas Schilling
a59d6e94a5 [ticket/11201] Remove empty calls section from .yml 
PHPBB3-11201
 2014-02-02 16:32:20 +01:00
Nils Adermann
8a6b961c54 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12147] Remove Travis CI notifications.

Conflicts:
	.travis.yml
 2014-02-02 16:27:28 +01:00
Nils Adermann
ed43436c18 Merge remote-tracking branch 'github-bantu/ticket/12147' into develop-olympus 
* github-bantu/ticket/12147:
  [ticket/12147] Remove Travis CI notifications.
 2014-02-02 16:26:33 +01:00
Joas Schilling
cbad102f88 [ticket/11201] Split template file into multiple files 
PHPBB3-11201
 2014-02-02 16:20:02 +01:00
Joas Schilling
cacd43bfbd [ticket/11201] Remove dependency from types on the manager 
PHPBB3-11201
 2014-02-02 16:13:04 +01:00
Nils Adermann
f8d6a07392 Merge pull request #1716 from marc1706/feature/passwords 
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
 2014-02-02 06:26:35 -08:00
Andreas Fischer
9cc8768fa0 [ticket/12147] Remove Travis CI notifications. 
We don't want to get notifications for branches other people are working on.

PHPBB3-12147
 2014-02-02 15:12:30 +01:00
Marc Alexander
b094c79996 [feature/passwords] Move combined hashing methods to manager 
This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.

PHPBB3-11610
 2014-02-02 14:57:43 +01:00