Commit graph

11074 commits

Author SHA1 Message Date
Marc Alexander
2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master
Conflicts:
	phpBB/includes/acp/acp_database.php
2015-06-08 15:39:47 +02:00
Marc Alexander
f9389995e7 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-08 13:54:50 +02:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors
PHPBB3-13685
2015-06-07 18:40:44 +01:00
Tristan Darricau
9777abaed4 Merge branch '3.1.x' 2015-06-07 18:02:47 +02:00
Joas Schilling
17b94b8f9c [ticket/13823] Remove the unnecessary brackets
This changes the line with non-whitespace changes, so the packaging script
should correctly detect them as changed and put the file into the update.

PHPBB3-13823
2015-06-07 17:54:38 +02:00
Marc Alexander
77bc8ee68b Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
Marc Alexander
bac02a348e Merge pull request #22 from phpbb/ticket/sec-184
[ticket/sec-184] Do not output passwords to HTML
2015-06-07 14:57:06 +02:00
Tristan Darricau
1f772234f7 Merge branch '3.1.x' 2015-06-06 18:12:54 +02:00
Tristan Darricau
99d3995548 Merge pull request #23 from phpbb/ticket/13913
[ticket/13913] Correctly check the forum_password and read permissions
2015-06-06 18:12:36 +02:00
AJ Quick
c78ee4e201 [ticket/13923] Update startup.php
While suppressing the output from the 'set_magic_quotes_runtime(0)'
is sufficient with normal phpBB installs, using this file in association
with the oauth plugin will cause an error on some versions of PHP.
This fixes a potential bug where set_magic_quotes_runtime is depreciated
in newer versions of PHP.

PHPBB3-13923
2015-06-06 13:05:34 +02:00
Tristan Darricau
e60b7f6cf2 Merge branch '3.1.x' 2015-06-06 12:02:15 +02:00
Tristan Darricau
774582876c Merge pull request #3671 from marc1706/ticket/9563
[ticket/9563] Do not show empty categories on index
2015-06-06 12:02:04 +02:00
Marc Alexander
c8ccae7a7c Merge branch '3.1.x' 2015-06-05 10:05:50 +02:00
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch
PHPBB3-13841
2015-06-05 07:33:40 +02:00
javiexin
9057f72fc7 [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. Fixed version number and event name.

PHPBB3-13911
2015-06-04 19:13:23 +02:00
Joas Schilling
3ce3183e61 Merge branch '3.1.x' 2015-06-04 18:03:35 +02:00
Joas Schilling
7a55bcc0f3 Merge pull request #3611 from Alf007/ticket/13841
Ticket/13841
2015-06-04 18:03:19 +02:00
Joas Schilling
c28a213b1b Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
2015-06-04 17:46:36 +02:00
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