Commit graph

2300 commits

Author SHA1 Message Date
Joas Schilling
dfcfccf537 [feature/soft-delete] Fix deleting via post editing
PHPBB3-9567
2012-11-03 22:53:54 +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
Nathan Guse
ecf6f1eb8c [ticket/11103] Code cleanup
PHPBB3-11103
2012-10-29 18:15:01 -05: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
7b3d794cad [feature/soft-delete] Display post delete reason if one is given
PHPBB3-9567
2012-10-24 19:58:28 +02:00
Joas Schilling
f21fd469bc [feature/soft-delete] Handle soft deleting via Delete Icon
PHPBB3-9567
2012-10-24 19:52:16 +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
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
2012-10-20 22:11:41 -05:00
Nathan Guse
6861af22ee [ticket/11103] Message of no notifications if you have none
PHPBB3-11103
2012-10-20 19:19:26 -05:00
Nathan Guse
a93067eb41 [ticket/11103] Create common.js for subsilver2, move added JS code there
PHPBB3-11103
2012-10-19 16:00:37 -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
883a961720 [ticket/11103] Use e.preventDefault();
PHPBB3-11103
2012-10-18 18:25:26 -05:00
Joas Schilling
7ce43d49d8 [ticket/11014] Fix IF statements for new template pagination
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622 [ticket/11014] Fix text for previous/next links in Subsilver2
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
ada2d4c91b [ticket/11018] Always display previous/next links if we can display one
PHPBB3-11018
2012-10-17 23:33:19 +02:00
Joas Schilling
a51aa9b47c [ticket/11018] Fix minor issues with CSS in prosilver
PHPBB3-11018
2012-10-17 23:30:56 +02:00
Drae
e76fd6a395 [ticket/11018] Attempt to fix li.pagination alignment issue
This is somewhat kludgy fix for the vertical alignment issue
for pagination contained within a linklist parented li element.
Tested and doesn't seem to impact anything else negatively. May
need further browser testing.

PHPBB3-11018
2012-10-17 23:30:56 +02: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
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
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
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
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
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
cb93784126 [ticket/11103] UCP Notification List
PHPBB3-11103
2012-10-13 20:02:38 -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
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
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
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05:00
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
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output
PHPBB3-11103
2012-10-04 14:31:00 -05:00
Nathan Guse
ba7289b9d2 [ticket/11103] Use PM Notification Preferences from Notification Options
Remove all PM Notification preferences from UCP Board Preferences

PHPBB3-11103
2012-09-27 19:19:38 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template
PHPBB3-11103
2012-09-27 19:04:47 -05:00
Nathan Guse
48ccc9eb93 [ticket/11103] UCP Notification Options can now be set
PHPBB3-11103
2012-09-27 18:25:37 -05:00