1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 20:17:36 +02:00

83 Commits

Author SHA1 Message Date
Marc Alexander
8e5b5a5c07 Merge branch '3.1.x' 2016-01-16 23:10:37 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
2016-01-15 14:07:50 +03:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables
This is the first part of the changes. More to come.

PHPBB3-13454
2016-01-06 13:51:19 +01:00
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Zoddo
e9e199bc37 [ticket/8920] Add a MCP PM reports view permission
Anybody who has the permission to read reports in one forum
can read PM reports.

Solving this problem by adding a new permission to read PM reports.

PHPBB3-8920
2015-08-30 12:18:37 +02:00
Marc Alexander
b1a52a5ef3 Merge branch '3.1.x' 2015-05-08 11:07:56 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
2015-05-08 11:07:50 +02:00
Marc Alexander
d275586689 Merge branch '3.1.x' 2015-05-08 00:17:24 +02:00
brunoais
603726371c [ticket/13660] BUMP version to 3.1.5-RC1
PHPBB3-13660
2015-05-06 23:08:07 +01:00
brunoais
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev
PHPBB3-13664
2015-05-06 22:55:30 +01:00
brunoais
94da39cd88 [ticket/13660] Fix @since version.
PHPBB3-13660
2015-03-10 15:42:07 +00:00
brunoais
21cc1fda85 [ticket/13664] Added alias to table to make modding easier.
PHPBB3-13664
2015-03-01 20:57:06 +00:00
brunoais
5fa6871ebf [ticket/13664] Add event to allow changing number of unapproved posts listed
PHPBB3-13664
2015-03-01 20:26:12 +00:00
brunoais
5ad69bbecf [ticket/13664] From string query in mcp_front unapproved posts to built query
PHPBB3-13664
2015-03-01 19:55:43 +00:00
brunoais
8b23272c33 [ticket/13660] Allow changing the query for total reports in mcp_front
PHPBB3-13660
2015-02-28 08:57:43 +00:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Marc Alexander
a166f6f42c [ticket/13569] Add missing sql_freeresults and remove unneeded results
PHPBB3-13569
2015-02-02 17:36:39 +01:00
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
2014-08-23 16:36:39 +02:00
Joas Schilling
bef9d64179 Merge pull request #2762 from brunoais/ticket/12876
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after

* brunoais/ticket/12876:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:32:55 +02:00
brunoais
1f5f2327e8 [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after
event to mcp backend.

PHPBB3-12876
2014-08-07 18:37:07 +01:00
brunoais
a0feced63e [ticket/12877] core.mcp_mcp_front_reports_listing_query_before
Adding core.mcp_mcp_front_reports_listing_query_before

PHPBB3-12877
2014-07-23 07:20:20 +01:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Joas Schilling
2ec9c08a2b [ticket/12052] Use different visibility when post was edited
... and needs to be reapproved.

PHPBB3-12052
2014-04-25 11:52:22 +02:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
Josh Woody
b8c55291ed [feature/soft-delete] Lay the groundwork for a soft-delete feature
So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
2012-08-29 17:49:37 +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
Joas Schilling
6a2b13632d [ticket/10344] Add attachment icons to list of reported and queued posts/topics
PHPBB3-10344
2011-08-27 00:25:38 +02:00
Oleg Pudeyev
ee0db1a1d5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9874] view_log() performs unneeded count query over all log entries.
  [ticket/7834] Topic time didn't update when first post was deleted
  [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
  [ticket/9872] Removed some useless code that broke delete_posts
2011-02-24 20:59:19 -05:00
Joas Schilling
a25238e0c1 [ticket/9874] view_log() performs unneeded count query over all log entries.
PHPBB3-9874
2011-02-25 00:04:48 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Joas Schilling
c768cff554 fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval
Authorised by: AcydBurn



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-12 13:17:58 +00:00
Ruslan Uzdenov
d42e5a71d2 Fix bug #49625 - Performing actions in Main MCP tab does not return correctly
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10002 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-17 13:09:54 +00:00
Joas Schilling
079244a39d Fix Bug #49725 introduced in r9814
Authorised by: ToonArmy


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9989 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-15 10:45:32 +00:00
Nils Adermann
e7b3a68259 geez, maybe we should stop displaying text and this would become easier
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9864 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-26 20:22:41 +00:00
Nils Adermann
e90f25e9b4 geez I'm blind - use the right template and lang vars
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9834 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-22 15:50:31 +00:00
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
Meik Sievertsen
68aa6bd29a put acp, mcp and ucp into modules/ directory
git-svn-id: file:///svn/phpbb/trunk@9223 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:08:15 +00:00
Chris Smith
ef0c0d4c82 been a while :( ... merge in r8997, r8998, r8999, r9000, r9001, r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013, r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056
git-svn-id: file:///svn/phpbb/trunk@9064 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-13 13:04:54 +00:00
Chris Smith
faeb515f75 Fix an issue in r9015 re-index the intersected array
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9029 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-18 18:44:41 +00:00
Chris Smith
bc2f055ccd Moderators can only see reports/queue/logs from forums they can actually read. #31085
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9015 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-14 18:29:50 +00:00
Chris Smith
80437c21a9 Display coloured poster username of queued posts displayed on the front of the MCP.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9013 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-14 14:16:19 +00:00
Meik Sievertsen
2f4a618900 ok... i hope i haven't messed too much with the code and everything is still working.
Changes:
- Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed.
- A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added.

git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 12:25:56 +00:00
Meik Sievertsen
61fc9605fa some changes
git-svn-id: file:///svn/phpbb/trunk@8223 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-03 11:10:07 +00:00
Meik Sievertsen
d0f2399a86 some bugfixes
git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-12 18:14:28 +00:00