mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
24,570 Commits 17 Branches 190 Tags
Commit Graph

24570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CHItA
29cda5f2ad [ticket/13888] Fix sql_freeresult() error on author searches 
PHPBB3-13888
 2015-06-07 17:41:17 +02:00
Joas Schilling
91212d5453 Merge pull request #3692 from CHItA/ticket/sec-184 
[ticket/sec-184] Fix tests
 2015-06-07 17:10:49 +02:00
CHItA
32a2546c5d [ticket/sec-184] Fix tests 
SECURITY-184
 2015-06-07 16:43:27 +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
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
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
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
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
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
eebab029fd [ticket/13200] Disable autocomplete for sensitive input fields 
PHPBB3-13200
 2015-06-04 19:01:46 +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
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
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
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
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
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
Marc Alexander
2e20bae695 [ticket/9563] Do not show empty categories on index 
PHPBB3-9563
 2015-05-31 11:08:00 +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
Callum Macrae
e3090e04c3 [ticket/13898] js coding standaaards 
PHPBB3-13898
 2015-05-30 14:44:48 +02:00
Oliver Schramm
049f584111 Merge pull request #3638 from naderman/ticket/13874 
[ticket/13874] Add master to sami API docs
 2015-05-30 12:54:27 +02:00
Marc Alexander
d6cd90d325 Merge pull request #3658 from callumacrae/js-refactoring-again 
JS Refactoring
 2015-05-30 12:40:46 +02:00
Marc Alexander
df4b391baa Merge pull request #3545 from VSEphpbb/ticket/13771 
[ticket/13771] Allow AJAX errors to support exceptions messages
 2015-05-30 11:33:48 +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
Andreas Fischer
b5fed65fe3 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test

Conflicts:
	tests/lint_test.php
 2015-05-29 22:46:28 +02:00
Andreas Fischer
fedd0ae7f3 Merge pull request #3639 from marc1706/ticket/13875 
[ticket/13875] Ignore cache, ext, and store folder in lint test

* marc1706/ticket/13875:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
 2015-05-29 22:31:41 +02:00
Callum Macrae
da6f751cef [ticket/13887] Made readable code DRY 
PHPBB3-13887
 2015-05-29 13:08:31 +02:00
Callum Macrae
0fc6816be6 [ticket/13887] Made unreadable code readable 
PHPBB3-13887
 2015-05-29 13:01:33 +02:00
Callum Macrae
143578ad09 [ticket/13887] Minor JS refactoring 
PHPBB3-13887
 2015-05-29 12:51:28 +02:00
Callum Macrae
2a83290e7c [ticket/13887] Use correct JSDoc syntax 
PHPBB3-13887
 2015-05-29 12:09:19 +02:00
Marc Alexander
518902ef51 Merge pull request #3640 from callumacrae/ticket/13876 
[ticket/13876] Use webfontloader asyncronously.
 2015-05-28 16:25:26 +02:00
Marc Alexander
f5801320b7 Merge pull request #3634 from prototech/ticket/13858 
[ticket/13858] Make Plupload uploader available in the global namespace.
 2015-05-28 16:03:22 +02:00
Callum Macrae
44fcdd007f [ticket/13876] set webfont async to true 
PHPBB3-13876
 2015-05-28 16:01:47 +02:00
Cesar G
182312010b Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.x 
* marc1706/ticket/13878:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:34:43 +02:00
Marc Alexander
3ec3dfcf3a [ticket/13878] Display background images when printing topic in webkit 
PHPBB3-13878
 2015-05-28 14:58:46 +02:00
Callum Macrae
35e5dc46c7 [ticket/13876] Use webfontloader asyncronously. 
This PR adds typekit and Google's webfontloader and calls it
asyncronously, removing the SPOF in the header. Now, if google
goes down, some buttons display with a different font.

https://github.com/typekit/webfontloader

PHPBB3-13876
 2015-05-28 14:55:27 +02:00
javiexin
e80bb565ce [ticket/13795] Modify core event in posting to include poll data 
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.  Added correct @change tags to both events.

PHPBB3-13795
 2015-05-28 14:39:22 +02:00
javiexin
9951458ebf [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Remove extra template variable around the new event.

PHPBB3-13786
 2015-05-28 14:28:41 +02:00
Marc Alexander
45d7e18f6b Merge pull request #3637 from callumacrae/ticket/13873 
[ticket/13873] Removed broken print stylesheet.
 2015-05-28 14:18:18 +02:00