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

18494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
5bc5e4716c [feature/passwords] More changes due to namespacing 
PHPBB3-11610
 2013-09-27 16:58:06 +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
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
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
Nils Adermann
8da3133238 Merge pull request #1565 from naderman/ticket/11700 
[WIP][ticket/11700] Namespaces
 2013-09-25 07:50:22 -07:00
Nils Adermann
645bd127dd [ticket/11700] Undo migrations migration, as not an issue for new installs 
PHPBB3-11700
 2013-09-25 16:20:26 +02:00
Nils Adermann
cbc458e476 [ticket/11700] Update migrations table for namespaces 
PHPBB3-11700
 2013-09-25 16:09:14 +02:00
Nils Adermann
9373c0db96 [ticket/11700] Only replace phpbb_search in strings that match 
PHPBB3-11700
 2013-09-25 14:40:12 +02:00
Nils Adermann
3a478cb3e2 [ticket/11700] Use spaces, not tabs 
PHPBB3-11700
 2013-09-25 14:36:50 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums 
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
 2013-09-25 13:35:08 +02:00
Nils Adermann
86147b46a4 [ticket/11700] Return class names with leading backslash in finder 
PHPBB3-11700
 2013-09-25 13:15:34 +02:00
Nils Adermann
3209d3c69a Merge pull request #3 from nickvergessen/ticket/naderman/11700 
Ticket/naderman/11700
 2013-09-25 03:39:02 -07:00
Joas Schilling
625411587d [ticket/11700] Escape Backslashes from schema_data.sql for MySQLi 
PHPBB3-11700
 2013-09-25 12:02:01 +02:00
Joas Schilling
ed55626165 [ticket/11700] Fix unresolvable condition in migration 
PHPBB3-11700
 2013-09-25 10:01:44 +02:00
Andreas Fischer
717e2337b9 Merge remote-tracking branch 'cyberalien/ticket/11846' into develop 
* cyberalien/ticket/11846:
  [ticket/11846] Replace empty p with margin-top
 2013-09-23 12:52:43 +02:00
Andreas Fischer
41dd9d3b49 Merge remote-tracking branch 'fredsa/ticket/11606' into develop 
* fredsa/ticket/11606:
  [ticket/11606] remove preg_replace() /e modifier in make_clickable()
 2013-09-23 02:25:13 +02:00
Marc Alexander
01512104b5 [feature/passwords] Use dependency injection for passwords driver helper 
The passwords driver helper is now injected into the driver base instead
of being manually loaded.

PHPBB3-11610
 2013-09-22 22:53:10 +02:00
Marc Alexander
f5eb0d744e [feature/passwords] Use dependency injection for helper 
This will now be used instead of manually loading the passwords helper
instance in the passwords manager.

PHPBB3-11610
 2013-09-22 21:17:30 +02:00
Marc Alexander
1970c69c8c [feature/passwords] Rename migrations file to passwords 
Also removed the effectively_installed() check that is not needed according
to EXreaction.

PHPBB3-11610
 2013-09-20 19:37:05 +02:00
Marc Alexander
211f99d881 [feature/passwords] Do not manually include passwords drivers in tests 
PHPBB3-11610
 2013-09-20 17:53:33 +02:00
Marc Alexander
a00854c406 [feature/passwords] Do not pass phpbb_container to passwords manager 
PHPBB3-11610
 2013-09-20 17:31:32 +02:00
Nils Adermann
1f9f96926f [ticket/11700] No need to escape \ in SQL string 
PHPBB3-11700
 2013-09-19 20:31:00 +02:00
Nils Adermann
6b71284681 [ticket/11700] Correctly load templates for extensions 
PHPBB3-11700
 2013-09-19 19:53:57 +02:00