1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

25784 Commits

Author SHA1 Message Date
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
83e9cdeebc Merge branch '3.1.x' 2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925 Merge pull request #3530 from VSEphpbb/ticket/13753
[ticket/13753] Add template events to forum category row headers
2015-05-08 11:19:53 +02:00
Marc Alexander
ce3aafaf1b Merge branch '3.1.x' 2015-05-08 11:16:45 +02:00
Marc Alexander
7f5f5c216b Merge pull request #3529 from rxu/ticket/13752
[ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
2015-05-08 11:16:40 +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
3f84473306 Merge branch '3.1.x' 2015-05-08 11:00:22 +02:00
Marc Alexander
4fc6e7dbc7 Merge pull request #3598 from VSEphpbb/ticket/13822
[ticket/13822] Correctly display softdelete and post detail perms
2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969 [ticket/13822] Correctly display softdelete and post detail perms
PHPBB3-13822
2015-05-07 21:10:16 -07: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
Andreas Fischer
d73c5f1292 Merge pull request #3568 from s9e/ticket/10268
[ticket/10268] Added regression test

* s9e/ticket/10268:
  [ticket/10268] Added regression test
2015-05-07 15:59:21 +02:00
Andreas Fischer
25f3fdebfd Merge pull request #3573 from s9e/ticket/9073
[ticket/9073] Word censoring in URLs

* s9e/ticket/9073:
  [ticket/9073] Added regression test
2015-05-07 15:52:00 +02:00
Andreas Fischer
2ebf4aa151 Merge pull request #3571 from s9e/ticket/13425
[ticket/13425] Smiley code at start of text being quoted doesn't show smiley image in quote

* s9e/ticket/13425:
  [ticket/13425] Added regression test
2015-05-07 15:46:06 +02: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
Marc Alexander
d025581f49 Merge branch '3.1.x' 2015-05-06 21:47:10 +02:00
Marc Alexander
a8c033f655 Merge pull request #3521 from rxu/ticket/13745
[ticket/13745] Add viewtopic.php core event to allow manipulating poll data
2015-05-06 21:47:07 +02: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
Andreas Fischer
65b40f15f5 Merge pull request #3595 from marc1706/ticket/13819
[ticket/13819] Add missing sql_freeresult() to files in includes/

* marc1706/ticket/13819:
  [ticket/13819] Add missing sql_freeresult() to files in includes/
2015-05-06 00:46:57 +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
740be0507e [ticket/13807] Add version to the usage output
PHPBB3-13807
2015-05-05 18:35:57 +02:00
Joas Schilling
de687f32ed Merge pull request #3432 from Nicofuma/ticket/13638
[ticket/13638] Prepend the assets path phpbb root
2015-05-05 18:17:14 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset
PHPBB3-13638
2015-05-05 17:07:11 +02:00
Nicofuma
321ed2a3dd [ticket/13638] Add tests
PHPBB3-13638
2015-05-04 23:23:54 +02:00
Nicofuma
f097f84f16 [ticket/13638] Handle assets outside of phpbb_root_path
PHPBB3-13638
2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d [ticket/13638] Prepend the assets path phpbb root
PHPBB3-13638
2015-05-04 23:23:18 +02:00
Nicofuma
ba53901ffb Merge branch '3.1.x' 2015-05-04 22:53:21 +02:00
Nicofuma
ab3e4b8abc Merge pull request #3564 from VSEphpbb/ticket/13516
[ticket/13516] Do not search ICC profiles in extension vendors
2015-05-04 22:52:28 +02:00
Matt Friedman
5a107d9dc1 [ticket/13516] Update image search script
PHPBB3-13516
2015-05-04 10:33:14 -07:00
Tristan Darricau
6be8841a57 Merge pull request #3590 from rxu/ticket/13814
[ticket/13814] Prevent phpbb_is_writable() method from truncating files
2015-05-04 14:39:36 +02:00
rxu
0d2c8b5961 [ticket/13814] Prevent phpbb_is_writable() method from truncating files
phpbb_is_writable() of filesystem class uses 'w' mode to fopen files
which causes checked files to be truncated. Use the 'c' mode instead.

PHPBB3-13814
2015-05-04 16:53:27 +07:00
Tristan Darricau
1a42ec64c8 Merge pull request #3589 from marc1706/ticket/13782
[ticket/13782] Rename classes that use reserved PHP7 keywords
2015-05-04 11:16:33 +02:00
Tristan Darricau
98546a738b Merge branch '3.1.x' 2015-05-04 10:57:17 +02:00
Tristan Darricau
0e7448e2b3 Merge pull request #3562 from VSEphpbb/ticket/11521
[ticket/11521] Add missing lang strings for migration exceptions
2015-05-04 10:56:41 +02:00
Marc Alexander
292d0ab382 [ticket/13782] Rename null driver test to dummy driver test
PHPBB3-13782
2015-05-04 10:13:04 +02:00
Marc Alexander
232f71dae4 [ticket/13782] Rename null log to dummy for PHP7 compatibility
PHPBB3-13782
2015-05-04 10:11:28 +02:00
Marc Alexander
b3cc20a575 [ticket/13782] Rename null driver to dummy for PHP7 compatibility
PHPBB3-13782
2015-05-04 10:10:12 +02:00
Nicofuma
da68cfb775 Merge branch '3.1.x' 2015-05-03 22:44:39 +02:00
Nicofuma
1b75411e81 Merge pull request #3588 from nickvergessen/ticket/13809-asc
[ticket/13809] Perform the lint test prior to normal tests
2015-05-03 22:43:57 +02:00
Joas Schilling
923fdb0aa0 [ticket/13809] Test each file individually
PHPBB3-13809
2015-05-03 20:08:02 +02:00