mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 16:05:00 +02:00
Code Issues Releases Wiki Activity
25,845 Commits 18 Branches 192 Tags
8a077e0e94
Commit Graph

2161 Commits

Author SHA1 Message Date
JoshyPHP
8a077e0e94 [ticket/13847] Move quote generation to text_formatter.utils 
PHPBB3-13847
 2015-05-25 21:33:17 +02:00
Marc Alexander
6337407192 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php
 2015-05-22 11:51:25 +02:00
Marc Alexander
5ca77df084 Merge pull request from VSEphpbb/ticket/13861 
[ticket/13861] Fix undefined variables in style update migration
 2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22 [ticket/13861] Fix undefined variables in style update migration 
PHPBB3-13861
 2015-05-21 15:23:17 -07:00
Marc Alexander
466b710235 Merge pull request from Nicofuma/ticket/13829 
[ticket/13829] Don't fail if the cache isn't writeable
 2015-05-20 10:53:16 +02:00
Marc Alexander
023f15f5fe Merge pull request from Nicofuma/ticket/13849 
[ticket/13849] Fix development environment
 2015-05-20 09:32:10 +02:00
Nicofuma
c5493c2bb8 Merge pull request from s9e/ticket/13680 
[ticket/13680] Updated quote notifications
 2015-05-20 00:38:49 +02:00
Nicofuma
7a65b0cc4e [ticket/13849] Fix development environment 
PHPBB3-13849
 2015-05-19 21:59:41 +02:00
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
Nicofuma
c967ba7b9b Merge branch '3.1.x' 2015-05-17 20:02:29 +02:00
Nicofuma
309a6b9313 Merge pull request 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
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Oliver Schramm
cddecec146 Merge pull request 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
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 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 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 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
Nicofuma
5f18cf4cfb Merge branch '3.1.x' 2015-05-06 01:14:08 +02:00
Nicofuma
5e99c09abe Merge pull request 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 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