mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
19,243 Commits 17 Branches 190 Tags
Commit Graph

8225 Commits

Author SHA1 Message Date
Joas Schilling
51561ed538 [ticket/11948] Allow resource importing for routing 
PHPBB3-11948
 2013-10-21 21:52:48 +02:00
Cesar G
c7b88ee1d1 [ticket/11923] Attempt to translate errors only if user can change avatar. 
PHPBB3-11923
 2013-10-17 21:29:02 -07:00
Cesar G
403da5d38d [ticket/11280] Prevent duplicate entry in forums_track table. 
Enforcing a time limit prevents all rows from being selected, thus a new row
is inserted resulting in a duplicate entry.

PHPBB3-11280
 2013-10-16 23:56:45 -07:00
Nathan Guse
852b707b48 Merge pull request #1781 from VSEphpbb/ticket/11921 
Ticket/11921 - Streamline PMs and Notifications in Header Link List
 2013-10-16 10:50:17 -07:00
Matt Friedman
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template 
PHPBB3-11921
 2013-10-16 10:26:33 -07:00
Matt Friedman
bd58c31ee0 [ticket/11921] Only get the count of unread PMs 
PHPBB3-11921
 2013-10-16 10:08:29 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates 
PHPBB3-11921
 2013-10-16 10:07:54 -07:00
Joas Schilling
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs 
PHPBB3-11924
 2013-10-16 16:32:40 +02:00
Matt Friedman
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables 
PHPBB3-11921
 2013-10-15 14:09:47 -07:00
Joas Schilling
3bb93ab2d3 [develop] Update version to 3.1.0-a2-dev 2013-10-15 22:46:02 +02:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist 
PHPBB3-11921
 2013-10-15 10:29:15 -07:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload 
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
 2013-10-11 17:40:16 +02:00
Nils Adermann
446dc9b47e Merge pull request #1764 from EXreaction/ticket/11874 
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
 2013-10-10 15:54:58 -07:00
Nathan Guse
ac9225774e [ticket/11874] Correct when $phpbb_root_path is appended to build_url() 
PHPBB3-11874
 2013-10-10 16:41:31 -05:00
Andreas Fischer
a409d39881 [ticket/11703] Also use empty() for T_JQUERY_LINK. 
PHPBB3-11703
 2013-10-10 23:30:29 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic. 
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
 2013-10-10 23:26:03 +02:00
Andreas Fischer
d024ba9b09 [ticket/11901] Pass empty string as relative_url for non-local magic URL. 
Only the regular expression for MAGIC_URL_LOCAL has three capturing groups. As
a result $matches[3] is only set in this case. Prior to PHPBB3-11606 an empty
string was passed to make_clickable_callback() as a replacement in case of less
than three capturing groups. This patch reintroduces the empty string.

Regression from 49c12ef4be229bf2223139298766ef441b075fbc.

PHPBB3-11901
 2013-10-10 21:01:15 +02:00
Nathan Guse
b992686fe0 [ticket/11898] Correct adm_relative_path created by installer 
PHPBB3-11898
 2013-10-10 09:08:56 -05:00
Nathaniel Guse
e1ed30a408 [ticket/11898] Correct admin S_LOGIN_ACTION 
PHPBB3-11898
 2013-10-09 10:18:14 -05:00
Andreas Fischer
cba383d139 Merge remote-tracking branch 'prototech/ticket/11890' into develop 
* prototech/ticket/11890:
  [ticket/11890] Fix untranslated string when deleting posts through MCP.
 2013-10-08 23:36:28 +02:00
Cesar G
6a75edc057 [ticket/11892] Fix undefined variables: to_forum_id & to_topic_id 
PHPBB3-11892
 2013-10-08 14:24:57 -07:00
Cesar G
964f6fe89a [ticket/11890] Fix untranslated string when deleting posts through MCP. 
PHPBB3-11890
 2013-10-08 10:56:04 -07:00
Nathan Guse
fdae60c146 Merge pull request #1739 from nickvergessen/ticket/11871 
[ticket/11871] Allow backslash in classnames for Modules
 2013-10-03 20:31:16 -07:00
Nathan Guse
31aebb355c Merge pull request #1654 from rechosen/ticket/11786 
[ticket/11786] Fix various defects in PHPDoc in-code documentation
 2013-10-03 20:22:41 -07:00
Joas Schilling
2ab3ee7d67 [ticket/11871] Fallback to int ID of the module, when creating links 
Firefox is currently unable to correctly copy a urlencoded \ so users will be
unable to post links to modules. However we can still fallback to the id
instead of the name, so we do that in this case.

PHPBB3-11871
 2013-10-02 22:37:16 +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
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
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
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
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes 
PHPBB3-11852
 2013-09-26 15:34:44 +02:00
Vjacheslav Trushkin
0e6ac7511e [ticket/11868] Replace phpbb_request_interface references 
PHPBB3-11868
 2013-09-26 12:02:17 +03: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
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
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
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
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
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