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

21753 Commits

Author SHA1 Message Date
Joas Schilling
96e212ef0c Merge branch '3.1.x' 2015-04-06 11:14:02 +02:00
Joas Schilling
c60497f009 Merge pull request #3402 from brunoais/ticket/13621 
[ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
 2015-04-06 11:13:33 +02:00
Joas Schilling
3af61075a8 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/captcha/plugins/qa.php
 2015-04-06 11:09:20 +02:00
Joas Schilling
009a8cb2d5 Merge pull request #3333 from marc1706/ticket/13522 
[ticket/13522] Remove empty answers from possible answers in Q&A
 2015-04-06 11:04:35 +02:00
Joas Schilling
197369e3f9 Merge branch '3.1.x' 2015-04-06 10:59:46 +02:00
Joas Schilling
9ab27fe129 Merge pull request #3284 from Elsensee/ticket/13469 
[ticket/13469] Fall back to soft_delete if no permissions for delete
 2015-04-06 10:59:33 +02:00
Tristan Darricau
3a6a61a8dd Merge pull request #3461 from s9e/ticket/11768 
[3.2][ticket/11768] Integrate s9e\TextFormatter
 2015-04-05 23:32:38 +02:00
Tristan Darricau
5ac13c7ddc Merge branch '3.1.x' 2015-04-05 23:22:41 +02:00
Tristan Darricau
30cf75a011 Merge pull request #3430 from MateBartus/ticket/12466 
[ticket/12466] Move classes from acp_database.php to their own files
 2015-04-05 20:13:38 +02:00
rxu
3521e74939 [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php 
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.

PHPBB3-13743
 2015-04-05 18:48:43 +07:00
Marc Alexander
c900dcdc2a Merge branch '3.1.x' 2015-04-04 11:04:31 +02:00
Marc Alexander
558d604d83 Merge pull request #3518 from marc1706/ticket/13703 
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
 2015-04-04 11:04:29 +02:00
Marc Alexander
2ebab2ed5f Merge branch '3.1.x' 2015-04-04 11:02:06 +02:00
Kevin Roy
ddff81c21f [ticket/13742] Use correct avatar path for local avatar 
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.

PHPBB3-13742
 2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06 [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH 
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.

PHPBB3-13703
 2015-04-03 23:04:52 +02:00
Joas Schilling
7541fab408 Merge branch '3.1.x' 2015-04-03 18:56:23 +02:00
Joas Schilling
71177c38dc Merge pull request #3515 from cyberalien/ticket/13741 
Ticket/13741 Remove outdated comments and references in css files
 2015-04-03 18:56:15 +02:00
Marc Alexander
ca1ac36c20 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
 2015-04-03 16:50:20 +02:00
Marc Alexander
55f6329c1d Merge pull request #3467 from dragosvr92/patch-5 
[ticket/13602] Adding a new event overall_header_navbar_before
 2015-04-03 16:48:26 +02:00
cyberalien
e120e6ac97 [ticket/13741] Remove outdated references to tweaks.css 
PHPBB3-13741
 2015-04-03 11:14:20 +03:00
cyberalien
9f54d2b590 [ticket/13741] Remove reference to unused body font-size declaration 
Remove reference to font-size declaration that is no longer used in prosilver

PHPBB3-13741
 2015-04-03 11:04:47 +03:00
cyberalien
6c308d81bd [ticket/13741] Remove reference to oudated rollover code that no longer exists 
Rollover code referenced in that comment has been removed in 3.1

PHPBB3-13741
 2015-04-03 11:03:47 +03:00
Marc Alexander
f86c5d905b Merge branch '3.1.x' 2015-04-02 21:22:15 +02:00
Marc Alexander
418aabb46e Merge pull request #3508 from cyberalien/ticket/13726 
[ticket/13726] Fix function that calculates responsive breadcrumbs width
 2015-04-02 21:22:12 +02:00
Marc Alexander
8546ed0fbc Merge branch '3.1.x' 2015-04-02 20:03:02 +02:00
Marc Alexander
335520fc45 Merge pull request #3509 from cyberalien/ticket/13727 
[ticket/13727] Fix JS that resizes breadcrumbs
 2015-04-02 20:01:47 +02:00
JoshyPHP
4e80565fe7 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
b24e0f4f69 [ticket/11768] Stylistic change. No functional change intended 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
1d90daf969 [ticket/11768] Added some default template parameters 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
09c19718c0 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
76088d64a6 [ticket/11768] Moved the routine that replaces tabs with spaces 
...to its own method. Also added a quick stripos() check for performance.

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
d8e7e11ee3 [ticket/11768] Renamed service vars 
The name of the variable that holds the service instance is now consistent
across events.

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
3e04e643df [ticket/11768] Restored get_parser() / get_renderer() 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
0f30301a0c [ticket/11768] Moved parser/renderer setup events 
Moved down the setup events to make them happen after the service is
configured and ready to be used

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
c1bc05a860 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
55c3fc02cf [ticket/11768] Updated utils service 
Updated docblocks.
Removed remove_formatting() because it overlaps with clean_formatting()

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
f75f63b264 [ticket/11768] Added parser events 
Added core.text_formatter_s9e_parse_before and
core.text_formatter_s9e_parse_after

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
a04fca86ee [ticket/11768] Added renderer events 
Added core.text_formatter_s9e_render_before and
core.text_formatter_s9e_render_after

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
af4f9b860f [ticket/11768] Added core.text_formatter_s9e_renderer_setup event 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
c891881321 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
7f9639fd24 [ticket/11768] Fixed service config 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
a7a53d5a30 [ticket/11768] Added core.text_formatter_s9e_parser_setup event 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
2a462bb7e4 [ticket/11768] Removed get_parser() / get_renderer() accessors 
There's no need to access the s9e\TextFormatter objects outside of events.

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
37fedc656f [ticket/11768] Updated the text_formatter.s9e.utils service 
Made it use s9e\TextFormatter\Utils. Refactored some tests to make
them more readable.

PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
5b2d3fddfd [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
c165eaa37c [ticket/11768] Removed superfluous whitespace [ci skip] 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
69dae16ba7 [ticket/11768] Preserve comments in custom BBCodes 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
3cd5ca8de1 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
49b9e8e4ea [ticket/11768] Added configurator events 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
8971805e57 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00