makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
18538 commits 18 branches 192 tags 207 MiB
Commit graph

18538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords 
Conflicts:
	phpBB/includes/functions.php
 2013-10-03 10:04:59 +02:00
Marc Alexander
93531e7fb0 [feature/passwords] Add prepending backslash to class namespaces 
PHPBB3-11610
 2013-10-02 23:45:32 +02:00
Marc Alexander
e7e11112b1 [feature/passwords] Fix tests after changes to phpBB hashing functions 
PHPBB3-11610
 2013-10-02 17:24:11 +02:00
Dhruv
49ce2c13b2 Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11691:
  [ticket/11691] Fix conversion test
  [ticket/11691] Fix table names and arguments/docs
  [ticket/11691] Move purge code into new function
  [ticket/11691] Fix typo in comment
  [ticket/11691] Add order by to the query
  [ticket/11691] Fix some minor comments
  [ticket/11691] Fix some more problems with softdelete update
  [ticket/11691] Change detection of effectively_installed()
  [ticket/11691] Stagger user notification reconversion even more
  [ticket/11691] Stagger the convertion of soft delete updates
 2013-10-02 20:46:11 +05:30
Marc Alexander
3aba3235d5 [feature/passwords] Use passwords manager in phpBB hash functions 
PHPBB3-11610
 2013-10-02 15:43:10 +02:00
Andreas Fischer
f5676fab3c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11879] Replace .live() with .on()

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js
 2013-10-02 15:01:13 +02:00
Andreas Fischer
8f2cebc0bb Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus 
* cyberalien/ticket/11879:
  [ticket/11879] Replace .live() with .on()
 2013-10-02 15:00:26 +02:00
Marc Alexander
afb7d2e616 [feature/passwords] Rename manager methods to check() and hash() 
These method names are more straightforward than the previous ones.

PHPBB3-11610
 2013-10-02 13:30:36 +02:00
Marc Alexander
356f3eef07 [feature/passwords] Inject passwords manager into auth providers 
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().

PHPBB3-11610
 2013-10-02 13:28:38 +02:00
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on() 
PHPBB3-11879
 2013-10-02 11:12:41 +03:00
Joas Schilling
d7b8c15c86 Merge pull request #1744 from EXreaction/ticket/11878 
[ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
 2013-10-01 23:58:14 -07:00
Nathan Guse
9503b4d529 [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules 
PHPBB3-11878
 2013-10-02 00:12:29 -05:00
Marc Alexander
61e4c0f251 [feature/passwords] Do not hash passwords longer than 4096 bytes 
PHPBB3-11610
 2013-10-01 17:38:52 +02:00
Joas Schilling
7aadcd5472 [ticket/11691] Fix conversion test 
PHPBB3-11691
 2013-10-01 09:56:24 +02:00
Nathan Guse
179f41475b Merge pull request #1735 from nickvergessen/ticket/11852 
Ticket/11852 filesystem class must not depend on a web request
 2013-09-30 16:21:02 -07:00
Nils Adermann
af2ad7a162 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
 2013-09-30 23:35:06 +02:00
Andreas Fischer
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256. 
PHPBB3-11876
 2013-09-30 18:09:27 +02:00
Andreas Fischer
da9756ba25 [ticket/11876] Move checksum generation from build PHP files to phing build.xml 
This also removes paths from the checksum files.

PHPBB3-11876
 2013-09-30 18:08:42 +02:00
Andreas Fischer
94fccd8a5e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.

Conflicts:
	build/build.xml
 2013-09-30 17:05:40 +02:00
Andreas Fischer
ac4736db08 [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. 2013-09-30 17:04:14 +02:00
Andreas Fischer
787784e083 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
 2013-09-28 15:02:59 +02:00
Andreas Fischer
02f9d179e5 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
 2013-09-28 15:02:44 +02:00
Marc Alexander
3ebff0a960 [feature/passwords] Pass config via service container to driver helper 
This will get rid of the global $config in the driver helper

PHPBB3-11610
 2013-09-28 12:42:11 +02:00
Marc Alexander
de087d537e [feature/passwords] A few more corrections in methods due to namespacing 
PHPBB3-11610
 2013-09-28 12:41:02 +02:00
Andreas Fischer
446ea9928d [prep-release-3.0.12] Update changelog for 3.0.12 release. 2013-09-28 03:20:51 +02:00
Andreas Fischer
426994a7f8 Merge branch 'ticket/11873' into prep-release-3.0.12 
* ticket/11873:
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
 2013-09-28 03:19:24 +02:00
Joas Schilling
c6aefcf555 [ticket/11873] Add unit test for large password input. 
The password should be rejected quite fast.

PHPBB3-11873
 2013-09-28 03:14:18 +02:00
Joas Schilling
cba28c39ad [ticket/11873] Do not hash very large passwords in order to safe resources. 
PHPBB3-11873
 2013-09-28 03:12:50 +02:00
Marc Alexander
5bc5e4716c [feature/passwords] More changes due to namespacing 
PHPBB3-11610
 2013-09-27 16:58:06 +02:00
Joas Schilling
08b49203b4 Merge remote-tracking branch 'Marc/ticket/11862' into develop 
* Marc/ticket/11862:
  [ticket/11862] Correct var names in user_delete() events due to prune-users
 2013-09-27 13:34:53 +02:00
Marc Alexander
9dc9214ebb [ticket/11862] Correct var names in user_delete() events due to prune-users 
Fix comments after incorrect merge of previous PR.

PHPBB3-11862
 2013-09-27 13:32:37 +02:00
Joas Schilling
9d8d871369 Merge remote-tracking branch 'Marc/ticket/11862' into develop 
* Marc/ticket/11862:
  [ticket/11862] Correct var names in user_delete() events due to prune-users
 2013-09-27 12:58:31 +02:00
Marc Alexander
3f63b9b470 [feature/passwords] Modify passwords files for namespacing changes 
PHPBB3-11610
 2013-09-27 11:16:47 +02:00
Marc Alexander
e41c9ef6cd [feature/passwords] Add schema changes to schema_data for new hash types 
PHPBB3-11610
 2013-09-27 10:48:00 +02:00
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords 
Conflicts:
	phpBB/develop/create_schema_files.php
 2013-09-27 10:47:10 +02:00
Andreas Fischer
8db820be63 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
 2013-09-27 01:39:24 +02:00
Andreas Fischer
50f6af2a20 [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. 2013-09-27 01:37:14 +02:00
Andreas Fischer
9a5415fe6d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-09-27 01:32:09 +02:00
Andreas Fischer
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
Joas Schilling
213e7563ad [ticket/11852] Add class file 
PHPBB3-11852
 2013-09-27 00:08:54 +02:00
Andreas Fischer
56ee5973bc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
 2013-09-26 16:01:01 +02:00
Andreas Fischer
259a6f0834 Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympus 
* marc1706/ticket/11864:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
 2013-09-26 16:00:53 +02:00
Joas Schilling
c7a9d5e34a [ticket/11852] Move tests to folder with new class name 
PHPBB3-11852
 2013-09-26 15:35:53 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes 
PHPBB3-11852
 2013-09-26 15:34:44 +02:00
Andreas Fischer
36bf4438e4 Merge remote-tracking branch 'cyberalien/ticket/11868' into develop 
* cyberalien/ticket/11868:
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
 2013-09-26 14:24:50 +02:00
Vjacheslav Trushkin
ccf00c7265 [ticket/11868] Add @depends to test 
PHPBB3-11868
 2013-09-26 15:21:04 +03:00
Vjacheslav Trushkin
1e1e9130e6 Merge pull request #3 from nickvergessen/ticket/cyberalien/11868 
Ticket/cyberalien/11868
 2013-09-26 03:38:44 -07:00
Joas Schilling
b1dbd5e992 [ticket/11868] Add functional test for registration 
PHPBB3-11868
 2013-09-26 11:49:35 +02:00
Vjacheslav Trushkin
0e6ac7511e [ticket/11868] Replace phpbb_request_interface references 
PHPBB3-11868
 2013-09-26 12:02:17 +03:00
Joas Schilling
e8303bc319 Merge remote-tracking branch 'EXreaction/ticket/11816-2' into develop 
* EXreaction/ticket/11816-2:
  [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
 2013-09-26 10:59:14 +02:00