mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00
Code Issues Releases Wiki Activity
18,466 Commits 18 Branches 192 Tags
Commit Graph

18466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Guse
b81d0bc228 [ticket/11850] More namespaces 
PHPBB3-11850
 2013-09-30 20:38:41 -05:00
Nathan Guse
870c293bab [ticket/11850] Fix tests 
PHPBB3-11850
 2013-09-30 20:04:32 -05:00
Nathan Guse
1440517b78 [ticket/11850] Need symfony request and filesystem setup globally for session 
PHPBB3-11850
 2013-09-30 18:44:02 -05:00
Nathan Guse
85ae55ca2d [ticket/11850] Update for namespaces 
PHPBB3-11850
 2013-09-30 18:31:26 -05:00
Nathan Guse
a6df011a10 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850 
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
  [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.
  [ticket/11862] Correct var names in user_delete() events due to prune-users
  [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.
  [ticket/11852] Add class file
  [ticket/11852] Move tests to folder with new class name
  [ticket/11852] Split filesystem and path_helper into 2 classes
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
  [ticket/11866] Only single backslash in .md files
  [ticket/11866] Remove outdated and broken develop script
  [ticket/11866] More namespaces
  [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
  [ticket/11865] Convert old class name to namespaced version
  ...

Conflicts:
	tests/security/extract_current_page_test.php
	tests/session/testable_facade.php
 2013-09-30 18:24:46 -05: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
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
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
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
David King
779688b56b Merge pull request #1733 from nickvergessen/ticket/11866 
Ticket/11866 Fix some more namespace issues
 2013-09-25 16:49:12 -07:00
David King
427f73a323 Merge pull request #1732 from nickvergessen/ticket/11865 
[ticket/11865] includes/bbcode.php is missing namespace change
 2013-09-25 16:09:08 -07:00
Joas Schilling
6d5be041e4 [ticket/11866] Only single backslash in .md files 
PHPBB3-11866
 2013-09-26 01:02:29 +02:00
Joas Schilling
9ead28a0fe [ticket/11866] Remove outdated and broken develop script 
PHPBB3-11866
 2013-09-26 00:59:25 +02:00
Joas Schilling
b27fc70a7d [ticket/11866] More namespaces 
PHPBB3-11866
 2013-09-26 00:58:37 +02:00
Joas Schilling
03639c081c [ticket/11866] Update some occurances of phpbb_db_ to new Namespace 
PHPBB3-11866
 2013-09-26 00:42:04 +02:00
Joas Schilling
2794dc4e68 [ticket/11865] Convert old class name to namespaced version 
PHPBB3-11865
 2013-09-26 00:11:42 +02:00
Joas Schilling
bc8c4ac270 [ticket/11865] Add bbcodes to functional posting tests 
PHPBB3-11865
 2013-09-26 00:07:22 +02:00
Nathan Guse
468133c07f Merge pull request #1673 from nickvergessen/ticket/11805 
[ticket/11805] Allow specifying the page in the route for pagination
 2013-09-25 09:11:12 -07:00
Joas Schilling
6fd6324dd6 [ticket/11805] Move page-url generating code into a new function 
PHPBB3-11805
 2013-09-25 17:34:48 +02:00
Joas Schilling
8c786e82a7 [ticket/11805] Rename test to match the function name 
PHPBB3-11805
 2013-09-25 17:34:31 +02:00
Joas Schilling
d7119a5054 [ticket/11805] Add unit tests for pagination 
PHPBB3-11805
 2013-09-25 17:34:31 +02:00
Joas Schilling
cf46487dea [ticket/11805] Do not generate the same link twice 
There is no need to generate the prev/next links twice

PHPBB3-11805
 2013-09-25 17:34:30 +02:00
Joas Schilling
f16a7e351f [ticket/11805] Fix "jump to page" feature for pagination in routes 
PHPBB3-11805
 2013-09-25 17:34:29 +02:00
Joas Schilling
0abb4a5ad3 [ticket/11805] Allow specifying the page in the route for pagination 
Instead of "app.php?controller=news&start=10" authors might prefer having
the pagination in the route. So the sample link from above would be the
same as "app.php?controller=news/page/2". With this patch that is easily
possible. What you do is, you specify the $base_url and $start_name as follows:

	$base_url = $controller_helper->url('news/page/%d');
	$start_name = '/page/%d'; // Part of the url that will be removed
				  // for page 1

Now this will generate:
	"news"		for start = 0
		"news/page/1" will work aswell, but will not be created
	"news/page/2"	for start = 10

PHPBB3-11805
 2013-09-25 17:34:28 +02:00