1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

13283 Commits

Author SHA1 Message Date
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
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
59281f1b0a Merge PR #973 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -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
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04: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
Oleg Pudeyev
3fa0ab7073 Merge PR #1004 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 19:41:25 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 17:42:23 -04:00
Nathaniel Guse
7411d1d1bd [ticket/11103] Starting work on the reported posts notification
PHPBB3-11103
2012-10-09 10:30:55 -05:00
Nathaniel Guse
7a92594bc0 [ticket/11103] Fix the issue of time changing when editing items
PHPBB3-11103
2012-10-09 10:09:10 -05:00
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05:00
Dhruv
305abfde96 [ticket/11051] fix spaces
PHPBB3-11051
2012-10-08 10:58:04 +05:30
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Nathan Guse
bafb5b0eca [ticket/11103] Starting work on combining notifications
Just for posts currently and not yet outputted.

PHPBB3-11103
2012-10-05 18:12:48 -05:00
Nathan Guse
948bd69495 [ticket/11103] Move UCP Notification Options to Board Preferences tab
Also rename to "Edit notification options" for consistency

PHPBB3-11103
2012-10-05 13:54:27 -05:00
Nathan Guse
868554cbae [ticket/11103] trigger_error message when preferences updated in UCP
PHPBB3-11103
2012-10-05 13:50:59 -05:00
Nathan Guse
54629aa87d [ticket/11103] Bug fixing
PHPBB3-11103
2012-10-05 13:46:52 -05:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Nathan Guse
2d69707a88 [ticket/11103] Remove extra line break in the header
Was introduced with ff136cc96a62147bc7468b716b86a30f12754e77

PHPBB3-11103
2012-10-05 00:23:29 -05:00
Nathan Guse
3f2e3ad633 [ticket/11103] Working on test case
Fixing extension type/method naming scheme so they can be autoloaded.

Other bugs

PHPBB3-11103
2012-10-05 00:07:48 -05:00
Nathan Guse
ceb56da965 [ticket/11103] Fixing a few bugs from the previous changes
PHPBB3-11103
2012-10-04 21:39:17 -05:00
Nathan Guse
fa605402f7 [ticket/11103] Create schema files with notification tables
PHPBB3-11103
2012-10-04 20:48:19 -05:00
Nathan Guse
ff136cc96a [ticket/11103] Do not use Symfony\...\ContainerBuilder;
It's no longer needed

PHPBB3-11103
2012-10-04 15:21:07 -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
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output
PHPBB3-11103
2012-10-04 14:31:00 -05:00
Nathan Guse
cea94d8984 [ticket/11103] Use dependency injection instead of phpbb_container
PHPBB3-11103
2012-10-04 14:27:43 -05:00
Nathan Guse
64820546d7 [ticket/11103] Move notification files to includes/notification/
PHPBB3-11103
2012-10-04 13:42:52 -05:00
Nathan Guse
37e2473605 [ticket/11103] Rename classes
phpbb_notifications_service -> phpbb_notification_manager
phpbb_notifications_ -> phpbb_notification_

PHPBB3-11103
2012-10-04 13:39:54 -05:00
Nathan Guse
1aa5c005cb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-04 13:30:40 -05:00
Dhruv
be884b7e29 [ticket/11051] add common_words variable
PHPBB3-11051
2012-10-04 23:32:50 +05:30
Dhruv
67939192ae [ticket/11051] remove unnecessary comment
PHPBB3-11051
2012-10-04 23:17:18 +05:30