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

23432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
cafd3b79fd [ticket/13207] Use assert_checkbox_is_checked for registration test 
PHPBB3-13207
 2014-10-25 20:05:25 -07:00
Nils Adermann
a5830fe0d5 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
 2014-10-25 18:11:03 -07:00
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -07:00
Nils Adermann
9c95831f35 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
 2014-10-25 17:12:34 -07:00
Nils Adermann
c789acc091 [prep-release-3.1.0] Add CHANGELOG for 3.1.0 2014-10-25 17:12:14 -07:00
Nils Adermann
8de93bee95 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
 2014-10-25 17:05:07 -07:00
Nils Adermann
f2e9c62a97 [prep-release-3.1.0] Add 3.1.0 gold release migration 2014-10-25 17:03:50 -07:00
Nils Adermann
26d4483d36 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:56:05 -07:00
Nils Adermann
4859cec0c5 Merge remote-tracking branch 'github-marc1706/ticket/13207' into prep-release-3.1.0 
* github-marc1706/ticket/13207:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:55:29 -07:00
Marc Alexander
0dcb874c09 [ticket/13207] Add notification manager mock to user_add method in tests 
PHPBB3-13207
 2014-10-25 16:16:25 -07:00
Marc Alexander
81ad381263 [ticket/13207] Move default user notifications settings to user_add() 
PHPBB3-13207
 2014-10-25 14:57:01 -07:00
Marc Alexander
18f24a2270 [ticket/13207] Add default subscription options for newly registered users 
PHPBB3-13207
 2014-10-25 14:50:01 -07:00
Nils Adermann
f22cd2d734 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13215] Update Symfony components to v2.3.21.
 2014-10-25 14:01:54 -07:00
Nils Adermann
07e7cde560 Merge pull request #3062 from bantu/ticket/13215 
[ticket/13215] Update Symfony components to v2.3.21.
 2014-10-25 14:01:13 -07:00
Andreas Fischer
ad06f6dd71 [ticket/13215] Update Symfony components to v2.3.21. 
PHPBB3-13215
 2014-10-25 21:29:45 +02:00
Nils Adermann
9ea08aa4d7 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
 2014-10-25 12:09:55 -07:00
Nils Adermann
4e952ad443 Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0 
* commit '078e0c1e440f7f906b670348e8da00141e245876':
  [ticket/13211] Move console migrator output handler back to console folder
  [ticket/13211] Also use log wrapper output handler for console migrations
  [ticket/13211] Move console migrator output handler to db folder
  [ticket/13211] Add log wrapper for writing database updater to log file
  [ticket/13126] Add missing use statement
  [ticket/13126] Fix tests
  [ticket/13126] Change messages verbosity levels
  [ticket/13126] Move migrator_output_handler to an interface
  [ticket/13126] Extends migrator_output_handler instead of using a closure
  [ticket/13126] Improve the feedback when running the migrations
 2014-10-25 12:09:20 -07:00
Nils Adermann
6308a442d1 Merge pull request #3060 from marc1706/ticket/13211 
[ticket/13211] Add log wrapper for writing database updater to log file
 2014-10-25 12:04:29 -07:00
Marc Alexander
078e0c1e44 [ticket/13211] Move console migrator output handler back to console folder 
PHPBB3-13211
 2014-10-25 12:03:13 -07:00
Marc Alexander
8443463006 [ticket/13211] Also use log wrapper output handler for console migrations 
PHPBB3-13211
 2014-10-25 11:55:15 -07:00
Andreas Fischer
d2e3198407 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13210] Use the correct config value
 2014-10-25 19:50:26 +02:00
Andreas Fischer
a43879fe91 Merge pull request #3061 from Elsensee/ticket/13210 
[ticket/13210] Use the correct config value

* Elsensee/ticket/13210:
  [ticket/13210] Use the correct config value
 2014-10-25 19:48:33 +02:00
Andreas Fischer
103c929ff0 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13208] Add security issues to the final changelog
  [prep-release-3.1.0] Prepare Changelog
  [prep-release-3.1.0] Update version to 3.1.0
 2014-10-25 19:39:50 +02:00
Oliver Schramm
a9a67b08a5 [ticket/13210] Use the correct config value 
PHPBB3-13210
 2014-10-25 14:28:56 +02:00
Marc Alexander
b27b9a6984 [ticket/13211] Move console migrator output handler to db folder 
PHPBB3-13211
 2014-10-24 13:33:26 -07:00
Marc Alexander
516bd9ea51 [ticket/13211] Add log wrapper for writing database updater to log file 
PHPBB3-13211
 2014-10-24 13:22:56 -07:00
Marc Alexander
14300a1475 Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 2014-10-24 13:22:39 -07:00
Marc Alexander
6217a51920 Merge pull request #3059 from nickvergessen/ticket/13208 
[ticket/13208] Add security issues to the final changelog
 2014-10-23 08:56:01 -04:00
Joas Schilling
c814483627 [ticket/13208] Add security issues to the final changelog 
PHPBB3-13208
 2014-10-23 12:36:27 +02:00
Joas Schilling
1cd09a03e6 [prep-release-3.1.0] Prepare Changelog 2014-10-23 12:25:52 +02:00
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02:00
Joas Schilling
08f365236a Merge branch 'prep-release-3.1.0-RC6' into develop-ascraeus 2014-10-23 02:44:45 +02:00
Joas Schilling
7a90184421 [prep-release-3.1.0-RC6] Update phpBB Version for RC7 development 2014-10-23 02:44:18 +02:00
Joas Schilling
5847a50334 [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6 release-3.1.0-RC6 2014-10-23 01:57:59 +02:00
Joas Schilling
1ade9b39e4 [prep-release-3.1.0-RC6] Prepare Changelog 2014-10-23 01:55:48 +02:00
Joas Schilling
4c94e44710 [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 2014-10-23 01:50:12 +02:00
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Joas Schilling
e4c8e4905c Merge pull request #3 from phpbb/ticket/security-161 
[ticket/security-161] Add form token to styles management form.
 2014-10-23 01:38:12 +02:00
Cesar G
4d30633cd4 [ticket/security-161] Add form token to styles management form. 
SECURITY-161
 2014-10-22 15:46:00 -07:00
Marc Alexander
6a0727acdc Merge pull request #3058 from naderman/ticket/13205 
[ticket/13205] Add a mark all messages read link to PM folders
 2014-10-22 17:39:13 -05:00
Nils Adermann
df72846b89 [ticket/13205] Explicitly cast ids to integers and reformat SQL 
PHPBB3-13205
 2014-10-22 18:35:07 -04:00
Nils Adermann
b5594371ab [ticket/13205] Remove superfluous newline 
PHPBB3-13205
 2014-10-22 18:31:29 -04:00
Nils Adermann
d7553893c4 Merge pull request #3057 from marc1706/ticket/security-159 
[ticket/security-159] Only show first 8 characters of login keys in UCP
 2014-10-22 18:20:46 -04:00
Nils Adermann
48dc4c02ae [ticket/13205] Add a mark all messages read link to PM folders 
PHPBB3-13205
 2014-10-22 18:02:43 -04:00
Marc Alexander
f796f92058 [ticket/security-159] Only show first 8 characters of login keys in UCP 
SECURITY-159
 2014-10-22 16:21:16 -05:00
Nils Adermann
fad280f94b Merge pull request #3056 from marc1706/ticket/13203 
[ticket/13203] Use constant time comparison method for comparing password hashes
 2014-10-22 16:57:50 -04:00
Marc Alexander
cf9d1fbd1a [ticket/13203] Fix passwords manager tests 
PHPBB3-13203
 2014-10-22 15:09:58 -05:00
Marc Alexander
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers 
PHPBB3-13203
 2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper 
PHPBB3-13203
 2014-10-22 14:54:22 -05:00
Tristan Darricau
fdece6cdf3 [ticket/13126] Add missing use statement 
PHPBB3-13126
 2014-10-22 15:25:50 +02:00