1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00

2095 Commits

Author SHA1 Message Date
Tristan Darricau
de5a5c41f8 [ticket/13768] Fix deprecations
PHPBB3-13768
2015-04-19 17:41:29 +02:00
Tristan Darricau
ecc65f564d Merge pull request #3539 from MateBartus/ticket/13766
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
2015-04-17 00:07:04 +02:00
MateBartus
f23fe9e69d [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()
PHPBB3-13766
2015-04-16 23:28:52 +02:00
Tristan Darricau
c89384eb86 Merge pull request #3446 from MateBartus/ticket/13654
[ticket/13654] Moving reporting into controller
2015-04-16 21:30:52 +02:00
Tristan Darricau
f077b72d0d Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
2015-04-16 13:24:10 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
2015-04-16 11:29:11 +02:00
Dhruv
2c0b1252c8 Merge branch '3.1.x' 2015-04-14 09:10:47 +05:30
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
2015-04-11 23:08:45 +02:00
Joas Schilling
bf107ba1af Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-04-10 10:06:07 +02:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
201f5cb3fb Merge branch '3.1.x' 2015-04-06 16:54:54 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493
[ticket/13493] Append page name to base url if it doesn't contain it
2015-04-06 16:54:35 +02:00
Joas Schilling
2962d5d7fd Merge branch '3.1.x' 2015-04-06 11:36:04 +02:00
Joas Schilling
90025ae3e7 Merge pull request #3437 from marc1706/ticket/12368
[ticket/12368] Correctly check if avatars migration is installed
2015-04-06 11:36:00 +02:00
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
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
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
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
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
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
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
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
49b9e8e4ea [ticket/11768] Added configurator events
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
b46bf9f02f [ticket/11768] Updated merge_templates(). No functional change intended
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
40c54898cc [ticket/11768] Updated various annotations
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
89d87a99db [ticket/11768] Replaced array access with call to $user->lang()
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
20a1646fc6 [ticket/11768] Renamed utils
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
44fc3d64da [ticket/11768] Made capturing code blocks a bit more flexible
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
a611366bd3 [ticket/11768] Whitespace [ci skip]
PHPBB3-11768
2015-04-02 19:16:03 +02:00