makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-05 09:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
17542 commits 18 branches 192 tags 208 MiB
Commit graph

17542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly. 
PHPBB3-10848
 2012-10-17 15:08:09 -04: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
Nathan Guse
4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
 2012-10-16 23:33:57 -05:00
Nathan Guse
77bc12d334 [ticket/11103] Add author name output to post/topic email templates 
For a recent merge:
https://github.com/phpbb/phpbb3/pull/624

PHPBB3-11103
 2012-10-16 23:27:49 -05:00
Oleg Pudeyev
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop 
* nickvergessen/ticket/10982:
  [ticket/10982] Correctly check, whether data-overlay is set
  [ticket/10982] Remove overlay on first up/down move of forums in ACP
  [ticket/10982] Allow setting dimming control overlay also as data-overlay
 2012-10-16 21:47:13 -04:00
Oleg Pudeyev
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:21:03 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus 
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:20:58 -04:00
Oleg Pudeyev
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
 2012-10-16 20:31:03 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus 
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
 2012-10-16 20:30:45 -04:00
Nathan Guse
0d098ae5e5 [ticket/11103] Return false to prevent appending # to the URL 
PHPBB3-11103
 2012-10-16 18:14:06 -05:00
Nathan Guse
92b533aad3 [ticket/11103] Do not notify yourself when you close your own report 
PHPBB3-11103
 2012-10-16 17:49:54 -05:00
Nathan Guse
230e9d2e32 [ticket/11103] Do not send PM received notifications to the author 
(you won't be notified if you PM yourself)

PHPBB3-11103
 2012-10-16 17:47:27 -05:00
Nathan Guse
3839fe6902 [ticket/11103] Use report text for report notification, never notify reporter 
PHPBB3-11103
 2012-10-16 17:44:46 -05:00
Nathan Guse
3557b39115 [ticket/11103] Hide notifications flyout on a click outside of the list. 
PHPBB3-11103
 2012-10-16 17:31:48 -05:00
Nathan Guse
a080af4b05 [ticket/11103] Add title/view all link to subsilver2 
PHPBB3-11103
 2012-10-16 17:28:45 -05:00
Nathan Guse
901739b0c6 [ticket/11103] Fix some style code I missed in prosilver 
PHPBB3-11103
 2012-10-16 17:28:08 -05:00
Nathan Guse
ee00688829 [ticket/11103] Restyling notifications list for prosilver 
PHPBB3-11103
 2012-10-16 16:47:45 -05:00
Nathan Guse
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -05:00
Nathan Guse
25ef4d6f91 [ticket/11103] Correct some CSS 
PHPBB3-11103
 2012-10-16 11:14:51 -05:00
Nathaniel Guse
c8b66a26ef [ticket/11103] Mark read link if notification has no URL to view it 
Other style stuff

PHPBB3-11103
 2012-10-16 10:51:07 -05:00
Andreas Fischer
60acba81d1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:25 +02:00
Andreas Fischer
0348950ff1 Merge branch 'ticket/russellwwest/11093' into develop-olympus 
* ticket/russellwwest/11093:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:10 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd> 
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
 2012-10-16 14:39:32 +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
3773cbdf85 [feature/soft-delete] Fix displaying of details module 
PHPBB3-9567
 2012-10-15 20:51:31 +02:00
Andreas Fischer
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop 
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
 2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable 
PHPBB3-11139
 2012-10-15 14:32:49 -03:00
Nathaniel Guse
a2d6e40f1b [ticket/11103] If no avatar, do not display an empty box in subsilver2 
PHPBB3-11103
 2012-10-15 09:27:01 -05: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
a58a76ef5f [feature/soft-delete] Fix permission check in viewtopic.php 
PHPBB3-9567
 2012-10-15 13:17:05 +02:00
Nathan Guse
077c526f15 [ticket/11103] ss2 - do not include footer bar if no pagination 
PHPBB3-11103
 2012-10-14 14:30:05 -05:00
Nathan Guse
4e3abdb7c5 [ticket/11103] subsilver2 ucp_notifications.html 
PHPBB3-11103
 2012-10-14 14:28:28 -05:00
Nathan Guse
c1f8c96bd7 [ticket/11103] subsilver2 overall_header.html 
PHPBB3-11103
 2012-10-14 13:46:15 -05:00
Nathan Guse
2284a14813 [ticket/11103] If notification display is disabled, show PM Info in header 
PHPBB3-11103
 2012-10-14 13:45:00 -05:00
Nathan Guse
6ded18b6e2 [ticket/11103] subsilver2 ucp_prefs_personal.html edits 
PHPBB3-11103
 2012-10-14 13:26:33 -05:00
Nathan Guse
fa6d604016 [ticket/11103] Remove todo comments that are no longer todo 
PHPBB3-11103
 2012-10-14 12:49:09 -05:00
Nathan Guse
31502cdd6c [ticket/11103] Fix comma usage 
https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084

PHPBB3-11103
 2012-10-14 12:45:04 -05:00
Nathan Guse
0d5d328c81 [ticket/11103] Spacing consistency 
PHPBB3-11103
 2012-10-14 12:42:18 -05:00
Nathan Guse
a48f090338 [ticket/11103] Make sure notifications are marked read when clicking them 
How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
 2012-10-14 12:35:35 -05:00
Nathan Guse
716635c834 [ticket/11103] Fix some language strings 
Newlines at end of email files

PHPBB3-11103
 2012-10-14 10:58:23 -05:00
Nathan Guse
c5f280351a [ticket/11103] UCP Notification option grouping 
Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
 2012-10-13 23:52:49 -05:00
Nathan Guse
94ffbb4050 [ticket/11103] Add is_disabled column to notifications table 
EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications
from extensions!

Set is_disabled to 1 for all your notifications when your extension is
disabled so they are ignored and do not cause errors.

When your extension is enabled again, set is_disabled to 0 and your
notifications will be working again.

PHPBB3-11103
 2012-10-13 23:24:30 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List 
PHPBB3-11103
 2012-10-13 20:02:38 -05:00
Nathan Guse
441e389123 Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103 2012-10-13 18:58:42 -05:00