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

431 Commits

Author SHA1 Message Date
Oleg Pudeyev
90b458d87e Merge PR #722 branch 'Senky/ticket/9918' into develop 
* Senky/ticket/9918:
  [ticket/9918] default values in request_var changed to one string
  [ticket/9918] $redirect variable used from now
 2012-11-06 21:10:20 -05:00
Oleg Pudeyev
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop 
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
 2012-11-06 16:23:33 -05:00
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 
PHPBB3-11023
 2012-10-17 23:34:37 +02:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name 
PHPBB3-11140
 2012-10-09 22:00:28 -05:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Dhruv
7c406e1e81 [ticket/11052] update search backend constructor everywhere 
PHPBB3-11052
 2012-08-15 22:05:26 +05:30
Joas Schilling
a9d4ed0cfc [feature/php-events] Fix naming and doc of core.mcp_view_forum_modify_topicrow 
PHPBB3-9550
 2012-08-04 17:35:51 +02:00
Joas Schilling
758fb67a7d [feature/php-events] Add missing global $phpbb_dispatcher 
PHPBB3-9550
 2012-08-01 10:18:51 +02:00
Michael Cullum
3d4946f5f0 [feature/events] Fixing events issues 
PHPBB3-9550
 2012-08-01 10:18:46 +02:00
Michael Cullum
643081d56c [feature/events] Adding core.mcp_forum_topicrow ledge 
PHPBB3-9550
 2012-08-01 10:18:43 +02:00
Nathan Guse
577dbf8951 [ticket/10990] Changes for develop 
PHPBB3-10990
 2012-07-22 14:48:39 -05:00
Drae
584d49459d [feature/pagination-as-list] New parameter for name of start var 
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
 2012-07-18 14:32:42 +01:00
Drae
27d8aef528 [feature/pagination-as-list] Updates for nils comments 
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
 2012-07-18 14:32:18 +01:00
Drae
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions 
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
 2012-07-18 14:31:50 +01:00
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements 
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
 2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template 
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
 2012-07-18 14:30:20 +01:00
Bruno Ais
fce0c5d436 [ticket/10871] Delete the unwanted implode 
Deleted the implode that had no reason to be there

PHPBB3-10871
 2012-05-04 20:08:42 +01:00
Bruno Ais
593ef78859 [ticket/10845] Remove censor from text 
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.

PHPBB3-10845
 2012-05-02 17:13:39 +01:00
Bruno Ais
06f4ef8852 [ticket/10845] Now it shows the preview post parsed 
With this addition, the preview post in the report details now shows with the
BBCode parsed.

Note: Tested with all BBCodes I have including one personalised to write the <s>
BBCode.

PHPBB3-10845
 2012-05-01 12:44:34 +01:00
Nils Adermann
6ae68a3eb5 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop 
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
 2012-04-20 01:08:21 +02:00
Dhruv Goel
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php 
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
 2012-04-16 01:24:10 +05:30
Senky
807eccc976 [ticket/9918] default values in request_var changed to one string 
As per marc1706's note, all request_var functions now have only one string in default value

PHPBB3-9918
 2012-04-15 19:13:08 +02:00
Senky
e6a1d37634 [ticket/9918] $redirect variable used from now 
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.

PHPBB3-9918
 2012-04-09 16:23:42 +02:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth 
PHPBB3-10609
 2012-03-31 18:14:11 +02:00
Callum Macrae
d8e21952fa [ticket/10273] Fixed accepting / denying posts AJAX. 
PHPBB3-10273
 2012-03-31 02:10:16 +02:00
Bruno Ais
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing. 
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
 2012-03-19 08:27:32 -04:00
Bruno Ais
18373035c3 [feature/save-post-on-report] Changed the name of the column 
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
 2012-03-19 08:27:32 -04:00
Bruno Ais
95b5109c62 [feature/save-post-on-report] The complete changes for this feature 
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
 2012-03-19 08:27:31 -04:00
Oleg Pudeyev
1fa39ea722 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
 2012-03-16 06:18:35 -04:00
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page 
PHPBB3-8636
 2012-02-23 10:55:57 +01:00
Vjacheslav Trushkin
92303d2dac [ticket/10637] Leftovers from implementation of extensions in mcp_post 
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323

PHPBB3-10637
 2012-02-09 22:17:33 +02:00
Vjacheslav Trushkin
1d72a47ea6 [ticket/10637] Leftovers from implementation of extensions in mcp_main 
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
 2012-02-09 22:13:13 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places 
PHPBB3-10345
 2011-11-25 15:10:44 -05:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop 
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
 2011-11-24 21:51:10 -05:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls 
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
 2011-11-21 16:22:07 +01:00
Oleg Pudeyev
08032068c0 Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop 
* nickvergessen/ticket/10344:
  [ticket/10344] Add attachment icons to list of reported and queued posts/topics
 2011-11-20 00:46:45 -05:00
Oleg Pudeyev
936fd38ee6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10402] Fixed a formatting issue with report details.
 2011-11-20 00:16:45 -05:00
Oleg Pudeyev
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus 
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
 2011-11-20 00:15:48 -05:00
Nils Adermann
0a4efcbe8c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9956] Display error message if no disapprove reason given

Conflicts:
	phpBB/includes/mcp/mcp_queue.php
 2011-11-18 19:42:44 +01:00
Nils Adermann
6894477b60 Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus 
* github-nickvergessen/ticket/9956:
  [ticket/9956] Display error message if no disapprove reason given
 2011-11-18 19:41:10 +01:00
Andreas Fischer
8f381fc8ae Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10365] Require m_report permission to see reports in mcp_post
  [ticket/10365] Make sure moderators only get mcp_reports link when allowed
 2011-11-13 15:47:40 +01:00
Igor Wiedler
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read 
PHPBB3-10365
 2011-11-13 15:37:26 +01:00
Igor Wiedler
18ca3a32bc [ticket/10365] Require m_report permission to see reports in mcp_post 
This was exposed to anyone with m_ perms in mcp_post_details.

PHPBB3-10365
 2011-10-30 19:10:58 +01:00
Igor Wiedler
d6c3e7785d [ticket/10365] Make sure moderators only get mcp_reports link when allowed 
The m_report permission is not not being checked when displaying the link to
mcp_reports.

PHPBB3-10365
 2011-10-30 19:10:57 +01:00
Callum Macrae
8795362879 [ticket/10402] Fixed a formatting issue with report details. 
Line returns were being removed and links weren't being made clickable.
This commit adds a line (contributed by AmigoJack) to retain the link
breaks and make links clickable.

PHPBB3-10402
 2011-10-22 23:03:49 +01:00
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:46 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts 
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
 2011-10-14 17:37:12 +02:00
Joas Schilling
ab8ecf5b92 [ticket/9956] Display error message if no disapprove reason given 
PHPBB3-9956
 2011-10-14 04:18:44 +02:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files 
Removing imagesets. Adjustments to php files

PHPBB3-10336
 2011-09-04 01:08:00 +03:00