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

2204 commits

Author SHA1 Message Date
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
a26ab86dc6 Merge pull request #3577 from MateBartus/ticket/13800 
[ticket/13800] Make router's extension manager dependency optional
 2015-05-14 16:47:18 +02:00
Nicofuma
d48e95bb3a [ticket/13829] Don't fail if the cache isn't writeable 
PHPBB3-13829
 2015-05-14 16:08:21 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
MateBartus
281f2ef2da [ticket/13804] Remove unnecessary array_merge 
PHPBB3-13804
 2015-05-11 16:59:26 +02:00
Joas Schilling
66279e1a57 [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX 
PHPBB3-13827
 2015-05-09 20:48:14 +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
brunoais
684a050916 [ticket/13661] BUMP version to 3.1.5-dev 
PHPBB3-13661
 2015-05-06 22:53:43 +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
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
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
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
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
Joas Schilling
429b99922e [prep-release-3.1.4] Add migration 2015-05-03 17:12:12 +02:00
Andreas Fischer
9074738a10 Merge branch '3.1.x' 
* 3.1.x:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
 2015-05-03 16:45:10 +02:00
Andreas Fischer
cfeb2bec80 Merge branch 'prep-release-3.1.4' into 3.1.x 
* prep-release-3.1.4:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
 2015-05-03 16:43:32 +02:00
Andreas Fischer
dde72c58b0 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 
* prep-release-3.0.14:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-05-03 16:39:51 +02:00
MateBartus
74dbaac039 [ticket/13800] Make router's extension manager dependency optional 
PHPBB3-13800
 2015-05-02 23:45:45 +02:00
Joas Schilling
34141b576e [ticket/13807] Fix minor coding flaws 
PHPBB3-13807
 2015-05-02 16:55:35 +02:00
Joas Schilling
96d97ae2d2 [ticket/13807] Add an option to generate a diff for the release highlights 
PHPBB3-13807
 2015-05-02 14:41:59 +02:00
Joas Schilling
bdad879508 [ticket/13807] Allow filtering template events 
PHPBB3-13807
 2015-05-02 14:35:26 +02:00
Joas Schilling
e0180991bf [ticket/13807] Allow filtering events by phpBB version 
PHPBB3-13807
 2015-05-02 14:35:18 +02:00
MateBartus
9a99c9e4b1 [ticket/13762] Replace user service with lang in twig extension 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
9f1f6f96ce [ticket/13762] Optional DI injectable default language module array 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
179a470022 [ticket/13762] Moving language related functionality into a separate class 
PHPBB3-13762
 2015-05-02 13:37:12 +02:00
MateBartus
57072a1e28 [ticket/13793] Remove translation on throwing exceptions 
PHPBB3-13793
 2015-05-01 12:40:53 +02:00
Joas Schilling
d67fdfa02b Merge branch '3.1.x' 2015-04-29 17:16:21 +02:00
Joas Schilling
9cd0295dd8 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-04-29 17:15:56 +02:00
Joas Schilling
1ad09d9c8b [prep-release-3.1.4] Increase version number to 3.1.4-RC2 2015-04-29 09:59:40 +02:00
Andreas Fischer
0f707ddb99 Merge branch '3.1.x' 
* 3.1.x:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
 2015-04-28 21:43:46 +02:00
Andreas Fischer
62abead26d Merge branch 'prep-release-3.1.4' into 3.1.x 
* prep-release-3.1.4:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
 2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 
* prep-release-3.0.14:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2015-04-28 21:40:23 +02:00
JoshyPHP
3f54fd49b5 [ticket/10922] Replaced urlencode() with rawurlencode() 
RFC-6068 asks for percent-encoding so that seems more correct.
Not sure about that one.

PHPBB3-10922
 2015-04-28 02:53:40 +02:00
JoshyPHP
102b6c2df3 [ticket/10922] Added support for body and subject in email BBCode 
PHPBB3-10922
 2015-04-28 02:40:33 +02:00
Marc Alexander
f92d894470 [ticket/8672] Remove outdated imagesize class 
PHPBB3-8672
 2015-04-24 13:33:14 +02:00
Marc Alexander
39d6180c68 [ticket/8672] Use fastImageSize in classes 
PHPBB3-8672
 2015-04-24 13:33:14 +02:00
JoshyPHP
245d042e43 [ticket/8672] Updated the text_formatter.s9e service 
PHPBB3-8672
 2015-04-24 13:31:37 +02:00
Marc Alexander
2fa99602c6 [ticket/8672] Add class for retrieving imagesize without download 
getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
 2015-04-24 13:31:36 +02:00
Andreas Fischer
eba5b59533 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
 2015-04-22 15:15:09 +02:00