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

9412 commits

Author SHA1 Message Date
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly 
PHPBB3-13823
 2015-06-09 23:11:26 +02:00
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685 
[ticket/13685] Allow modifying the query for mysql native fulltext search
 2015-06-09 14:27:13 +02:00
brunoais
6e8da5a424 [ticket/13685] This should take care of the rest 
PHPBB3-13685
 2015-06-08 18:09:48 +01:00
Oliver Schramm
c2d254ea41 Merge branch 'ticket/13833-30x' into ticket/13833 
Conflicts:
        phpBB/posting.php

PHPBB3-13833
 2015-06-08 17:19:11 +02:00
Oliver Schramm
2c6369c5d9 [ticket/13833] Prevent flooding if type=submit doesn't exist 
PHPBB3-13833
 2015-06-08 17:01:52 +02:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01: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
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
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch 
PHPBB3-13841
 2015-06-05 07:33:40 +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
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
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
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
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +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
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
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
rxu
33239183ae [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions 
PHPBB3-13868
 2015-05-27 02:15:12 +07:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation 
PHPBB3-13672
 2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation 
PHPBB3-13668
 2015-05-08 10:41:42 +01:00
Marc Alexander
d741ab57a8 Merge pull request #3526 from rxu/ticket/13750 
[ticket/13750] Add core event to allow modifying navlinks text
 2015-05-08 11:14:17 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664 
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
 2015-05-08 11:07:50 +02:00
Marc Alexander
1e28748c0c Merge pull request #3455 from brunoais/ticket/13660 
[ticket/13660] Allow changing the query for total reports in mcp_front
 2015-05-08 00:17:10 +02:00
rxu
aa1b427e45 [ticket/13648] Allow extensions using custom bbcode validation methods 
PHPBB3-13648
 2015-05-07 22:01:10 +07:00
rxu
a67db63a18 [ticket/13750] Add core event to allow modifying navlinks text 
Add generate_forum_nav() core event in includes/functions_display.php
to allow modifying navlinks text. Use case example: extension(s) implementing
multilanguage boards including translated forum names and so on.

PHPBB3-13750
 2015-05-07 21:57:27 +07:00
brunoais
603726371c [ticket/13660] BUMP version to 3.1.5-RC1 
PHPBB3-13660
 2015-05-06 23:08:07 +01:00
brunoais
9833eb4f13 [ticket/13672] BUMP version to 3.1.5-dev 
PHPBB3-13672
 2015-05-06 23:00:26 +01:00
brunoais
9e06beb48d [ticket/13668] BUMP version to 3.1.5-dev 
PHPBB3-13668
 2015-05-06 22:56:22 +01:00
brunoais
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev 
PHPBB3-13664
 2015-05-06 22:55:30 +01:00
Nicofuma
5e99c09abe Merge pull request #3583 from nickvergessen/ticket/13807 
Ticket/13807 Allow building changesets for the event list
 2015-05-06 01:13:33 +02:00
Marc Alexander
de90dd25b2 [ticket/13819] Add missing sql_freeresult() to files in includes/ 
PHPBB3-13819
 2015-05-05 23:55:13 +02:00
Joas Schilling
2226043325 [ticket/13807] Fix "changed version" to match our version numbering 
PHPBB3-13807
 2015-05-02 14:41:59 +02:00
Andreas Fischer
aa0c55ed8f Merge branch 'prep-release-3.1.4' into 3.1.x 
* prep-release-3.1.4:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
 2015-04-28 22:17:37 +02:00
Marc Alexander
d7c96cc60c [ticket/security-180] Use language variable for redirect error in 3.1+ 
SECURITY-180
 2015-04-28 22:12:04 +02:00
Marc Alexander
416728fc17 Merge branch 'ticket/security-180' into ticket/security-180-asc 
Conflicts:
	tests/security/redirect_test.php
 2015-04-28 22:12:03 +02:00
Marc Alexander
ec207d0a71 [ticket/security-180] Merge if statement with previous one in 3.1.x 
SECURITY-180
 2015-04-28 22:08:19 +02:00
Marc Alexander
89723b17d9 Merge branch 'ticket/security-180' into ticket/security-180-asc 
Conflicts:
	tests/security/redirect_test.php
 2015-04-28 22:08:15 +02:00
Andreas Fischer
2fb7ef2668 Merge branch 'prep-release-3.0.14' into 3.0.x 
* prep-release-3.0.14:
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
 2015-04-28 21:55:15 +02:00
Andreas Fischer
1a3350619f Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14 
* phpbb-security/ticket/security-180:
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
 2015-04-28 21:54:50 +02:00
Andreas Fischer
6d8df7332c [3.0.x] Increment version number to 3.0.15-dev. 2015-04-28 20:40:20 +02:00