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

9685 commits

Author SHA1 Message Date
JoshyPHP
2a7a06da2a [ticket/13847] Updated ucp_pm_compose to use the utils service 
...when quoting a post

PHPBB3-13847
 2015-05-25 21:33:17 +02:00
Nicofuma
15bec23770 Merge pull request #3578 from s9e/ticket/13801 
[ticket/13801] Remove user dependency from text_formatter.s9e.parser
 2015-05-20 00:02:41 +02:00
Nicofuma
9ccc7f4d65 Merge pull request #3597 from s9e/ticket/13614 
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
 2015-05-19 23:53:27 +02:00
JoshyPHP
c1777f4811 [ticket/11530] Remove extra quotes when depth limit is exceeded 
PHPBB3-11530
 2015-05-18 03:57:48 +02:00
JoshyPHP
7b552152b4 [ticket/13801] Updated comments for clarity 
PHPBB3-13801
 2015-05-18 02:58:33 +02:00
JoshyPHP
deadc06652 [ticket/13801] Removed user dependency from text_formatter.s9e.parser 
PHPBB3-13801
 2015-05-18 02:58:33 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Nicofuma
a3e487e0f8 Merge pull request #3582 from s9e/ticket/13805 
[ticket/13805] Updated generate_text_for_storage() to match message_parser
 2015-05-14 17:13:33 +02:00
Nicofuma
ba9ac01dc0 Merge pull request #3581 from MateBartus/ticket/13804 
[ticket/13804] Make template's user dependency optional
 2015-05-14 17:03:12 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
JoshyPHP
f31483242b [ticket/13614] Added phpbb_pcre_utf8_support() dummy for BC 
PHPBB3-13614
 2015-05-11 20:48:05 +02:00
JoshyPHP
8b7a42f338 [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support() 
Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code.

PHPBB3-13614
 2015-05-11 20:43:47 +02:00
Nicofuma
98db63e8cc Merge pull request #3599 from marc1706/ticket/13825 
[ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
 2015-05-08 17:37:52 +02:00
Marc Alexander
2341b28f14 Merge branch '3.1.x' 2015-05-08 11:14:23 +02: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
b1a52a5ef3 Merge branch '3.1.x' 2015-05-08 11:07:56 +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
571f6dc9b5 [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail 
PHPBB3-13825
 2015-05-08 11:05:01 +02:00
Marc Alexander
d275586689 Merge branch '3.1.x' 2015-05-08 00:17:24 +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
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
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev 
PHPBB3-13664
 2015-05-06 22:55:30 +01:00
Nicofuma
5f18cf4cfb Merge branch '3.1.x' 2015-05-06 01:14:08 +02: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
Andreas Fischer
636524fa56 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php
 2015-05-06 01:06:21 +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
MateBartus
7b301e22f3 [ticket/13804] Make template's user dependency optional 
PHPBB3-13804
 2015-05-05 19:16:49 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset 
PHPBB3-13638
 2015-05-05 17:07:11 +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
MateBartus
179a470022 [ticket/13762] Moving language related functionality into a separate class 
PHPBB3-13762
 2015-05-02 13:37:12 +02:00
JoshyPHP
e5a167e6c2 [ticket/13805] Updated generate_text_for_storage() to match message_parser 
PHPBB3-13805
 2015-05-02 01:53:11 +02:00
MateBartus
57072a1e28 [ticket/13793] Remove translation on throwing exceptions 
PHPBB3-13793
 2015-05-01 12:40:53 +02:00
Andreas Fischer
39f1e8c009 Merge branch '3.1.x' 
* 3.1.x:
  [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:51 +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
7c2115d95a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
 2015-04-27 22:15:57 +02:00
Tristan Darricau
734b89e75c Merge pull request #3524 from marc1706/ticket/8672 
[ticket/8672] Add class for retrieving imagesize without download
 2015-04-27 16:26:40 +02:00
Alexander Köplinger
e25e411e2b [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver 
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974.

Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.

PHPBB3-12101
 2015-04-26 22:10:06 +02:00
Andreas Fischer
e7d2977401 Merge pull request #3548 from s9e/ticket/12745 
[ticket/12745] Allow Unicode characters from the SMP to be used in text

* s9e/ticket/12745:
  [ticket/12745] Added HTML entity test
  [ticket/12745] Added support for Unicode characters outside BMP
  [ticket/12745] Updated s9e\TextFormatter
 2015-04-26 20:25:14 +02:00
Marc Alexander
03eae6fddd Merge branch '3.1.x' 2015-04-26 09:24:09 +02:00
Marc Alexander
59a178f3cb Merge pull request #3532 from prototech/ticket/13755 
[ticket/13755] Ignore dots in path when determining file extension.
 2015-04-26 09:24:03 +02:00
JoshyPHP
25acba2259 [ticket/12745] Added support for Unicode characters outside BMP 
PHPBB3-12745
 2015-04-25 23:43:32 +02:00
Andreas Fischer
80d4fb1847 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:11:19 +02:00
Andreas Fischer
0fc70d4b15 Merge pull request #3550 from bantu/ticket/13765-3.1.4 
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:11:07 +02:00
Andreas Fischer
901875a1fb Merge branch 'ticket/13765' into ticket/13765-3.1.4 
* ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

Conflicts:
	phpBB/includes/functions.php
	phpBB/includes/startup.php
 2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18 [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. 
PHPBB3-13765
 2015-04-25 17:22:10 +02:00