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
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
e0adb15074
[ticket/11871] Allow backslash in classnames for Modules
...
PHPBB3-11871
2013-09-27 18:14:58 +02:00
Marc Alexander
5bc5e4716c
[feature/passwords] More changes due to namespacing
...
PHPBB3-11610
2013-09-27 16:58:06 +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
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
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
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
Joas Schilling
07186656c8
[ticket/11691] Fix table names and arguments/docs
...
PHPBB3-11691
2013-09-26 01:16:37 +02:00
Joas Schilling
8aa9f1d3ab
[ticket/11691] Move purge code into new function
...
PHPBB3-11691
2013-09-26 01:14:36 +02:00
Joas Schilling
3b7abb98e1
[ticket/11691] Fix typo in comment
...
PHPBB3-11691
2013-09-26 01:14:34 +02:00
Joas Schilling
eace91af20
[ticket/11691] Add order by to the query
...
PHPBB3-11691
2013-09-26 01:14:33 +02:00
Joas Schilling
e7c43dbb67
[ticket/11691] Fix some minor comments
...
PHPBB3-11691
2013-09-26 01:14:32 +02:00
Joas Schilling
a7cf62decf
[ticket/11691] Fix some more problems with softdelete update
...
* wrong order of arguments on sql_query_limit
* avoid "BIGINT UNSIGNED value is out of range" errors
* increase limit for the loop
PHPBB3-11691
2013-09-26 01:14:31 +02:00
Joas Schilling
f8d6f0ef08
[ticket/11691] Change detection of effectively_installed()
...
When start is set for a migration, it is not yet effectively installed.
So we just continue doing it...
PHPBB3-11691
2013-09-26 01:14:29 +02:00
Joas Schilling
29c84be40a
[ticket/11691] Stagger user notification reconversion even more
...
PHPBB3-11691
2013-09-26 01:14:29 +02:00
Joas Schilling
a7af736b97
[ticket/11691] Stagger the convertion of soft delete updates
...
PHPBB3-11691
2013-09-26 01:09:17 +02: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
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
6fd6324dd6
[ticket/11805] Move page-url generating code into a new function
...
PHPBB3-11805
2013-09-25 17:34:48 +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
Marc Alexander
2c92123ca5
[ticket/11862] Correct var names in user_delete() events due to prune-users
...
The prune-users feature modified the names of the used variables in this
function. However, the variable names for the two events in this function
were not changed to reflect that. This patch will take care of it.
PHPBB3-11862
2013-09-25 15:59:50 +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
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
rechosen
bf5ce957cf
[ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_before
...
The core.group_delete_user_before event had bad indentation in its PHPDoc.
Fixed.
PHPBB3-11786
2013-09-23 18:10:41 +02:00
rechosen
e45b69ee09
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786
2013-09-23 18:08:29 +02:00
Andreas Fischer
6c3f3ec893
[ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
...
PHPBB3-11860
2013-09-23 14:10:21 +02:00