aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)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
| * [ticket/11103] Global moderators with m_approve permission never need approvalNathaniel Guse2012-10-132-0/+16
| * [ticket/11103] Allow global moderators to receive moderator notificationsNathaniel Guse2012-10-132-2/+8
| * [ticket/11103] Reported pm notifications require m_report permissionsNathaniel Guse2012-10-131-0/+11
* | [ticket/11103] Starting work on UCP Notifications listNathan Guse2012-10-131-41/+48
|/
* 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
| |\
| | * [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| | * [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-0/+10
| | * [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
| * | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
| |\ \
| | * | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
| * | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-108-58/+140
| |\ \ \
| | * | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| | * | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| | * | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| | * | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | * | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-086-14/+14
| | * | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| | * | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| | * | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| | * | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-037-19/+92
* | | | | [ticket/11103] Ability to query data before running create_insert_array()Nathan Guse2012-10-1217-36/+169
* | | | | [ticket/11103] Notification grouping output for bookmark/quoteNathan Guse2012-10-122-0/+42
* | | | | [ticket/11103] Notification grouping output for posts.Nathan Guse2012-10-121-7/+41
* | | | | [ticket/11103] Remove debug codeNathan Guse2012-10-111-1/+0
* | | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-115-22/+342
* | | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-093-16/+34
* | | | | 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
* | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-095-87/+323
* | | | | [ticket/11103] Starting work on the reported posts notificationNathaniel Guse2012-10-092-2/+94
* | | | | [ticket/11103] Fix the issue of time changing when editing itemsNathaniel Guse2012-10-091-1/+2
* | | | | [ticket/11103] Starting work on combining notificationsNathan Guse2012-10-053-1/+65
* | | | | [ticket/11103] Move UCP Notification Options to Board Preferences tabNathan Guse2012-10-051-1/+1
* | | | | [ticket/11103] trigger_error message when preferences updated in UCPNathan Guse2012-10-051-0/+4
* | | | | [ticket/11103] Bug fixingNathan Guse2012-10-051-1/+1
* | | | | [ticket/11103] ACP option to enable/disable notifications output in headerNathan Guse2012-10-052-8/+14
* | | | | [ticket/11103] Remove extra line break in the headerNathan Guse2012-10-0513-13/+0
* | | | | [ticket/11103] Working on test caseNathan Guse2012-10-054-19/+31
* | | | | [ticket/11103] Fixing a few bugs from the previous changesNathan Guse2012-10-042-4/+5
* | | | | [ticket/11103] Do not use Symfony\...\ContainerBuilder;Nathan Guse2012-10-0414-15/+0
* | | | | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-046-43/+23
* | | | | [ticket/11103] Do not abbreviate template outputNathan Guse2012-10-041-2/+2
* | | | | [ticket/11103] Use dependency injection instead of phpbb_containerNathan Guse2012-10-0417-217/+195
* | | | | [ticket/11103] Move notification files to includes/notification/Nathan Guse2012-10-0418-3/+3
* | | | | [ticket/11103] Rename classesNathan Guse2012-10-0419-35/+35
* | | | | 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
| |\ \ \ \