makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 03:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
17686 commits 18 branches 192 tags 207 MiB
Commit graph

7857 commits

Author SHA1 Message Date
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere 
PHPBB3-9567
 2012-10-22 11:14:00 +02:00
Joas Schilling
6c39563e9f [feature/soft-delete] Add a function to calculate the actual post/topic count 
PHPBB3-9567
 2012-10-21 23:38:55 +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
bc18e368c3 [ticket/11103] Correct the test case 
Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
 2012-10-20 21:55:58 -05:00
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
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 
PHPBB3-11023
 2012-10-17 23:34:37 +02:00
Joas Schilling
5ea662f649 [ticket/11014] Restore template vars for next/previous links 
They were dropped while the function was refactored:

If the block_var_name is a nested block, we will use the last (most inner)
block as a prefix for the template variables. If the last block name is
pagination, the prefix is empty. If the rest of the block_var_name is not
empty, we will modify the last row of that block and add our pagination items.

PHPBB3-11014
 2012-10-17 23:33:18 +02:00
Joas Schilling
fa5753de70 [ticket/11018] Swap prev/next links on pagination to the old order 
In the old pagination Prev was left of the pagination and Next right of the
pagination. While moving these blocks, I also removed the whitespaces, which
were introduced.

PHPBB3-11023
PHPBB3-11018
 2012-10-17 23:33:18 +02: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
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
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
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
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
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