aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+14
| | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| | * [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | PHPBB3-13168
| * | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
| |/ | | | | | | PHPBB3-13138
| * Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-061-2/+14
| |\ | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
| | * [ticket/11224] Remove new line in acm_memory.phpTristan Darricau2014-05-151-1/+1
| | | | | | | | | | | | PHPBB3-11224
| | * [ticket/11224] Fix coding styleTristan Darricau2014-05-151-2/+2
| | | | | | | | | | | | PHPBB3-11224
| | * [ticket/11224] Fix the blank line after ?>Tristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | PHPBB3-11224
| | * [ticket/11224] Fix returned dataTristan Darricau2014-05-141-2/+2
| | | | | | | | | | | | PHPBB3-11224
| | * [ticket/11224] SQL cache destroy does not destroy queries to tables joinedTristan Darricau2014-05-141-3/+15
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11224 PHPBB3-11224
| * | [ticket/13096] Add phpbb_ prefix to ldap_escape()Jakub Senko2014-09-231-2/+2
| | | | | | | | | | | | PHPBB3-13096
| * | Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-231-8/+20
| |\ \ | | | | | | | | | | | | Ticket/10729 Update editor information when user being deleted
| * \ \ Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* | \ \ \ Merge pull request #3030 from Senky/ticket/13164Marc Alexander2014-10-181-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
| * | | | | [ticket/13164] Fix syntax errorJakub Senko2014-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| * | | | | [ticket/13164] Add post_visibility to core.submit_post_end eventJakub Senko2014-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| * | | | | [ticket/13164] Update post_visibility before event is triggeredJakub Senko2014-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
* | | | | | [ticket/13171] Check the correct (soft)delete permission when deleting in MCPJoas Schilling2014-10-171-2/+4
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13171
* | | | | [prep-release-3.1.0-RC5] Update phpBB Version for RC6 developmentJoas Schilling2014-10-071-1/+1
| | | | |
* | | | | [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5Joas Schilling2014-10-071-1/+1
| | | | |
* | | | | Merge pull request #2307 from PayBas/ticket/12408Joas Schilling2014-10-061-3/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12408] Add quick setting for "default guest style" to ACP
| * | | | | [ticket/12408] Fix white-space snifferPayBas2014-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12408
| * | | | | [ticket/12408] Changed lang vars, added fieldset and removed "default"PayBas2014-09-151-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12408
| * | | | | [ticket/12408] Public functions and updated doc blockPayBas2014-09-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12408
| * | | | | [ticket/12408] Code cleanupPayBas2014-09-151-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebased to see if travis will finally play along PHPBB3-12408
| * | | | | [ticket/12408] Simplified queriesPayBas2014-09-151-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12408
| * | | | | [ticket/12408] Add quick setting for "default guest style" to ACPPayBas2014-09-151-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12408
* | | | | | Merge pull request #2828 from brunoais/ticket/12930Joas Schilling2014-10-061-2/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
| * | | | | | [ticket/12930] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12930
| * | | | | | [ticket/12930] Fixing event comment block and variablebrunoais2014-09-191-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to comments on pull request PHPBB3-12930
| * | | | | | [ticket/12930] Adding more variables to the eventbrunoais2014-08-101-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More variables, according to comments, were added to the event. PHPBB3-12930
| * | | | | | [ticket/12930] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12930
| * | | | | | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_afterbrunoais2014-08-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_quotepost_query_after event to ucp backend. PHPBB3-12930
* | | | | | | Merge pull request #2827 from brunoais/ticket/12929Joas Schilling2014-10-061-0/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
| * | | | | | | [ticket/12929] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | [ticket/12929] Fixing event comment block and variablebrunoais2014-09-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | [ticket/12929] Adding more variables to event.brunoais2014-08-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More variables added that may be useful to events at this stage. PHPBB3-12929
| * | | | | | | [ticket/12929] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_beforebrunoais2014-08-091-0/+22
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_basic_info_query_before event to mcp backend. PHPBB3-12929
* | | | | | | [ticket/13134] Add core event to the root of the function display_forums()rxu2014-10-071-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13134
* | | | | | | Merge pull request #3018 from Senky/ticket/13125Andreas Fischer2014-10-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13125] Uploaded avatars are not displayed * Senky/ticket/13125: [ticket/13125] $user->browser to $browser
| * | | | | | | [ticket/13125] $user->browser to $browserJakub Senko2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13125
* | | | | | | | Merge pull request #3000 from rxu/ticket/13110Joas Schilling2014-10-021-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13110] Add core event to the page_footer() function
| * | | | | | | | [ticket/13110] Add core event to the page_footer() functionrxu2014-09-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the page_footer() in includes/functions.php to allow extensions handling overall page output before its displaying. PHPBB3-13110
* | | | | | | | | Merge pull request #2999 from rxu/ticket/13108Joas Schilling2014-10-021-1/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13108] Add core event to the parse_attachments() function
| * | | | | | | | | [ticket/13108] Add core event to the parse_attachments() functionrxu2014-10-011-1/+29
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the parse_attachments() function in functions_content.php to allow modifying/adding attachment template data. PHPBB3-13108
* | | | | | | | | Merge pull request #3004 from Senky/ticket/13116Joas Schilling2014-10-021-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | [ticket/13116] Topic and post approval notifications got interchanged
| * | | | | | | | [ticket/13116] Interchange post and topic approval notificationJakub Senko2014-09-291-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13116
* | | | | | | | [ticket/13119] Add another event which is triggered independent from actionsJoas Schilling2014-10-011-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13119