aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [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-2037-370/+250
| | | | | | This is going to require you recreate the db tables. PHPBB3-11103
* [ticket/11103] Message of no notifications if you have noneNathan Guse2012-10-203-13/+26
| | | | 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] Create common.js for subsilver2, move added JS code thereNathan Guse2012-10-193-19/+20
| | | | PHPBB3-11103
* [ticket/11103] Change is_disabled to is_enabledNathan Guse2012-10-197-19/+19
| | | | | | | | | | | | 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-184-4/+8
| | | | 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-189-28/+0
| | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
* [ticket/11103] Use e.preventDefault();Nathan Guse2012-10-181-2/+2
| | | | PHPBB3-11103
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-187-28/+95
|\ | | | | | | | | Conflicts: phpBB/includes/functions.php
| * Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-184-26/+55
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 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-033-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-1/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-182-1/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| | | * | [ticket/10848] Move include up.Oleg Pudeyev2012-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | | * | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-172-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | | * | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-172-1/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| * | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-172-1/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * 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-172-1/+3
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * 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-022-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10568
* | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-167-10/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge PR #890 branch 'nickvergessen/ticket/10982' into developOleg Pudeyev2012-10-162-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | [ticket/10982] Correctly check, whether data-overlay is setJoas Schilling2012-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10982
| | * | | | [ticket/10982] Remove overlay on first up/down move of forums in ACPJoas Schilling2012-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10982
| | * | | | [ticket/10982] Allow setting dimming control overlay also as data-overlayJoas Schilling2012-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10982
| * | | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-164-5/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| | * | | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-164-5/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | | * | | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-154-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-161-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
| | * | | | | [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amended the closing dd tag to the appropriate line: line 145 instead of 141 PHPBB3-11093
| * | | | | | Merge remote-tracking branch 'mvinny/ticket/11139' into developAndreas Fischer2012-10-151-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11139: [ticket/11139] Adding the $phpbb_admin_path variable [ticket/11139] Fix fatal error on colour swatch window
| | * | | | | | [ticket/11139] Adding the $phpbb_admin_path variableVinny2012-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11139
| | * | | | | | [ticket/11139] Fix fatal error on colour swatch windowVinny2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11139
* | | | | | | | [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] Return false to prevent appending # to the URLNathan Guse2012-10-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103