mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:31:57 +02:00
Code Issues Releases Wiki Activity
29,176 Commits 18 Branches 192 Tags
97c6b88a1cbef64dcbcbfe2b7b96c07c0f21b8ee
Commit Graph

24711 Commits

Author SHA1 Message Date
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
Tristan Darricau
4ae6cb9789 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14736] Reset role dropdown when modifying permissions
 2016-12-03 13:03:18 +01:00
Tristan Darricau
3e8071478b Merge pull request #4549 from marc1706/ticket/14736 
[ticket/14736] Reset role dropdown when modifying permissions

* marc1706/ticket/14736:
  [ticket/14736] Reset role dropdown when modifying permissions
 2016-12-03 13:03:13 +01:00
Tristan Darricau
6aa4f0e9d1 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14884] Remove duplicate span from navbar_header
 2016-12-03 12:42:36 +01:00
Tristan Darricau
098764a0aa Merge pull request #4551 from marc1706/ticket/14884 
[ticket/14884] Remove duplicate span from navbar_header

* marc1706/ticket/14884:
  [ticket/14884] Remove duplicate span from navbar_header
 2016-12-03 12:42:31 +01:00
Tristan Darricau
51ec271748 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14885] Use \n instead of \r for output_handler messages
  [ticket/14885] Add a line break when writing to the migrator output file
 2016-12-03 12:36:26 +01:00
Tristan Darricau
9d4c51f8ba Merge pull request #4553 from DavidIQ/ticket/14885 
[ticket/14885] Add a line break when writing to the migrator output file

* DavidIQ/ticket/14885:
  [ticket/14885] Use \n instead of \r for output_handler messages
  [ticket/14885] Add a line break when writing to the migrator output file
 2016-12-03 12:36:20 +01:00
Tristan Darricau
b7061af193 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14875] Add raw_variable() to request mock
  [ticket/14875] Move raw_variable() method to request_interface
  [ticket/14875] Use raw_variable() method in _variable() to get raw data
  [ticket/14875] Add method for raw input to request and add to installer
  [ticket/14875] Add method for untrimmed input to ajax iohandler
 2016-12-03 12:33:05 +01:00
Tristan Darricau
74f49387e1 Merge pull request #4539 from marc1706/ticket/14875 
[ticket/14875] Add method for untrimmed input to ajax iohandler

* marc1706/ticket/14875:
  [ticket/14875] Add raw_variable() to request mock
  [ticket/14875] Move raw_variable() method to request_interface
  [ticket/14875] Use raw_variable() method in _variable() to get raw data
  [ticket/14875] Add method for raw input to request and add to installer
  [ticket/14875] Add method for untrimmed input to ajax iohandler
 2016-12-03 12:32:57 +01:00
David Colón
c3caa3d9dc [ticket/14885] Use \n instead of \r for output_handler messages 2016-12-02 16:50:55 +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
Marc Alexander
c60caace5d Merge pull request #4552 from nicebb/ticket/13757 
[ticket/13757] Properly fix bug with negative PM count
 2016-12-02 16:39:50 +01:00
David Colón
a99cb31a52 [ticket/14885] Add a line break when writing to the migrator output file 2016-12-02 14:23:44 +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
207b52c77f [ticket/14884] Remove duplicate span from navbar_header 
PHPBB3-14884
 2016-12-02 12:44:51 +01:00
Marc Alexander
92b6991d0e Merge branch '3.2.x' 2016-12-02 11:50:56 +01:00
Marc Alexander
1639cb93a8 Merge branch '3.1.x' into 3.2.x 2016-12-02 11:46:34 +01:00
Marc Alexander
1ee9cc91d4 Merge pull request #4550 from hanakin/ticket/14881 
[Ticket/14881] Add wrapper to jump actions to clear floats
 2016-12-02 11:38:50 +01:00
Marc Alexander
9bdd002f58 [ticket/14875] Move raw_variable() method to request_interface 
PHPBB3-14875
 2016-12-02 11:36:07 +01: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
hanakin
e1d2c4c900 [ticket/14881] Fix jumpbox-return link layout 
PHPBB3-14881
 2016-12-01 17:49:26 +01:00
hanakin
0e53442fd4 [ticket/14881] Add action-bar wrap to jump actions 
PHPBB3-14881
 2016-12-01 17:45:24 +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
2019d750c4 Merge branch '3.2.x' 2016-12-01 13:23:11 +01:00
Marc Alexander
7671c971e4 Merge pull request #4542 from JoshyPHP/ticket/14873 
[ticket/14873] Added width/height attributes to smilies
 2016-12-01 13:23:07 +01: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
Marc Alexander
b24c2ea5be [ticket/14736] Reset role dropdown when modifying permissions 
PHPBB3-14736
 2016-12-01 11:34:00 +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
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
JoshyPHP
88c921be23 [ticket/14873] Added width/height attributes to smilies 
PHPBB3-14873
 2016-11-27 13:30:15 +01:00
Marc Alexander
48d6abcf0a [ticket/9590] Update permissions with correct permission role 
PHPBB3-9590
 2016-11-27 00:14:22 +01:00
Marc Alexander
4fce18609f Merge branch 'ticket/9590' into ticket/9590-rhea 2016-11-27 00:14:14 +01:00
Marc Alexander
5e36dd3d0b [ticket/9590] Correctly update submit size and replace all forum_id[] 
PHPBB3-9590
 2016-11-27 00:12:59 +01:00
Marc Alexander
0f46d35f75 [ticket/9590] Further deduplicate code for form data 
PHPBB3-9590
 2016-11-26 23:56:11 +01:00
Marc Alexander
b01b3b8b94 [ticket/9590] Preserve selected forums after previous page redirect 
Also improved the way the forum ID list is generated when clicking
on "Apply all permissions".

PHPBB3-9590
 2016-11-26 23:34:54 +01:00
Marc Alexander
79bc8752ea Merge branch '3.2.x' 2016-11-26 16:41:34 +01:00
Marc Alexander
9432662c37 Merge branch '3.1.x' into 3.2.x 2016-11-26 16:41:31 +01:00
Marc Alexander
30b3fbb2cf [ticket/9590] Support ajax submit of permissions for specific forums 
PHPBB3-9590
 2016-11-26 13:28:15 +01:00
Marc Alexander
ff76a3e433 [ticket/9590] Correctly set roles and refresh page using POST 
PHPBB3-9590
 2016-11-26 12:31:22 +01:00