mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 00:51:27 +02:00
Code Issues Releases Wiki Activity
31,453 Commits 18 Branches 192 Tags
6f48b3c044a5339bc019f355db490e1a53b51fdc
Commit Graph

3945 Commits

Author SHA1 Message Date
JoshyPHP
5772e06b1a [ticket/13801] Updated event description [ci skip] 
PHPBB3-13801
 2015-05-18 02:58:33 +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
8ce0a64a16 [ticket/13844] Remove hacky code for the help array 
PHPBB3-13844
 2015-05-17 21:18:17 +02:00
Nicofuma
c967ba7b9b Merge branch '3.1.x' 2015-05-17 20:02:29 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827 
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
 2015-05-17 20:01:18 +02:00
Joas Schilling
07231e7943 [ticket/13844] FAQ in new controller format 
PHPBB3-13844
 2015-05-16 22:09:05 +02:00
Joas Schilling
ff7e9dc912 [ticket/13844] Refactor bbcode help to the new system 
PHPBB3-13844
 2015-05-16 22:09:04 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Oliver Schramm
cddecec146 Merge pull request #3591 from Nicofuma/ticket/12632 
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
 2015-05-16 00:30:19 +02:00
JoshyPHP
f7ad2c2b32 [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authors 
PHPBB3-13680
 2015-05-15 02:12:52 +02:00
JoshyPHP
f5ce9f2738 [ticket/13680] Updated quote notifications 
Added get_quote_authors() to text_formatter.utils service to retrieve
the names used in first-level quotes

PHPBB3-13680
 2015-05-15 02:10:46 +02:00
Nicofuma
2b25c5bd35 [ticket/13770] Use dummy cache driver 
PHPBB3-13770
 2015-05-14 23:04:27 +02:00
Nicofuma
02af9385a1 [ticket/13770] Fix tests 
PHPBB3-13770
 2015-05-14 23:04:23 +02:00
Tristan Darricau
549fe66d90 [ticket/13770] Update tests 
PHPBB3-13770
 2015-05-14 23:04:18 +02:00
Tristan Darricau
c96e7ef171 [ticket/13770] Wither interface for container_builder 
PHPBB3-13770
 2015-05-14 23:04:03 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit() 
PHPBB3-13827
 2015-05-14 17:13:47 +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
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
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
b8a31241a3 [ticket/13689] BUMP version to 3.1.5-dev 
PHPBB3-13689
 2015-05-06 22:59:05 +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
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