makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
25617 commits 18 branches 192 tags 207 MiB
Commit graph

25617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
2ebab2ed5f Merge branch '3.1.x' 2015-04-04 11:02:06 +02:00
Marc Alexander
55907c1724 Merge pull request #3519 from marc1706/ticket/13742 
[ticket/13742] Use correct avatar path for local avatar
 2015-04-04 11:02:03 +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
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing order of if statement and event

PHPBB3-13739
 2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
 2015-04-03 18:56:53 +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
Joas Schilling
6889248cdf Merge branch '3.1.x' 2015-04-03 18:42:25 +02:00
Joas Schilling
81c92a7de9 Merge branch '3.0.x' into 3.1.x 2015-04-03 18:42:06 +02:00
Joas Schilling
35d2467c94 Merge pull request #3512 from bantu/ticket/13738 
[ticket/13738] Use new branch names in sami-all.conf.php.
 2015-04-03 18:41:41 +02:00
Wolfsblvt
d5021aeda4 [ticket/13739] Add template core event posting_poll_body_options_after 
Template event added for the poll options while posting a topic
so that you may add additional options for polls.

PHPBB3-13739
 2015-04-03 17:02:43 +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
f4f5bdbaee [ticket/11768] Removed whitespace 
No functional change intended

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
JoshyPHP
718ace2121 [ticket/11768] Updated annotation [ci skip] 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
4398da234e [ticket/11768] Updated merge_templates(). No functional change intended 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
37106bae7a [ticket/11768] Reverted change to bbcode_uid 
On the off-chance some other routine expect bbcode_uid to never be empty.

PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
b46bf9f02f [ticket/11768] Updated merge_templates(). No functional change intended 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00