aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14770] Decreases quality to 85, changes test to 85, tooCrizzo2016-12-182-2/+2
| | | | PHPBB3-14770
* [ticket/14770] Reduce plupload resize qualityCrizzo2016-12-181-1/+1
| | | | PHPBB3-14770
* Merge pull request #4529 from senky/ticket/14520Marc Alexander2016-12-172-0/+8
|\ | | | | | | [ticket/14520] Add ucp_pm_viewmessage_options_before
| * [ticket/14520] Add ucp_pm_viewmessage_options_beforeJakub Senko2016-11-202-0/+8
| | | | | | | | PHPBB3-14520
* | Merge pull request #4527 from senky/ticket/14390Marc Alexander2016-12-173-0/+20
|\ \ | | | | | | | | | [ticket/14390] Add ucp_main_front_user_activity_append/prepend
| * | [ticket/14390] Add ucp_main_front_user_activity_append/prependJakub Senko2016-11-203-0/+20
| |/ | | | | | | PHPBB3-14390
* | Merge pull request #4526 from senky/ticket/14239Marc Alexander2016-12-171-5/+25
|\ \ | | | | | | | | | [ticket/14239] Add core.ucp_remind_modify_select_sql
| * | [ticket/14239] Add core.ucp_remind_modify_select_sqlJakub Senko2016-12-131-5/+25
| |/ | | | | | | PHPBB3-14239
* | Merge pull request #4518 from senky/ticket/14870Marc Alexander2016-12-171-9/+58
|\ \ | | | | | | | | | [ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
| * | [ticket/14870] Add events to ucp_pm_viewfolder:get_pm_fromJakub Senko2016-12-161-9/+58
| | | | | | | | | | | | PHPBB3-14870
* | | Merge pull request #4520 from senky/ticket/14868Marc Alexander2016-12-123-0/+10
|\ \ \ | | | | | | | | | | | | [ticket/14868] Add mcp_forum_actions_options template event
| * | | [ticket/14868] Add mcp_forum_actions_options template eventJakub Senko2016-12-043-0/+10
| | | | | | | | | | | | | | | | PHPBB3-14868
* | | | Merge pull request #4567 from javiexin/ticket/14887Tristan Darricau2016-12-112-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14887] ACP profile step one lang specific event * javiexin/ticket/14887: [ticket/14887] ACP profile step one lang specific event
| * | | | [ticket/14887] ACP profile step one lang specific eventjaviexin2016-12-082-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14887
* | | | | Merge pull request #4558 from javiexin/ticket/14889Tristan Darricau2016-12-111-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14889] Missing method in profile fields type interface * javiexin/ticket/14889: [ticket/14889] Missing method in profile fields type interface
| * | | | | [ticket/14889] Missing method in profile fields type interfacejaviexin2016-12-051-0/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completes the profile fields type interface by defining a missing required method for all implementations of a type. PHPBB3-14889
* | | | | Merge pull request #4561 from rxu/ticket/14893Tristan Darricau2016-12-111-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14893] Fix undefined variable on reporting PM notification * rxu/ticket/14893: [ticket/14893] Fix undefined variable on reporting PM notification
| * | | | | [ticket/14893] Fix undefined variable on reporting PM notificationrxu2016-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14893
* | | | | | Merge pull request #4572 from javiexin/ticket/14855Tristan Darricau2016-12-114-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14855] Update notification and PM alert bubbles * javiexin/ticket/14855: [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles
| * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). Fix tests better. PHPBB3-14855
| * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). Fix tests. PHPBB3-14855
| * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-103-4/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). PHPBB3-14855
* | | | | | Merge pull request #4573 from rxu/ticket/14906Tristan Darricau2016-12-111-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14906] Delete redundant sig key in user_cache_data array * rxu/ticket/14906: [ticket/14906] Delete redundant sig key in user_cache_data array
| * | | | | | [ticket/14906] Delete redundant sig key in user_cache_data arrayrxu2016-12-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14906
* | | | | | | Merge pull request #4514 from senky/ticket/14759Marc Alexander2016-12-111-1/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/14759] Add core.mcp_main_modify_shadow_sql event
| * | | | | | [ticket/14759] Add core.mcp_main_modify_shadow_sql eventJakub Senko2016-11-131-1/+13
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-14759
* | | | | | Merge pull request #4513 from senky/ticket/14760Marc Alexander2016-12-101-0/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | [ticket/14760] Add core.mcp_main_modify_fork_sql event
| * | | | | [ticket/14760] Add core.mcp_main_modify_fork_sql eventJakub Senko2016-11-131-0/+12
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14760
* | | | | Merge pull request #4559 from javiexin/ticket/14890Marc Alexander2016-12-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | [ticket/14890] Typo in input validation of profile fields of type string
| * | | | [ticket/14890] Typo in input validation of profile fields of type stringjaviexin2016-12-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | This bug was introduced by PHPBB3-14272 PHPBB3-14890
* | | | Merge pull request #4555 from javiexin/ticket/14888Tristan Darricau2016-12-041-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14888] Missing check for disabled profile field types * javiexin/ticket/14888: [ticket/14888] Missing check for disabled profile field types
| * | | | [ticket/14888] Missing check for disabled profile field typesjaviexin2016-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks if a profile field type is enabled before using it. PHPBB3-14888
| * | | | Merge branch '3.1.x' of https://github.com/javiexin/phpbb into 3.1.xjaviexin2016-10-260-0/+0
| |\ \ \ \
| | * \ \ \ Merge pull request #1 from phpbb/3.1.xjaviexin2015-07-09204-1038/+4200
| | |\ \ \ \ | | | | | | | | | | | | | | Bring version up to date 20150708
* | | \ \ \ \ Merge pull request #4524 from senky/ticket/13479Marc Alexander2016-12-031-0/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13479] Add core.viewtopic_highlight_modify
| * | | | | | | [ticket/13479] Add core.viewtopic_highlight_modifyJakub Senko2016-11-201-0/+22
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13479
* | | | | | | Merge pull request #4522 from senky/ticket/13149Marc Alexander2016-12-031-3/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13149] Add core.phpbb_log_get_topic_auth_sql_before
| * | | | | | | [ticket/13149] Add core.phpbb_log_get_topic_auth_sql_beforeJakub Senko2016-11-201-3/+23
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13149
* | | | | | | Merge pull request #4541 from marc1706/ticket/9590Tristan Darricau2016-12-032-0/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9590] Submit permissions form in chunks * marc1706/ticket/9590: [ticket/9590] Correctly update submit size and replace all forum_id[] [ticket/9590] Further deduplicate code for form data [ticket/9590] Preserve selected forums after previous page redirect [ticket/9590] Support ajax submit of permissions for specific forums [ticket/9590] Correctly set roles and refresh page using POST [ticket/9590] Submit permissions form in chunks when using "Apply all"
| * | | | | | | [ticket/9590] Correctly update submit size and replace all forum_id[]Marc Alexander2016-11-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9590
| * | | | | | | [ticket/9590] Further deduplicate code for form dataMarc Alexander2016-11-261-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9590
| * | | | | | | [ticket/9590] Preserve selected forums after previous page redirectMarc Alexander2016-11-261-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improved the way the forum ID list is generated when clicking on "Apply all permissions". PHPBB3-9590
| * | | | | | | [ticket/9590] Support ajax submit of permissions for specific forumsMarc Alexander2016-11-261-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9590
| * | | | | | | [ticket/9590] Correctly set roles and refresh page using POSTMarc Alexander2016-11-261-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9590
| * | | | | | | [ticket/9590] Submit permissions form in chunks when using "Apply all"Marc Alexander2016-11-262-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add an AJAX call that will submit the permissions form in chunks of 5 fieldsets when clicking on "Apply all permissions". PHPBB3-9590
* | | | | | | | 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 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