mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
25,958 Commits 17 Branches 190 Tags
Commit Graph

2199 Commits

Author SHA1 Message Date
Tristan Darricau
ea7114e785 [ticket/13388] Fix coding style 
PHPBB3-13388
 2015-05-30 13:14:27 +02:00
Tristan Darricau
d129ee6c94 [ticket/13388] Fix deprecations 
PHPBB3-13388
 2015-05-29 16:53:54 +02:00
Tristan Darricau
80375c98f0 [ticket/13388] Fix rebase 
PHPBB3-13388
 2015-05-29 16:52:21 +02:00
Tristan Darricau
6656567424 [ticket/13388] Address comments 
PHPBB3-13388
 2015-05-29 16:48:51 +02:00
Tristan Darricau
66c0e0c6a8 [ticket/13388] Integrate routing and di parameters resolution 
PHPBB3-13388
 2015-05-29 16:48:51 +02:00
Tristan Darricau
86ad1a92c8 Merge pull request #3561 from s9e/ticket/10922 
[ticket/10922] Added support for body and subject in email BBCode
 2015-05-29 16:15:04 +02:00
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844 
Ticket/13844 Better FAQ language files
 2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2 Merge pull request #3616 from s9e/ticket/13847 
[ticket/13847] Move quote generation to text_formatter.utils
 2015-05-29 15:42:14 +02:00
Tristan Darricau
3c3b099f88 Merge pull request #3622 from s9e/ticket/13860 
[ticket/13860] Fixed array-to-string conversion
 2015-05-29 13:15:33 +02:00
Tristan Darricau
835a2ebcb8 Merge pull request #3625 from s9e/ticket/11742 
[ticket/11742] Remove tabs-to-space conversion in [code]
 2015-05-29 13:03:12 +02:00
Nils Adermann
da68f62d4f Merge pull request #3554 from Nicofuma/ticket/13770 
[ticket/13770] Wither interface for container_builder
 2015-05-29 10:56:54 +02:00
Marc Alexander
615761fdf1 Merge branch '3.1.x' 2015-05-28 14:16:11 +02:00
Marc Alexander
ef39f3a9ab Merge pull request #3633 from nickvergessen/ticket/13872 
[ticket/13872] Allow template events to have a changed version
 2015-05-28 14:16:08 +02:00
Joas Schilling
021a2aeb82 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
 2015-05-28 12:52:36 +02:00
Joas Schilling
b1d829c232 Merge pull request #3457 from brunoais/ticket/13661 
[ticket/13661] Add event to allow editing the queries used to get the logs

* brunoais/ticket/13661:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
 2015-05-28 12:52:19 +02:00
JoshyPHP
e0f7c225bc [ticket/13860] Fixed array-to-string conversion 
PHPBB3-13860
 2015-05-28 12:24:14 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version 
PHPBB3-13872
 2015-05-28 12:23:24 +02:00
JoshyPHP
e50d9186ce [ticket/13847] Changed enquote() logic to use whichever is the shortest 
Will enclose attribute values in single- or double- quotes depending on
whichever requires the least escaping. Characters that need to be escaped
are always escaped regardless.

PHPBB3-13847
 2015-05-25 21:33:17 +02:00
JoshyPHP
8a077e0e94 [ticket/13847] Move quote generation to text_formatter.utils 
PHPBB3-13847
 2015-05-25 21:33:17 +02:00
JoshyPHP
92078dce33 [ticket/11742] Removed tabs-to-space conversion in [code] 
PHPBB3-11742
 2015-05-23 01:55:04 +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 #3624 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
Joas Schilling
077051fef5 [ticket/13844] Add events 
PHPBB3-13844
 2015-05-20 20:11:52 +02:00
Marc Alexander
466b710235 Merge pull request #3608 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 #3621 from Nicofuma/ticket/13849 
[ticket/13849] Fix development environment
 2015-05-20 09:32:10 +02:00
Nicofuma
c5493c2bb8 Merge pull request #3586 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
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