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
70cd911281 [ticket/13803] Added tests 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
9bf0f794b5 [ticket/13803] Added pm_text tests 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
ea445ffa47 [ticket/13803] Added methods to detect whether a given feature is in use 
They test whether a given BBCode was enabled and has been used in a text,
or smilies, or magic URLs.

PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
459f1d4c1f [ticket/13803] Refactored test 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
b5911281ae [ticket/13803] Added tests, fixed param order in generate_text_for_storage() 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
986af43f37 [ticket/13803] Added plugins 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
e11ae7e9cd [ticket/13803] Hyphenated class names 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
JoshyPHP
de52580a78 [ticket/13803] WIP implementation 
PHPBB3-13803
 2015-05-30 17:26:00 +02:00
Nils Adermann
073f3e6fdc Merge pull request #3592 from Nicofuma/ticket/13388 
[ticket/13388] Integrate routing and di parameters resolution
 2015-05-30 13:21:22 +02:00
Tristan Darricau
ea7114e785 [ticket/13388] Fix coding style 
PHPBB3-13388
 2015-05-30 13:14:27 +02:00
Tristan Darricau
41efc55be9 [ticket/13896] Fix coding style 
PHPBB3-13896
 2015-05-30 12:27:31 +02:00
Marc Alexander
1ba86eaa8e [ticket/13799] Correctly urlencode category and show selected avatar 
PHPBB3-13799
 2015-05-30 11:54:54 +02:00
Nils Adermann
f958d05aed Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +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
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars. 
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
 2015-05-28 18:05:07 +02:00
Marc Alexander
ed064ce0f1 [ticket/13799] Do not rawurlencode category in gallery avatar 
Otherwise the directory seperator will incorrectly be transformed to its
HTML replacement.

PHPBB3-13799
 2015-05-28 15:36:27 +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
David King
9dc1729e37 [ticket/13733] Add isInstantiable() check. 
PHPBB3-13733
 2015-05-24 01:32:01 -04:00
David King
c485540f53 [ticket/13733] Braces on their own lines 
PHPBB3-13733
 2015-05-23 21:38:59 -04:00
David King
65316cffaf [ticket/13733] Allow tests the skip class validation 
PHPBB3-13733
 2015-05-23 21:13:30 -04:00
David King
4ecc13af83 [ticket/13733] Properly handle nonexistent classes as well 
PHPBB3-13733
 2015-05-23 20:13:23 -04:00
David King
9e6f9c8a64 [ticket/13733] Handle nonexistent classes as well 
PHPBB3-13733
 2015-05-23 19:57:32 -04:00
David King
715d365a5e [ticket/13733] Only use migration classes that extension the base migration class. 
PHPBB3-13733
 2015-05-23 17:06:25 -04: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
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Nicofuma
7a65b0cc4e [ticket/13849] Fix development environment 
PHPBB3-13849
 2015-05-19 21:59:41 +02:00