mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
26,046 Commits 17 Branches 190 Tags
Commit Graph

26046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tristan Darricau
59ac18c03e Merge pull request #3682 from marc1706/ticket/13564 
[ticket/13564] Fix user_delete_test on master
 2015-06-05 10:09:05 +02:00
Marc Alexander
c8ccae7a7c Merge branch '3.1.x' 2015-06-05 10:05:50 +02:00
Marc Alexander
20b16fda4f Merge pull request #3684 from CHItA/ticket/13841 
[ticket/13841] Fix tests on 3.1 and master branch
 2015-06-05 10:05:44 +02:00
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch 
PHPBB3-13841
 2015-06-05 07:33:40 +02:00
Marc Alexander
49f2dd8c5e [ticket/13564] Fix user_delete_test on master 
PHPBB3-13564
 2015-06-04 19:26:56 +02:00
Marc Alexander
eebab029fd [ticket/13200] Disable autocomplete for sensitive input fields 
PHPBB3-13200
 2015-06-04 19:01:46 +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
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
Cesar G
4b46ac78a6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:57:38 +02:00
Cesar G
db3782e491 Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x 
* callumacrae/ticket/13905:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:56:44 +02:00
MateBartus
8d443c3de7 [ticket/13777] Remove module_class_not_defined_exception 
PHPBB3-13777
 2015-05-31 16:27:16 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments 
PHPBB3-13777
 2015-05-31 16:03:11 +02:00
Marc Alexander
7a66d62290 Merge branch '3.1.x' 2015-05-31 14:15:19 +02:00
Marc Alexander
189d94e897 Merge pull request #3668 from callumacrae/js-linting 
[ticket/13898] js coding standards
 2015-05-31 14:15:17 +02:00
Callum Macrae
cfbd051d52 [ticket/13898] Moved jshint and jscs rcs to correct dir. 
PHPBB3-13898
 2015-05-31 13:50:48 +02:00
Callum Macrae
d978564600 [ticket/13905] Don't load loading.gif until needed. 
PHPBB3-13905
 2015-05-31 13:46:30 +02:00
MateBartus
fcff3ee4ad [ticket/13777] Fix tests 
PHPBB3-13777
 2015-05-31 13:22:46 +02:00
MateBartus
77ee0e62ca [ticket/13777] Use module manager in phpBB core files 
PHPBB3-13777
 2015-05-31 13:22:45 +02:00
MateBartus
e877a752be [ticket/13777] Deduplicate migration service definitions 
PHPBB3-13777
 2015-05-31 13:22:45 +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
Marc Alexander
c0972f74ca Merge pull request #3670 from s9e/ticket/8420 
[ticket/8420] Emoticon removes space before itself when using preview
 2015-05-31 10:49:05 +02:00
JoshyPHP
6ac37145ec [ticket/8420] Added regression test 
PHPBB3-8420
 2015-05-31 10:13:20 +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
Callum Macrae
27a70f573f [ticket/13898] Fixed all the forum_fn.js violations I understood 
PHPBB3-13898
 2015-05-30 15:03:56 +02:00
Callum Macrae
a39a421acb [ticket/13898] Allow underscores :( 
PHPBB3-13898
 2015-05-30 14:55:42 +02:00
Callum Macrae
bafd649eea [ticket/13898] 4 spaces, not 2 
PHPBB3-13898
 2015-05-30 14:50:35 +02:00