Commit graph

18570 commits

Author SHA1 Message Date
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
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
Joas Schilling
4bf922fa03 [feature/soft-delete] Fix restoring posts via MCP
PHPBB3-9567
2012-10-13 19:00:08 +02: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
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp
PHPBB3-9567
2012-10-10 23:10:46 +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
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
Oleg Pudeyev
74e41e79d1 Merge PR #1008 branch 'EXreaction/ticket/11140' into develop
* EXreaction/ticket/11140:
  [ticket/11140] Fix an error from an incorrect variable name
2012-10-09 23:46:58 -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