1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

10646 Commits

Author SHA1 Message Date
Marc Alexander
15f433f00f
[ticket/14492] Always update the time the stats were sent
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
c54838b25f
[ticket/14492] Update versions in files
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
e02aca8399
[ticket/14492] Don't explicitly pass data providers by refs
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
b9c284d85b
[ticket/14492] Update phpBB version and fix miscellaneous code issues
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
89fef2ce13
[ticket/14492] Send statistics via ajax request
Flooding ajax requests will try to be prevented and sending
stats without JS will also properly work.

PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
cba4f4f568
[ticket/14492] Use new guzzlehttp client
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
ade5183ba1
[ticket/14492] Pass u_action to acp form and add stats config
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c07ecb060d
[ticket/14492] Add events for modifying help phpBB page
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
cc7a0aa4fb
[ticket/14492] Use guzzle for submitting data to stats service
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
9fb2a5d5f8
[ticket/14492] Update language variables and trigger details text
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c1035c98e4
[ticket/14492] Rename files to help_phpbb and fix css tabbing
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c5e0635bc7
[ticket/14492] Add basic layout for enabling viglink
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Tristan Darricau
b51247e1da
Merge pull request #4541 from marc1706/ticket/9590
[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"
2016-12-03 13:31:42 +01:00
Tristan Darricau
97c6b88a1c
Merge branch '3.2.x'
* 3.2.x:
  [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:17:07 +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
19d136f62d
Merge branch '3.2.x' 2016-12-02 16:39:56 +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
58a7ac9b5b
Merge branch '3.2.x' 2016-12-02 11:27:00 +01: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
ece91e92c3
Merge branch '3.2.x' 2016-12-01 11:41:25 +01: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
Daniel Sinn
78ff392b64 [ticket/14882] Add core event to MCP after move post sync
PHPBB3-14882
2016-11-29 13:34:28 -05:00
Marc Alexander
08209af201
Merge branch '3.2.x' 2016-11-27 20:49:25 +01: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
7fb6d3e414
Merge branch '3.2.x' 2016-11-27 20:45:14 +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
28ef544521
Merge branch '3.2.x'
* 3.2.x:
  [ticket/9211] Use different icon for link subforum in forum legend
2016-11-24 14:16:40 +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
Jakub Senko
e9d8425f15 [ticket/13845] Add core.ucp_profile_avatar_sql
PHPBB3-13845
2016-11-21 23:03:21 +01:00
Jakub Senko
4dcd2351ea [ticket/14331] Add core.get_user_rank_after
PHPBB3-14331
2016-11-21 16:51:42 +01:00
Jakub Senko
619d323dd1 [ticket/14524] Add core.ucp_register_requests_after
PHPBB3-14524
2016-11-21 16:41:20 +01:00
Jakub Senko
2f1d2e847e [ticket/13429] Fix @change tags without description
PHPBB3-13429
2016-11-20 18:47:19 +01:00
Jakub Senko
c2836725f9 [ticket/13429] Replace @changed with @change in event docblocks
PHPBB3-13429
2016-11-20 17:58:59 +01:00
Marc Alexander
8b5806c002
Merge branch '3.2.x' 2016-11-20 15:23:23 +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
dcd8540f3c
Merge branch '3.2.x' 2016-11-20 13:18:34 +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
5474aec55f
Merge branch '3.2.x' 2016-11-20 12:58:04 +01:00
Marc Alexander
20771271ca
Merge branch '3.1.x' into 3.2.x 2016-11-20 12:57:31 +01:00