aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-10-135-2/+97
|\ \ \ \ \ \
| * | | | | | [ticket/11103] Trying to fix an odd issue with unread status on approved postsNathaniel Guse2012-10-132-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From a recent change, when your posts/topics are approved, they will be marked read automatically because you've read the topic/post already. To change that I've forced the notification to be marked unread and attempted to reset the read status on the post/topic to be unread before the post that was approved. This does not seem to work so well and I don't know of any way this can really be properly fixed, so the code I was working on I've commented out. For now, users will just need to manually mark these types of notifications as read. I cannot think of a way for this to be fixed without running two additional queries on every viewtopic. PHPBB3-11103
| * | | | | | [ticket/11103] Global moderators with m_approve permission never need approvalNathaniel Guse2012-10-132-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They do not need to receive notifications if their post/topic is approved or disapproved PHPBB3-11103
| * | | | | | [ticket/11103] Allow global moderators to receive moderator notificationsNathaniel Guse2012-10-132-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Reported pm notifications require m_report permissionsNathaniel Guse2012-10-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | [ticket/11103] Starting work on UCP Notifications listNathan Guse2012-10-131-41/+48
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-1213-74/+276
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-104-12/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11051: [ticket/11051] fix spaces [ticket/11051] add common_words variable [ticket/11051] remove unnecessary comment [ticket/11051] add get_word_len() in sphinx search [ticket/11051] use get_word_length in search backend [ticket/11051] use get_common_words in search backend [ticket/11051] function instead of accessing property in search [ticket/11051] add public functions for public properties
| | * | | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| | * | | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_word_len() for sphinx search backend returns false always and triggers proper error. PHPBB3-11051
| | * | | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public retrieval functions for all public properties and change the properties to protected in all search backends. PHPBB3-11051
| * | | | | | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11100: [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
| | * | | | | | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11100
| * | | | | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-108-58/+140
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| | * | | | | | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only auth_db is supported there and the password needs to be trimmed for compatibility because user_password stores phpbb_hash(htmlspecialchars(trim($password))) Setting passwords for other auth modules is currently not supported. Once setting/changing passwords is supported by auth plugins, the untrimmed_variable() should be used here and the result should be passed to the auth plugin. PHPBB3-8713
| | * | | | | | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-086-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-037-19/+92
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
* | | | | | | | [ticket/11103] Ability to query data before running create_insert_array()Nathan Guse2012-10-1217-36/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark post/topic in queue notifications read when visiting mcp Change post/topic in queue notification url to use MCP. Fix the bug: Approving a topic marks the topic as read, but before the notification is created for the user approving the topic (if they would get a notification that the topic has been made). This causes it to be stuck "unread". PHPBB3-11103
* | | | | | | | [ticket/11103] Notification grouping output for bookmark/quoteNathan Guse2012-10-122-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Notification grouping output for posts.Nathan Guse2012-10-121-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Remove debug codeNathan Guse2012-10-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-115-22/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-093-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-10-091-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11140
* | | | | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-095-87/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Starting work on the reported posts notificationNathaniel Guse2012-10-092-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Fix the issue of time changing when editing itemsNathaniel Guse2012-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Starting work on combining notificationsNathan Guse2012-10-053-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just for posts currently and not yet outputted. PHPBB3-11103
* | | | | | | | [ticket/11103] Move UCP Notification Options to Board Preferences tabNathan Guse2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename to "Edit notification options" for consistency PHPBB3-11103
* | | | | | | | [ticket/11103] trigger_error message when preferences updated in UCPNathan Guse2012-10-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Bug fixingNathan Guse2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] ACP option to enable/disable notifications output in headerNathan Guse2012-10-052-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Remove extra line break in the headerNathan Guse2012-10-0513-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was introduced with ff136cc96a62147bc7468b716b86a30f12754e77 PHPBB3-11103
* | | | | | | | [ticket/11103] Working on test caseNathan Guse2012-10-054-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing extension type/method naming scheme so they can be autoloaded. Other bugs PHPBB3-11103
* | | | | | | | [ticket/11103] Fixing a few bugs from the previous changesNathan Guse2012-10-042-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Do not use Symfony\...\ContainerBuilder;Nathan Guse2012-10-0414-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's no longer needed PHPBB3-11103
* | | | | | | | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-046-43/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
* | | | | | | | [ticket/11103] Do not abbreviate template outputNathan Guse2012-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Use dependency injection instead of phpbb_containerNathan Guse2012-10-0417-217/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Move notification files to includes/notification/Nathan Guse2012-10-0418-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | [ticket/11103] Rename classesNathan Guse2012-10-0419-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_notifications_service -> phpbb_notification_manager phpbb_notifications_ -> phpbb_notification_ PHPBB3-11103
* | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-042-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] updating links to phpbb.com to use SSL Conflicts: phpBB/adm/index.php