aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11103] _get_avatar -> get_user_avatarNathan Guse2012-10-298-8/+8
| | | | PHPBB3-11103
* [ticket/11103] More cleanupNathan Guse2012-10-291-2/+2
| | | | PHPBB3-11103
* [ticket/11103] Revert an overwrite that occured on merging from developNathan Guse2012-10-291-1/+3
| | | | PHPBB3-11103
* [ticket/11103] Code cleanupNathan Guse2012-10-293-63/+1
| | | | PHPBB3-11103
* [ticket/11103] Set basic notifications to be enabled by defaultNathan Guse2012-10-2913-284/+187
| | | | | | | | | | | 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
* [ticket/11103] Re-add notify method to the UCP preferencesNathan Guse2012-10-201-0/+11
| | | | | | | I've noticed that this is used in other areas still in phpBB, so it should not be removed. PHPBB3-11103
* [ticket/11103] Correct the test caseNathan Guse2012-10-201-4/+19
| | | | | | Fix a bug that broke it and make sure to set the needed config/auth settings PHPBB3-11103
* [ticket/11103] Correct the comments on the notification classesNathan Guse2012-10-209-18/+18
| | | | PHPBB3-11103
* [ticket/11103] PM notifications are not available if users cannot read themNathan Guse2012-10-201-0/+8
| | | | PHPBB3-11103
* [ticket/11103] Notifications for subscriptions/bookmarks must obey ACP optionsNathan Guse2012-10-204-0/+32
| | | | | | If bookmarks/subscriptions are disabled, they should not be listed in the UCP PHPBB3-11103
* [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-2026-323/+203
| | | | | | This is going to require you recreate the db tables. PHPBB3-11103
* [ticket/11103] Do not have empty queue in the interfaceNathan Guse2012-10-201-5/+0
| | | | | | This is not needed as it is not public. PHPBB3-11103
* [ticket/11103] Replace $email_template with get_email_template()Nathan Guse2012-10-2018-99/+163
| | | | PHPBB3-11103
* [ticket/11103] Change is_disabled to is_enabledNathan Guse2012-10-195-15/+15
| | | | | | | | | | | | 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
* [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eofNathan Guse2012-10-181-2/+2
| | | | PHPBB3-11103
* [ticket/11103] Interface docblocksNathan Guse2012-10-186-82/+222
| | | | PHPBB3-11103
* [ticket/11103] Expand class vars and use docblocks for phpBB classesNathan Guse2012-10-183-22/+84
| | | | PHPBB3-11103
* [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-187-25/+0
| | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-183-24/+85
|\ | | | | | | | | Conflicts: phpBB/includes/functions.php
| * Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-182-23/+52
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | | | | | | | | | | | PHPBB3-8796
| | * [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| | | | | | | | | | | | | | | | | | Fix an SQL error and the redirect url generated PHPBB3-8796
| | * [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submitting the current time() allows us to mark only the topics and forums read up until a certain time (when the user loaded the page). This means that any new posts or topics posted between when the user opened the page and clicked the link are still shown as unread. PHPBB3-8796
| | * [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | The earlier change might change the way some things work (after looking at viewtopic) and I'd rather not risk introducing new bugs, so I'm going to revert those changes to be safe. PHPBB3-8796
| | * [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| | | | | | | | | | | | | | | | | | Also do a little cleanup of the markread function PHPBB3-8796
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-181-0/+30
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| | | * | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | | * | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| * | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | * | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-1/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | | * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10568
| * | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-2/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| | * | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | | * | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8743
| * | | | | Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10967] adding $root_path to posting_get_topic_icons
| | * | | | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10967: [ticket/10967] adding $root_path to posting_get_topic_icons
| | | * | | | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | | | |/ / | | | |/| | | | | | | | | | | | | | PHPBB3-10967
* | | | | | [ticket/11103] Add author name output to post/topic email templatesNathan Guse2012-10-162-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a recent merge: https://github.com/phpbb/phpbb3/pull/624 PHPBB3-11103
* | | | | | [ticket/11103] Do not notify yourself when you close your own reportNathan Guse2012-10-162-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] Do not send PM received notifications to the authorNathan Guse2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (you won't be notified if you PM yourself) PHPBB3-11103
* | | | | | [ticket/11103] Use report text for report notification, never notify reporterNathan Guse2012-10-162-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] U_VIEW_ALL_NOTIFICATIONS LinkNathan Guse2012-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] Mark read link if notification has no URL to view itNathaniel Guse2012-10-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other style stuff PHPBB3-11103
* | | | | | [ticket/11103] Remove todo comments that are no longer todoNathan Guse2012-10-142-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] Spacing consistencyNathan Guse2012-10-141-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] Make sure notifications are marked read when clicking themNathan Guse2012-10-142-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [ticket/11103] UCP Notification option groupingNathan Guse2012-10-1313-44/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the ability to specify an _EXPLAIN text for the notification option PHPBB3-11103
* | | | | | [ticket/11103] Add is_disabled column to notifications tableNathan Guse2012-10-135-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [ticket/11103] UCP Notification ListNathan Guse2012-10-134-14/+108
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103