mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-26 10:32:51 +01:00
Code Issues Releases Wiki Activity
29,065 Commits 18 Branches 191 Tags
7ec24ec0f6
Commit Graph

29065 Commits

Author SHA1 Message Date
Tristan Darricau
098764a0aa
Merge pull request 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
9d4c51f8ba
Merge pull request 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
74f49387e1
Merge pull request 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
0c96873e73
Merge branch '3.1.x' into 3.2.x 2016-12-02 16:39:53 +01:00
Marc Alexander
c60caace5d
Merge pull request 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  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
d817f3cc67
[ticket/14875] Add raw_variable() to request mock 
PHPBB3-14875
 2016-12-02 12:53:17 +01:00
Marc Alexander
207b52c77f
[ticket/14884] Remove duplicate span from navbar_header 
PHPBB3-14884
 2016-12-02 12:44:51 +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 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
3ad13ebd88
Merge pull request 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
7671c971e4
Merge pull request from JoshyPHP/ticket/14873 
[ticket/14873] Added width/height attributes to smilies
 2016-12-01 13:23:07 +01:00
Marc Alexander
1c567daf39
Merge branch '3.1.x' into 3.2.x 2016-12-01 11:41:21 +01:00
Marc Alexander
365489a317
Merge pull request from nicebb/ticket/13757 
[ticket/13757] Prevents the count of unread PMs from being negative
 2016-12-01 11:41:17 +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
d894472866
Merge branch '3.1.x' into 3.2.x 2016-11-27 20:49:22 +01:00
Marc Alexander
a3faf1fefc
Merge pull request 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 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
9432662c37
Merge branch '3.1.x' into 3.2.x 2016-11-26 16:41:31 +01:00
Marc Alexander
997bdc7778
Merge pull request from nicebb/ticket/14876 
[ticket/14876] Allows multibyte strings for exception messages
 2016-11-26 16:41:27 +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
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
Marc Alexander
08bf8812d3
[ticket/14875] Use raw_variable() method in _variable() to get raw data 
The raw_variable() method uses the same exact code the _variable method
has been using until now.

PHPBB3-14875
 2016-11-25 22:58:18 +01:00
Marc Alexander
9aa017d0f7
[ticket/14875] Add method for raw input to request and add to installer 
A method for retrieving raw input has been added to the request class.
This will be used in the installer to retrieve the datatabase password
while also allowing utf8 characters. Not escaping the input is ok in
this case as it won't be put anywhere in this raw form and only be
used to populate the entry for the password field in config.php.

PHPBB3-14875
 2016-11-25 22:15:13 +01:00
Victor A. Safronov
390a37492d [ticket/14876] Allows multibyte strings for exception messages 
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
 2016-11-25 19:56:41 +04:00
Marc Alexander
23f5b6debd
[ticket/14875] Add method for untrimmed input to ajax iohandler 
Due to the pre-encoded input and the escaping of the input, the
string has to be decoded twice for the password.

PHPBB3-14875
 2016-11-24 22:22:38 +01:00
Tristan Darricau
145ba85d98
Merge pull request from marc1706/ticket/14867 
[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
 2016-11-24 14:18:41 +01:00
Tristan Darricau
3e1f9c4201
Merge pull request 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
Tristan Darricau
592ef2eff4
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14750] Remove html5 invalid attributes from attachment file input
 2016-11-24 14:15:12 +01:00
Tristan Darricau
16620ea3d2
Merge pull request from marc1706/ticket/14750 
[ticket/14750] Remove html5 invalid attributes from attachment file input

* marc1706/ticket/14750:
  [ticket/14750] Remove html5 invalid attributes from attachment file input
 2016-11-24 14:12:13 +01:00
Jakub Senko
8e3a38e80d [ticket/14520] Add ucp_pm_viewmessage_options_before 
PHPBB3-14520
 2016-11-20 19:02:06 +01:00
Jakub Senko
34cfa5f885 [ticket/14390] Add ucp_main_front_user_activity_append/prepend 
PHPBB3-14390
 2016-11-20 18:53:59 +01:00
Jakub Senko
2df3703b2a [ticket/13149] Add core.phpbb_log_get_topic_auth_sql_before 
PHPBB3-13149
 2016-11-20 18:42:36 +01:00