Commit graph

6289 commits

Author SHA1 Message Date
Nathan Guse
7e6f31b51d [ticket/11103] Correct the comments on the notification classes
PHPBB3-11103
2012-10-20 21:45:15 -05:00
Nathan Guse
f62e55091a [ticket/11103] PM notifications are not available if users cannot read them
PHPBB3-11103
2012-10-20 21:28:37 -05:00
Nathan Guse
de7e17b732 [ticket/11103] Notifications for subscriptions/bookmarks must obey ACP options
If bookmarks/subscriptions are disabled, they should not be listed in the UCP

PHPBB3-11103
2012-10-20 21:22:06 -05: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
52bb4a1bd6 [ticket/11103] Do not have empty queue in the interface
This is not needed as it is not public.

PHPBB3-11103
2012-10-20 19:00:37 -05:00
Nathan Guse
0ac9079d1c [ticket/11103] Replace $email_template with get_email_template()
PHPBB3-11103
2012-10-20 18:55:13 -05:00
Nathan Guse
471ca5e7dc [ticket/11103] Change is_disabled to is_enabled
If you're following along and would like to update your DB, you can run
the following queries to do so:

ALTER TABLE phpbb_notifications CHANGE `is_disabled` `is_enabled`
TINYINT( 1 ) NOT NULL DEFAULT  '1';

UPDATE `phpbb_notifications` SET is_enabled = 1;

PHPBB3-11103
2012-10-19 15:50:32 -05:00
Nathan Guse
2c06c2bd36 [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof
PHPBB3-11103
2012-10-18 19:20:54 -05:00
Nathan Guse
f96dac3352 [ticket/11103] Interface docblocks
PHPBB3-11103
2012-10-18 19:13:47 -05:00
Nathan Guse
eb07b3ad9c [ticket/11103] Expand class vars and use docblocks for phpBB classes
PHPBB3-11103
2012-10-18 18:50:04 -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
Nathan Guse
3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/includes/functions.php
2012-10-18 18:23:22 -05:00
Andreas Fischer
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
2012-10-18 16:43:46 +02:00
Andreas Fischer
4f3f4a40d6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php
2012-10-18 16:34:59 +02:00
Andreas Fischer
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
2012-10-18 16:26:54 +02:00
Oleg Pudeyev
0a260f80af Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:31:35 -04:00
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:10:49 -04:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04: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
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
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
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link
PHPBB3-11103
2012-10-16 16:47:18 -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
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
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
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
Nathan Guse
6df3de2b9c [ticket/11103] Starting work on UCP Notifications list
PHPBB3-11103
2012-10-13 18:58:29 -05:00
Nathaniel Guse
39fd31d3ae [ticket/11103] Trying to fix an odd issue with unread status on approved posts
From a recent change, when your posts/topics are approved, they will be
marked read automatically because you've read the topic/post already.

To change that I've forced the notification to be marked unread and
attempted to reset the read status on the post/topic to be unread before
the post that was approved.

This does not seem to work so well and I don't know of any way this can
really be properly fixed, so the code I was working on I've commented out.

For now, users will just need to manually mark these types of notifications
as read. I cannot think of a way for this to be fixed without running
two additional queries on every viewtopic.

PHPBB3-11103
2012-10-13 18:12:33 -05:00
Nathaniel Guse
c60b15294a [ticket/11103] Global moderators with m_approve permission never need approval
They do not need to receive notifications if their post/topic is approved or
disapproved

PHPBB3-11103
2012-10-13 17:49:12 -05:00
Nathaniel Guse
397d039ce5 [ticket/11103] Allow global moderators to receive moderator notifications
PHPBB3-11103
2012-10-13 17:37:59 -05:00
Nathaniel Guse
4392054044 [ticket/11103] Reported pm notifications require m_report permissions
PHPBB3-11103
2012-10-13 17:06:01 -05:00
Nathan Guse
94a3dc5ff7 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-12 17:09:12 -05: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
8b2f1127e4 [ticket/11103] Notification grouping output for bookmark/quote
PHPBB3-11103
2012-10-12 11:40:13 -05:00
Nathan Guse
43e3af4b46 [ticket/11103] Notification grouping output for posts.
PHPBB3-11103
2012-10-12 11:37:51 -05:00
Nathan Guse
1e3abdc49f [ticket/11103] Remove debug code
PHPBB3-11103
2012-10-11 22:40:48 -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
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Oleg Pudeyev
f1a692a5f4 Merge PR #956 branch 'dhruvgoel92/ticket/11051' into develop
* dhruvgoel92/ticket/11051:
  [ticket/11051] fix spaces
  [ticket/11051] add common_words variable
  [ticket/11051] remove unnecessary comment
  [ticket/11051] add get_word_len() in sphinx search
  [ticket/11051] use get_word_length in search backend
  [ticket/11051] use get_common_words in search backend
  [ticket/11051] function instead of accessing property in search
  [ticket/11051] add public functions for public properties
2012-10-10 00:39:29 -04:00
Oleg Pudeyev
39258c9452 Merge PR #990 branch 'bantu/ticket/11100' into develop
* bantu/ticket/11100:
  [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
2012-10-10 00:18:25 -04:00