makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
14447 commits 18 branches 192 tags 206 MiB
Commit graph

13356 commits

Author SHA1 Message Date
Nathan Guse
ecf6f1eb8c [ticket/11103] Code cleanup 
PHPBB3-11103
 2012-10-29 18:15:01 -05:00
Nathan Guse
e549b7663d [ticket/11103] Set basic notifications to be enabled by default 
Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
 2012-10-29 18:09:20 -05:00
Nathan Guse
eddb56f842 [ticket/11103] Working on default notifications on install/update 
PHPBB3-11103
 2012-10-27 12:03:11 -05: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
6861af22ee [ticket/11103] Message of no notifications if you have none 
PHPBB3-11103
 2012-10-20 19:19:26 -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
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
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
883a961720 [ticket/11103] Use e.preventDefault(); 
PHPBB3-11103
 2012-10-18 18:25:26 -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
b283df8241 [ticket/10848] Move include up. 
PHPBB3-10848
 2012-10-17 22:35:36 -04: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
4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
 2012-10-16 23:33:57 -05: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
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop 
* nickvergessen/ticket/10982:
  [ticket/10982] Correctly check, whether data-overlay is set
  [ticket/10982] Remove overlay on first up/down move of forums in ACP
  [ticket/10982] Allow setting dimming control overlay also as data-overlay
 2012-10-16 21:47:13 -04: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
0d098ae5e5 [ticket/11103] Return false to prevent appending # to the URL 
PHPBB3-11103
 2012-10-16 18:14:06 -05: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
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
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -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
Andreas Fischer
60acba81d1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:25 +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
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