mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
19,715 Commits 17 Branches 190 Tags
Commit Graph

19715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
4c62cb4989 [ticket/12183] Make sure to undo changes to config in forgot_password_test 
The forgot_password_test disables the password reset functionalty but doesn't
enable it again afterwards.

PHPBB3-12183
 2014-02-11 08:24:49 +01:00
Marc Alexander
488bd1a1b1 [ticket/12183] Add functional test for user password reset 
PHPBB3-12183
 2014-02-10 22:37:28 +01:00
Marc Alexander
c864d06ac6 [ticket/12183] Add migration file for updating user_newpasswd column 
PHPBB3-12183
 2014-02-10 22:10:31 +01:00
Marc Alexander
5ce0bb7630 [ticket/12183] Update user_newpasswd column to length of 255 in schema files 
PHPBB3-12183
 2014-02-10 22:06:42 +01:00
Joas Schilling
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop 
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
 2014-02-10 14:23:09 +01:00
Nils Adermann
840ab75520 Merge pull request #1988 from nickvergessen/ticket/12115 
[ticket/12115] Convert occupation profile field to custom field
 2014-02-10 13:52:12 +01:00
Andreas Fischer
02674de893 Merge pull request #2022 from nickvergessen/ticket/12175 
Ticket/12175 Fix and run functional upload tests

* nickvergessen/ticket/12175:
  [ticket/12175] Do not use admin account for file size limit test
  [ticket/12175] Fix test for uploading a valid file
  [ticket/12175] Fix upload test for empty file
 2014-02-10 02:16:27 +01:00
Joas Schilling
1fdd01275e [ticket/12175] Do not use admin account for file size limit test 
PHPBB3-12175
 2014-02-09 23:48:34 +01:00
Joas Schilling
07f19647f4 [ticket/12175] Fix test for uploading a valid file 
PHPBB3-12175
 2014-02-09 23:47:20 +01:00
Joas Schilling
ff57ecf0bc [ticket/12175] Fix upload test for empty file 
PHPBB3-12175
 2014-02-09 23:45:41 +01:00
Andreas Fischer
eb2d8fe6d8 Merge pull request #2017 from nickvergessen/ticket/12141 
[ticket/12141] Disable opcache on travis for php 5.5.8 aswell

* nickvergessen/ticket/12141:
  [ticket/12141] Disable opcache on travis for php 5.5.8 aswell
 2014-02-08 14:00:30 +01:00
Joas Schilling
81c6ca7e4c [ticket/12141] Disable opcache on travis for php 5.5.8 aswell 
PHPBB3-12141
 2014-02-08 12:52:22 +01:00
Marc Alexander
9b1b6bd477 Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170 2014-02-07 22:35:04 +01:00
Nathan Guse
344fde7f06 [ticket/12170] Test for 12170 
PHPBB3-12170
 2014-02-07 14:37:45 -06:00
Marc Alexander
e8f8dcf0ea [ticket/12170] Assign schema keys in migration helper with data_depth 1 
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.

PHPBB3-12170
 2014-02-07 21:13:50 +01:00
Joas Schilling
4663ea7c82 [ticket/12115] Remove space from line ending 
PHPBB3-12115
 2014-02-06 14:18:30 +01:00
Joas Schilling
26640bad3d [ticket/12115] Add migration file to remove old user columns 
PHPBB3-12115
 2014-02-06 11:32:13 +01:00
Joas Schilling
190301021b [ticket/12115] Use base class to reduce duplicate code 
PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
c2cf294be5 [ticket/12115] Add a new migration for profilefield_interests 
With this we avoid missing to copy one, when the admin already created
a phpbb_* profile field.

PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields 
PHPBB3-12115
 2014-02-06 11:32:11 +01:00
Joas Schilling
0ad726768c [ticket/12115] Remove old language strings 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
8dab016a7b [ticket/12115] Add methods to interface 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
f97d268a79 [ticket/12115] Translate profile field name before displaying it in errors 
PHPBB3-12115
 2014-02-06 11:32:08 +01:00
Joas Schilling
38608bfa62 [ticket/12115] Remove occupation field from html files 
PHPBB3-12115
 2014-02-06 11:32:07 +01:00
Joas Schilling
7d04961919 [ticket/12115] Add language entries for the profile fields 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
3c640e57c5 [ticket/12115] Convert user occupation to a profile field 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
344baf9180 Merge branch 'prep-release-3.1.0-a3' into develop 2014-02-05 22:25:45 +01:00
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Nils Adermann
32bc5d72e4 Merge pull request #1995 from EXreaction/ticket/11880 
Schema changes can take too long and cause a timeout
 2014-02-05 17:52:17 +01:00
Nathan Guse
be28445b66 [ticket/11880] migration helper file 
PHPBB3-11880
 2014-02-05 10:00:01 -06:00
Joas Schilling
11d5f49adb [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 release-3.1.0-a3 2014-02-05 16:58:05 +01:00
Nathan Guse
38eb6b0e13 [ticket/11880] Move get_schema_steps function to a migrator helper class 
PHPBB3-11880
 2014-02-05 09:57:36 -06:00
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