Marc Alexander
c5e0635bc7
[ticket/14492] Add basic layout for enabling viglink
...
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Tristan Darricau
1e667ce8cc
Merge pull request #4543 from marc1706/ticket/9590-rhea
...
[ticket/9590] Submit permissions form in chunks -- Rhea version
* marc1706/ticket/9590-rhea:
[ticket/9590] Update permissions with correct permission role
[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"
2016-12-03 13:16:59 +01:00
Marc Alexander
0c96873e73
Merge branch '3.1.x' into 3.2.x
2016-12-02 16:39:53 +01:00
Victor A. Safronov
8f84119743
[ticket/13757] Properly fix bug with negative PM count
...
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
2016-12-02 16:54:49 +04:00
Marc Alexander
3ad13ebd88
Merge pull request #4547 from VSEphpbb/ticket/14883
...
[ticket/14883] Do not display empty forum rules (after they've been re-parsed)
2016-12-02 11:26:57 +01:00
Matt Friedman
bad9943208
[ticket/14883] Remove extra tabbage
...
PHPBB3-14883
2016-12-01 08:10:08 -08:00
Matt Friedman
2fcc1b4d18
[ticket/14883] Refactor forum rules logic
...
PHPBB3-14883
2016-12-01 08:09:21 -08:00
Marc Alexander
1c567daf39
Merge branch '3.1.x' into 3.2.x
2016-12-01 11:41:21 +01:00
Victor A. Safronov
10753454bf
[ticket/13757] Prevents the count of unread PMs from being negative
...
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
2016-11-30 23:59:36 +04:00
Matt Friedman
0881bbbb64
[ticket/14883] Do not display empty forum rules (after reparsing)
...
PHPBB3-14883
2016-11-30 11:26:15 -08:00
Marc Alexander
d894472866
Merge branch '3.1.x' into 3.2.x
2016-11-27 20:49:22 +01:00
Marc Alexander
a3faf1fefc
Merge pull request #4503 from rxu/ticket/14853
...
[ticket/14853] Add core event to allow modifying PM attachments download auth
2016-11-27 20:49:19 +01:00
Marc Alexander
0e8a573a71
Merge branch '3.1.x' into 3.2.x
2016-11-27 20:45:12 +01:00
Marc Alexander
642bfe9a39
Merge pull request #4512 from senky/ticket/14863
...
[ticket/14863] Properly treat plural rules in confirmation box title
2016-11-27 20:45:08 +01:00
Marc Alexander
4fce18609f
Merge branch 'ticket/9590' into ticket/9590-rhea
2016-11-27 00:14:14 +01:00
Marc Alexander
6c98e3b12f
[ticket/9590] Submit permissions form in chunks when using "Apply all"
...
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
2016-11-26 09:58:47 +01:00
Tristan Darricau
3e1f9c4201
Merge pull request #4508 from marc1706/ticket/9211
...
[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
2016-11-24 14:16:37 +01:00
Marc Alexander
453d9113f1
Merge branch '3.1.x' into 3.2.x
2016-11-20 15:23:20 +01:00
Marc Alexander
dbd9c1f242
Merge pull request #4502 from rxu/ticket/14852
...
[ticket/14852] Add core event to modify email headers
2016-11-20 15:23:16 +01:00
Marc Alexander
c3108d44ce
Merge branch '3.1.x' into 3.2.x
2016-11-20 13:18:31 +01:00
Marc Alexander
d98fd7868b
Merge pull request #4511 from senky/ticket/14842
...
[ticket/14842] Don't display filesize limit if there is none
2016-11-20 13:18:27 +01:00
Marc Alexander
20771271ca
Merge branch '3.1.x' into 3.2.x
2016-11-20 12:57:31 +01:00
Jmz
0d15a95f97
[ticket/14850] Add core.generate_smilies_before
...
Allows changing root_path of smilies to use CDN for example
PHPBB3-14850
2016-11-20 12:56:12 +01:00
Jmz
6bbc18fa40
[ticket/14850] Add core.smiley_text_root_path
...
Allows changing root_path of smilies to use CDN for example
PHPBB3-14850
2016-11-20 12:56:11 +01:00
Marc Alexander
9343317121
Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x
2016-11-17 09:56:51 +01:00
Marc Alexander
c6bed98cf5
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:57:10 +01:00
Marc Alexander
34ebbbc7c3
Merge pull request #4497 from senky/ticket/14849
...
[ticket/14849] Add core.acp_extensions_run_action
2016-11-16 21:56:15 +01:00
Marc Alexander
4844370c26
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:53:30 +01:00
Marc Alexander
1ff01d722a
Merge pull request #4510 from senky/ticket/14864
...
[ticket/14864] Set maxlength=64 to dateformat in ACP
2016-11-16 21:53:27 +01:00
Marc Alexander
5a82061c3a
[ticket/9211] Use different icon for link subforum in forum legend
...
PHPBB3-9211
2016-11-16 21:51:58 +01:00
Jakub Senko
e974f338af
[ticket/14739] Remove SQLite 2.8.x database driver
...
PHPBB3-14739
2016-11-16 17:59:28 +01:00
Jakub Senko
ba5243ba76
[ticket/14842] Don't display filesize limit if there is none
...
PHPBB3-14842
2016-11-15 14:22:42 +01:00
Jakub Senko
b80b624551
[ticket/14849] Add core.acp_extensions_run_action
...
PHPBB3-14849
2016-11-13 22:34:28 +01:00
Jakub Senko
260dc5ed7c
[ticket/14863] Properly treat plural rules in confirmation box title
...
PHPBB3-14863
2016-11-13 17:21:41 +01:00
Jakub Senko
f8fb3e0f9f
[ticket/14864] Set maxlength=64 to dateformat in ACP
...
PHPBB3-14864
2016-11-13 15:12:23 +01:00
Marc Alexander
ef77852aff
Merge branch '3.1.x' into 3.2.x
2016-11-12 17:10:14 +01:00
Marc Alexander
221cd3eb68
Merge pull request #4495 from senky/ticket/14847
...
[ticket/14847] Add core.acp_attachments_config_edit_add
2016-11-12 17:08:28 +01:00
Marc Alexander
728335820c
Merge branch '3.1.x' into 3.2.x
2016-11-12 16:17:31 +01:00
Marc Alexander
bc4c82bae5
Merge pull request #4481 from senky/ticket/14819
...
[ticket/14819] Hide soft-deleted posts in topic review
2016-11-12 16:17:27 +01:00
Marc Alexander
78db28286e
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:54:59 +01:00
Marc Alexander
577d669ba7
Merge pull request #4472 from dsinn/ticket/14804
...
[ticket/14804] Add core event to MCP after merging topics
2016-11-12 13:53:24 +01:00
Tristan Darricau
50f5efba9c
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:49 +01:00
Tristan Darricau
9be9062df3
Merge pull request #4485 from marc1706/ticket/14795
...
[ticket/14795] Use maximum topic views instead of adding up views in merge
* github.com:phpbb/phpbb:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:20 +01:00
Tristan Darricau
cd348b200a
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:59 +01:00
Tristan Darricau
dc32b900c5
Merge pull request #4486 from marc1706/ticket/11483
...
[ticket/11483] Generate user act key if database entry is empty
* github.com:phpbb/phpbb:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:46 +01:00
rxu
ad4fe1799f
[ticket/14853] Add core event to allow modifying PM attachments download auth
...
PHPBB3-14853
2016-11-04 18:42:49 +07:00
rxu
6984f17f62
[ticket/14852] Add core event to modify email headers
...
PHPBB3-14852
2016-11-04 18:23:09 +07:00
Jakub Senko
552691efbf
[ticket/14847] Add core.acp_attachments_config_edit_add
...
PHPBB3-14847
2016-11-02 09:46:36 +01:00
Marc Alexander
f658e062b2
Merge branch '3.1.x' into 3.2.x
2016-10-28 21:06:21 +02:00
Marc Alexander
85898d3d2c
Merge pull request #4489 from rxu/ticket/14830
...
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
2016-10-28 19:36:49 +02:00