mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-24 21:26:24 +02:00
Code Issues Releases Wiki Activity
22,987 Commits 10 Branches 193 Tags
7f86b6e71ed97a34aabf4fa77394f5af89349e13
Commit Graph

684 Commits

Author SHA1 Message Date
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
269330749f [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 
PHPBB3-9567
 2012-11-03 23:37:35 +01:00
Joas Schilling
6999d776d4 [feature/soft-delete] Correctly manage soft deleting via MCP 
PHPBB3-9567
 2012-11-02 14:23:17 +01:00
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box 
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
 2012-11-01 22:23:35 +01:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted 
PHPBB3-9567
 2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation 
PHPBB3-9567
 2012-10-31 14:09:23 +01:00
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation 
PHPBB3-9567
 2012-10-30 21:46:04 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation 
PHPBB3-9567
 2012-10-27 17:12:34 +02:00
Joas Schilling
727759c4d8 [feature/soft-delete] Fix disapproving posts/topics in queue 
PHPBB3-9567
 2012-10-23 22:47:57 +02:00
Joas Schilling
43e6b3a921 [feature/soft-delete] Fix some more topic/post count handling 
Only disapproving in queue is missing.

PHPBB3-9567
 2012-10-23 16:59:33 +02:00
Joas Schilling
fec72c4b78 [feature/soft-delete] Fix mcp_move_topic() topic/post count handling 
PHPBB3-9567
 2012-10-23 12:52:31 +02:00
Joas Schilling
5925a17894 [feature/soft-delete] Fix some more uses of topic_replies_real 
PHPBB3-9567
 2012-10-22 14:55:10 +02:00
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere 
PHPBB3-9567
 2012-10-22 11:14:00 +02:00
Joas Schilling
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP 
PHPBB3-9567
 2012-10-21 22:30:20 +02:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments 
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
 2012-10-18 18:32:13 -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
Joas Schilling
0822d2bb61 [feature/soft-delete] Split unapproved/soft deleted posts from topics 
If a topic is soft deleted through a moderator, the topic_delete_user is set.
If it is passively soft deleted (f.e. while the only approved post is deleted)
the topic_delete_user is not set. This way, we can distinguish between these
two cases. The same also applies to unapproved posts. So we need to set the
topic_delete_user when an unapproved topic is posted.

Topics that were soft deleted/unapproved by a user (rather then passive) are
going to be displayed in the Topics modules, while all others are in the posts
modules of the MCP queue.

PHPBB3-9567
 2012-10-17 15:32:57 +02:00
Joas Schilling
2adb37049e [feature/soft-delete] Display guest username in topic list instead of "Guest" 
PHPBB3-9567
 2012-10-17 15:23:16 +02:00
Joas Schilling
43d041bdec [feature/soft-delete] Removed unused old functions 
PHPBB3-9567
 2012-10-16 14:20:23 +02:00
Joas Schilling
722835a4ba [feature/soft-delete] Merge approving and restoring topics into one function 
PHPBB3-9567
 2012-10-16 14:18:56 +02:00
Joas Schilling
51d54109e0 [feature/soft-delete] Merge approving and restoring posts into one function 
PHPBB3-9567
 2012-10-16 13:55:22 +02:00
Joas Schilling
33073fafbe [feature/soft-delete] Add module for soft deleted topics 
Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
 2012-10-15 15:53:32 +02:00
Joas Schilling
b1ce8a8c13 [feature/soft-delete] Add checkbox to restoring posts like on approve 
PHPBB3-9567
 2012-10-15 15:19:32 +02:00
Joas Schilling
a92927d24c [feature/soft-delete] Turn other functions into methods as well 
PHPBB3-9567
 2012-10-15 15:05:02 +02:00
Joas Schilling
7c2cc9cfef [feature/soft-delete] Turn restore_post() into a method and add the docs 
PHPBB3-9567
 2012-10-15 14:02:16 +02:00
Joas Schilling
4bf922fa03 [feature/soft-delete] Fix restoring posts via MCP 
PHPBB3-9567
 2012-10-13 19:00:08 +02:00
Nathan Guse
3d79ce2803 [ticket/11103] Ability to query data before running create_insert_array() 
Mark post/topic in queue notifications read when visiting mcp
Change post/topic in queue notification url to use MCP.

Fix the bug:
Approving a topic marks the topic as read, but before the notification
is created for the user approving the topic (if they would get a
notification that the topic has been made). This causes it to be
stuck "unread".

PHPBB3-11103
 2012-10-12 16:54:42 -05:00
Nathan Guse
1b56a1d6be [ticket/11103] Finishing up report post/pm and adding report closed 
PHPBB3-11103
 2012-10-11 22:36:48 -05:00
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp 
PHPBB3-9567
 2012-10-10 23:10:46 +02:00
Nathan Guse
6d53bd4675 [ticket/11103] Finishing up PM Report notifications 
PHPBB3-11103
 2012-10-09 22:28:41 -05:00
Nathan Guse
9d955507b6 Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103 2012-10-09 22:03:18 -05:00
Nathan Guse
b33e527394 [ticket/11103] Working on report notifications (post/pm) 
PHPBB3-11103
 2012-10-09 22:02:49 -05:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name 
PHPBB3-11140
 2012-10-09 22:00:28 -05:00
Nathan Guse
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere 
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
 2012-10-04 14:47:13 -05:00
Joas Schilling
1943de36f3 [feature/soft-delete] Comment out user_posts update for the moment 
It should rely on the permissions of the post not the current user.

PHPBB3-9657
 2012-10-01 16:25:05 +02:00
Nathan Guse
7454d5c2d5 [ticket/11103] Topic/Post in queue notification 
Also, bug fixes and cleanup

PHPBB3-11103
 2012-09-15 14:33:15 -05:00
Nathan Guse
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications 
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
 2012-09-15 13:51:02 -05:00
Nathan Guse
9c54465a13 [ticket/11103] Starting approve_post type notification 
PHPBB3-11103
 2012-09-15 12:00:03 -05:00
Nathan Guse
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name 
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
 2012-09-14 17:01:08 -05:00
Nathan Guse
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type 
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
 2012-09-14 16:54:20 -05:00
Nathan Guse
5502f3c4aa [ticket/11103] Restyle the notification list 
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
 2012-09-09 17:20:39 -05:00
Nathan Guse
74e2a8f893 [ticket/11103] Post notifications 
PHPBB3-11103
 2012-09-09 13:29:47 -05:00
Joas Schilling
c03d692a98 [feature/soft-delete] Fix some more usages of _approved column names 
PHPBB3-9657
 2012-08-30 22:57:00 +02:00
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested. 
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
 2012-08-29 18:42:14 +02:00
Joas Schilling
b774c09c7f [feature/soft-delete] Use the variable which holds the correct item status 
PHPBB3-9657
 2012-08-29 17:50:14 +02:00
Joas Schilling
1935568c3e [feature/soft-delete] Fix typo in column name topic_visibility 
PHPBB3-9657
 2012-08-29 17:50:13 +02:00
Josh Woody
1ab41f8dc6 [feature/soft-delete] Fix some small bugs 
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
 2012-08-29 17:50:12 +02:00
Josh Woody
f570558a8d [feature/soft-delete] Add a processor for action == restore in mcp_queue.php 
Restoring a post within mcp_queue.php didn't do anything before this commit.  Now it does, by way of a function which is very similar to approve_post.

PHPBB3-9657
 2012-08-29 17:50:12 +02:00
Josh Woody
a80cfafdd9 [feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibility 
Rename the class to more accurately reflect what it does.

PHPBB3-9657
 2012-08-29 17:50:11 +02:00