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

25179 commits

Author SHA1 Message Date
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
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
c701e8a131 [ticket/13694] BUMP version to 3.1.5-dev 
PHPBB3-13694
 2015-05-06 23:05:30 +01:00
brunoais
5465c594ca [ticket/13691] BUMP version to 3.1.5-dev 
PHPBB3-13691
 2015-05-06 23:03:23 +01:00
brunoais
f2fb8e339d [ticket/13686] BUMP version to 3.1.5-dev 
PHPBB3-13686
 2015-05-06 23:02:21 +01:00
brunoais
9833eb4f13 [ticket/13672] BUMP version to 3.1.5-dev 
PHPBB3-13672
 2015-05-06 23:00:26 +01:00
brunoais
b8a31241a3 [ticket/13689] BUMP version to 3.1.5-dev 
PHPBB3-13689
 2015-05-06 22:59:05 +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
brunoais
684a050916 [ticket/13661] BUMP version to 3.1.5-dev 
PHPBB3-13661
 2015-05-06 22:53:43 +01:00
brunoais
59a1f4e8ac [ticket/13693] BUMP version to 3.1.5-dev 
PHPBB3-13693
 2015-05-06 22:50:52 +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
Marc Alexander
de90dd25b2 [ticket/13819] Add missing sql_freeresult() to files in includes/ 
PHPBB3-13819
 2015-05-05 23:55:13 +02:00
Richard McGirr
c2b4636008 [ticket/13699] Add event before and after forum title in viewforum 
PHPBB3-13699
 2015-05-05 13:37:46 -04:00
MateBartus
7b301e22f3 [ticket/13804] Make template's user dependency optional 
PHPBB3-13804
 2015-05-05 19:16:49 +02:00
Joas Schilling
740be0507e [ticket/13807] Add version to the usage output 
PHPBB3-13807
 2015-05-05 18:35:57 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset 
PHPBB3-13638
 2015-05-05 17:07:11 +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
javiexin
6e0d12094a [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.

PHPBB3-13795
 2015-05-04 20:34:54 +02:00
Matt Friedman
c7a0b4479d [ticket/13771] Only handle valid JQHXR response objects 
PHPBB3-13771
 2015-05-04 10:27:11 -07:00
Tristan Darricau
f821130c3a [ticket/12632] Add twig.debug and twig.auto_reload in config.yml 
PHPBB3-13206
PHPBB3-12632
 2015-05-04 14:43:58 +02: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
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
Joas Schilling
36abb61d39 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-05-03 18:44:34 +02:00
Joas Schilling
f42a737419 Merge branch 'prep-release-3.1.4' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-05-03 18:44:01 +02:00