Commit graph

25837 commits

Author SHA1 Message Date
Marc Alexander
f9389995e7 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-08 13:54:50 +02:00
javiexin
41f78b5c49 [ticket/13931] Wrong order in docs/events.md
Reordered alphabetically (mcp before memberlist).

PHPBB3-13931
2015-06-08 11:26:59 +02:00
Andreas Fischer
03bfcba582 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:09 +02:00
Andreas Fischer
f94bbcb4fe Merge pull request #3691 from CHItA/ticket/13888
[ticket/13888] Fix sql_freeresult() error on author searches

* CHItA/ticket/13888:
  [ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:08 +02:00
Marc Alexander
9203bf3141 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-07 22:53:41 +02:00
brunoais
823783773c [ticket/13685] BUMP version to 3.1.5-dev
PHPBB3-13685
2015-06-07 18:40:50 +01:00
brunoais
94aff53e3f [ticket/13685] Allow modifying the query for mysql native fulltext search
PHPBB3-13685
2015-06-07 18:40:49 +01: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
CHItA
29cda5f2ad [ticket/13888] Fix sql_freeresult() error on author searches
PHPBB3-13888
2015-06-07 17:41:17 +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
JoshyPHP
3c0cbda289 [ticket/13902] Increased CSS margin around quotes
PHPBB3-13902
2015-06-07 06:57:59 +02:00
Matt Friedman
a620651ca1 [ticket/13818] Add browse CDB links to ext style lang management
PHPBB3-13818
2015-06-06 10:30:09 -07: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
Tristan Darricau
12c793bcd1 Merge branch '3.1.x' 2015-06-06 11:45:42 +02:00
Tristan Darricau
bed8df20d2 Merge pull request #3680 from marc1706/ticket/13917
[ticket/13917] Use hash_equals() if possible in password driver helper
2015-06-06 11:45:22 +02:00
Tristan Darricau
b30c699900 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
	phpBB/styles/subsilver2/template/login_body.html
	phpBB/styles/subsilver2/template/login_forum.html
	phpBB/styles/subsilver2/template/ucp_login_link.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
	phpBB/styles/subsilver2/template/ucp_register.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-06-06 11:44:05 +02:00
Tristan Darricau
593c7ed0e4 Merge pull request #3681 from marc1706/ticket/13200
[ticket/13200] Disable autocomplete for sensitive input fields
2015-06-06 11:40:18 +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
Marc Alexander
eebab029fd [ticket/13200] Disable autocomplete for sensitive input fields
PHPBB3-13200
2015-06-04 19:01:46 +02:00
Marc Alexander
5b8a721b73 [ticket/13799] Split lines in HTML files for better readability
PHPBB3-13799
2015-06-04 18:21:05 +02:00
Marc Alexander
0427e5f1b3 [ticket/13799] Add missing space before checked attribute
PHPBB3-13799
2015-06-04 18:14:52 +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
a2643f8e67 Merge branch '3.1.x' 2015-06-04 17:51:09 +02:00
Joas Schilling
51831924c5 Merge pull request #3567 from javiexin/ticket/13795
[ticket/13795] Modify core event in posting to include poll data
2015-06-04 17:51:00 +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
Marc Alexander
fb94bd11fb [ticket/13917] Do not pass non-string variables to hash_equals()
PHPBB3-13917
2015-06-04 17:16:22 +02:00
Marc Alexander
852337cacd [ticket/13917] Use hash_equals() if it's available
PHPBB3-13917
2015-06-04 16:52:08 +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
javiexin
56f47c1344 [ticket/13908] "After" clause in migration not working
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases. Typo fixed.

PHPBB3-13908
2015-06-02 09:00:05 +02:00
javiexin
86945bdf84 [ticket/13908] "After" clause in migration not working
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases.

PHPBB3-13908
2015-06-01 19:50:32 +02:00
JoshyPHP
eb227977d2 [ticket/13906] Fixed old signatures in post preview
PHPBB3-13906
2015-06-01 02:24:48 +02:00
Nils Adermann
6813735d82 Merge pull request #3552 from MateBartus/ticket/13777
[ticket/13777] Move module management related functionailty into service
2015-05-31 17:22:21 +02:00