aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-021-1/+2
|\
| * Merge pull request #4552 from nicebb/ticket/13757Marc Alexander2016-12-021-1/+2
| |\ | | | | | | | | | [ticket/13757] Properly fix bug with negative PM count
| | * [ticket/13757] Properly fix bug with negative PM countVictor A. Safronov2016-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The fix from PR #4548 doesn't work as expected because in phpBB the sql_affectedrows() method always returns a count of matched rows instead of affected rows. This commit fixes bug properly. PHPBB3-13757
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-022-18/+21
|\ \ \ | |/ /
| * | Merge pull request #4550 from hanakin/ticket/14881Marc Alexander2016-12-022-28/+32
| |\ \ | | |/ | |/| | | | [Ticket/14881] Add wrapper to jump actions to clear floats
| | * [ticket/14881] Fix jumpbox-return link layouthanakin2016-12-011-1/+3
| | | | | | | | | | | | PHPBB3-14881
| | * [ticket/14881] Add action-bar wrap to jump actionshanakin2016-12-011-27/+29
| | | | | | | | | | | | PHPBB3-14881
* | | Merge pull request #4547 from VSEphpbb/ticket/14883Marc Alexander2016-12-021-5/+5
|\ \ \ | | | | | | | | | | | | [ticket/14883] Do not display empty forum rules (after they've been re-parsed)
| * | | [ticket/14883] Remove extra tabbageMatt Friedman2016-12-011-3/+3
| | | | | | | | | | | | PHPBB3-14883
| * | | [ticket/14883] Refactor forum rules logicMatt Friedman2016-12-011-11/+6
| | | | | | | | | | | | PHPBB3-14883
| * | | [ticket/14883] Do not display empty forum rules (after reparsing)Matt Friedman2016-11-301-0/+5
| | | | | | | | | | | | | | | | PHPBB3-14883
* | | | Merge pull request #4542 from JoshyPHP/ticket/14873Marc Alexander2016-12-018-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14873] Added width/height attributes to smilies
| * | | | [ticket/14873] Added width/height attributes to smiliesJoshyPHP2016-11-278-12/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-14873
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-011-0/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4548 from nicebb/ticket/13757Marc Alexander2016-12-011-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13757] Prevents the count of unread PMs from being negative
| | * | | | [ticket/13757] Prevents the count of unread PMs from being negativeVictor A. Safronov2016-11-301-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the user_unread_privmsg flag in users table can become negative. It happens when the unread message is requested by simultaneous concurrent requests. Both requests will decrement the value of the flag. This commit prevents updating the flag if the message already marked as read. PHPBB3-13757
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-271-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4503 from rxu/ticket/14853Marc Alexander2016-11-271-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14853] Add core event to allow modifying PM attachments download auth
| | * | | | [ticket/14853] Add core event to allow modifying PM attachments download authrxu2016-11-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14853
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge pull request #4512 from senky/ticket/14863Marc Alexander2016-11-271-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14863] Properly treat plural rules in confirmation box title
| | * | | | [ticket/14863] Properly treat plural rules in confirmation box titleJakub Senko2016-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14863
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4540 from nicebb/ticket/14876Marc Alexander2016-11-261-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14876] Allows multibyte strings for exception messages
| | * | | | | [ticket/14876] Allows multibyte strings for exception messagesVictor A. Safronov2016-11-251-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All exception messages are sanitized via type_caster::set_var() which is called with $multibyte = false. This commit allows to pass multibyte messages as well. PHPBB3-14876
* | | | | | Merge pull request #4516 from marc1706/ticket/14867Tristan Darricau2016-11-243-55/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14867] Revert back to twig 1.26.* and update dependencies * marc1706/ticket/14867: [ticket/14867] Revert back to twig 1.26.* and update dependencies
| * | | | | | [ticket/14867] Revert back to twig 1.26.* and update dependenciesMarc Alexander2016-11-163-55/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The revert of twig back to 1.26.* is necessary due to a breaking change in the way the Filesystem loader returns the paths to template files. PHPBB3-14867
* | | | | | | Merge pull request #4508 from marc1706/ticket/9211Tristan Darricau2016-11-242-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9211] Use different icon for link subforum in forum legend * marc1706/ticket/9211: [ticket/9211] Use different icon for link subforum in forum legend
| * | | | | | | [ticket/9211] Use different icon for link subforum in forum legendMarc Alexander2016-11-162-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9211
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-241-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14750] Remove html5 invalid attributes from attachment file input
| * | | | | | | Merge pull request #4483 from marc1706/ticket/14750Tristan Darricau2016-11-241-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14750] Remove html5 invalid attributes from attachment file input * marc1706/ticket/14750: [ticket/14750] Remove html5 invalid attributes from attachment file input
| | * | | | | | [ticket/14750] Remove html5 invalid attributes from attachment file inputMarc Alexander2016-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14750
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-201-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4502 from rxu/ticket/14852Marc Alexander2016-11-201-1/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14852] Add core event to modify email headers
| | * | | | | | | [ticket/14852] Add core event to modify email headersrxu2016-11-041-1/+11
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-14852
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-203-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4511 from senky/ticket/14842Marc Alexander2016-11-203-2/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14842] Don't display filesize limit if there is none
| | * | | | | | | [ticket/14842] Don't display filesize limit if there is noneJakub Senko2016-11-153-2/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14842
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-202-1/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'ticket/14850' into 3.1.xMarc Alexander2016-11-202-1/+20
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14850] Add core.generate_smilies_beforeJmz2016-11-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850
| | * | | | | | | [ticket/14850] Add core.smiley_text_root_pathJmz2016-11-201-1/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-201-3/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4519 from michaelcullum/ticket/14872Marc Alexander2016-11-201-3/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14872] Remove sizeof/count restriction
| | * | | | | | | [ticket/14872] Remove sizeof/count restrictionMichael Cullum2016-11-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14872
* | | | | | | | | Merge remote-tracking branch 'senky/ticket/14739' into 3.2.xMarc Alexander2016-11-1728-730/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/14739] Remove SQLite 2.8.x database driverJakub Senko2016-11-1628-730/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14739
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-161-1/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #4497 from senky/ticket/14849Marc Alexander2016-11-161-1/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action
| | * | | | | | | | [ticket/14849] Add core.acp_extensions_run_actionJakub Senko2016-11-131-1/+17
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14849
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 04:40:50 +0000