makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-15 07:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
29867 commits 18 branches 192 tags 206 MiB
Commit graph

10606 commits

Author SHA1 Message Date
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786 
[ticket/13786] Add events to add MCP post options
 2015-06-04 17:45:21 +02:00
Joas Schilling
f3f82bd377 Merge branch '3.1.x' 2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564 
[ticket/13564] Unlink user accounts upon deleting user
 2015-06-04 17:30:09 +02:00
Joas Schilling
e8f9458a21 [ticket/13913] Correctly check the forum_password and read permissions 
We need to check them on the forum the post is in, rather than the forum row
we are displaying.

PHPBB3-13913
 2015-06-04 16:48:58 +02:00
Joas Schilling
78b0c938a2 [ticket/sec-184] Do not output LDAP password to HTML 
SECURITY-184
 2015-06-04 14:29:03 +02:00
Joas Schilling
9c84b3b5fb [ticket/sec-184] Do not output Jabber password to HTML 
SECURITY-184
 2015-06-04 14:13:07 +02:00
Joas Schilling
6ca3a30576 [ticket/sec-184] Do not output config passwords to the HTML page 
SECURITY-184
 2015-06-04 14:06:35 +02:00
javiexin
b627a097bb [ticket/13911] Add events to configure options for profile fields 
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fix bamboo formatting errors.

PHPBB3-13911
 2015-06-02 18:30:10 +02:00
javiexin
0f6d16920b [ticket/13911] Add events to configure options for profile fields 
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.

PHPBB3-13911
 2015-06-02 13:18:33 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments 
PHPBB3-13777
 2015-05-31 16:03:11 +02:00
MateBartus
71d03647f0 [ticket/13777] Move module management into service 
PHPBB3-13777
 2015-05-31 13:22:44 +02:00
Marc Alexander
2e20bae695 [ticket/9563] Do not show empty categories on index 
PHPBB3-9563
 2015-05-31 11:08:00 +02:00
JoshyPHP
2f0d11ba3c [ticket/13901] Add more whitespace to long quotes for readability 
PHPBB3-13901
 2015-05-30 22:17:14 +02:00
alf007
1f385b536a [ticket/13841] Add core event on functions_admin for topics move 
Event added for the function move_topics() in
includes/functions_admin.php, so that you can insert any extension's table(s)
to be updated when topics are moved between forums
Added parameters topic_ids, forum_id, forum_ids and auto_sync

PHPBB3-13841
 2015-05-30 17:48:18 +02:00
Marc Alexander
e04f9a2425 [ticket/9252] Do not try to disapprove a post that was just approved 
Without this change, posts that are approved by someone right before
another moderator is trying to disapprove a post are actually deleted
instead of disapproved.

PHPBB3-9252
 2015-05-30 12:27:00 +02:00
Marc Alexander
44b8dafb23 [ticket/6466] Support form reset and do not loose role upon resubmit 
PHPBB3-6466
 2015-05-30 11:24:00 +02:00
Nils Adermann
f958d05aed Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Callum Macrae
9366f29fd7 [ticket/13882] no more egyptian brackets /o/ 
PHPBB3-13882
 2015-05-30 10:48:38 +02:00
Marc Alexander
4d827b5b99 [ticket/6466] Remove remnants of old code 
PHPBB3-6466
 2015-05-29 16:56:24 +02:00
Marc Alexander
467c794b97 [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips 
PHPBB3-6466
 2015-05-29 16:05:16 +02:00
Tristan Darricau
2aecb94068 Merge pull request #3383 from nickvergessen/ticket/9109 
Ticket/9109 Properly document and calculate the group settings with value 0
 2015-05-29 16:04:56 +02:00
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844 
Ticket/13844 Better FAQ language files
 2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2 Merge pull request #3616 from s9e/ticket/13847 
[ticket/13847] Move quote generation to text_formatter.utils
 2015-05-29 15:42:14 +02:00
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars. 
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
 2015-05-28 18:05:07 +02:00
Joas Schilling
f6d7ea425f Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:59:04 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672 
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:58:58 +02:00
Joas Schilling
7278356936 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
 2015-05-28 12:56:26 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668 
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
 2015-05-28 12:55:31 +02:00
Joas Schilling
95b3b4605a Merge branch '3.1.x' 2015-05-28 10:49:45 +02:00
Joas Schilling
7580798a5a Merge pull request #3435 from rxu/ticket/13648 
[ticket/13648] Allow extensions using custom bbcode validation methods
 2015-05-28 10:49:33 +02:00
Marc Alexander
2ee9baa3d0 Merge branch '3.1.x' 2015-05-28 10:42:43 +02:00
rxu
33239183ae [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions 
PHPBB3-13868
 2015-05-27 02:15:12 +07:00
JoshyPHP
64e1824abd [ticket/13847] Updated ucp_pm_compose to use utils when forwarding 
PHPBB3-13847
 2015-05-25 21:33:17 +02:00
JoshyPHP
2a7a06da2a [ticket/13847] Updated ucp_pm_compose to use the utils service 
...when quoting a post

PHPBB3-13847
 2015-05-25 21:33:17 +02:00
Marc Alexander
91cace06a5 [ticket/13832] Resolve minor coding issues 
PHPBB3-13832
 2015-05-20 08:59:19 +02:00
Nicofuma
15bec23770 Merge pull request #3578 from s9e/ticket/13801 
[ticket/13801] Remove user dependency from text_formatter.s9e.parser
 2015-05-20 00:02:41 +02:00
Nicofuma
9ccc7f4d65 Merge pull request #3597 from s9e/ticket/13614 
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
 2015-05-19 23:53:27 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Marc Alexander
358c634153 [ticket/13832] Remove unused global from bbcode_init() 
PHPBB3-13832
 2015-05-19 17:26:01 +02:00
Marc Alexander
e8602d4203 [ticket/13832] Use preg_replace_callback in ucp_pm_options 
PHPBB3-13832
 2015-05-19 16:30:52 +02:00
Marc Alexander
3106195cdd [ticket/13832] Use preg_replace_callback in bbcode class 
PHPBB3-13832
 2015-05-19 16:29:50 +02:00
Marc Alexander
a430fef05b [ticket/13832] Use preg_replace_callback in acp_bbcodes 
PHPBB3-13832
 2015-05-19 16:29:10 +02:00
Marc Alexander
5796584611 [ticket/13832] Fix code sniffer errors in message_parser.php 
PHPBB3-13832
 2015-05-19 14:15:37 +02:00
Marc Alexander
1494c54803 [ticket/13832] Do not use e modifier for bbcodes in message_parser 
PHPBB3-13832
 2015-05-18 21:43:25 +02:00
Marc Alexander
2911c01683 [ticket/13832] Remove e modifier from bold bbcode 
PHPBB3-13832
 2015-05-18 19:03:25 +02:00
Marc Alexander
8a5c0965d3 [ticket/13832] Allow callables for matching bbcodes 
PHPBB3-13832
 2015-05-18 19:02:49 +02:00
Marc Alexander
1076b562dd [ticket/13832] Do not use e modifier in message_parser 
PHPBB3-13832
 2015-05-18 17:59:21 +02:00
Marc Alexander
71f5c9c327 [ticket/13832] Use preg_replace_callback instead of /e modifier 
PHPBB3-13832
 2015-05-18 17:19:29 +02:00
JoshyPHP
c1777f4811 [ticket/11530] Remove extra quotes when depth limit is exceeded 
PHPBB3-11530
 2015-05-18 03:57:48 +02:00