1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Commit Graph

16771 Commits

Author SHA1 Message Date
Nathan
5bd7f1bd36 [ticket/11882] If dependency is incorrect/unfulfillable, throw an error
PHPBB3-11882
2013-10-02 14:21:50 -05:00
Nathan
cab84dd9c5 [ticket/11882] Incorrect dependency in signature module auth migration
PHPBB3-11882
2013-10-02 14:18:32 -05: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
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
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on()
PHPBB3-11879
2013-10-02 11:12:41 +03: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
Nathan Guse
e905a46b8c [ticket/11840] Fix regex
PHPBB3-11840
2013-09-30 21:18:20 -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
MichaelC
fd022123c0 [task/composer-compatibility] Minor changes that will break extension BC
PHPBB3-11840
2013-10-01 00:35:36 +01: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
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
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
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
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