1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

8929 Commits

Author SHA1 Message Date
Nils Adermann
b203b4afa1 Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus
* github-marc1706/ticket/11148:
  [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
  [ticket/11148] Change expected output with disallowed content in test
  [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
  [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
  [ticket/11148] Add missing parts to docblock of get_mimetype() method
  [ticket/11148] Default to application/octet-stream if no mimetype given
  [ticket/11148] Use mimetype guesser for uploaded avatars
  [ticket/11148] Pass mimetype guesser to upload_attachment() function
  [ticket/11148] Add mimetype guesser to filespec and fileupload class
2014-08-07 12:06:33 +02:00
Joas Schilling
a8cb525f77 Merge pull request #2717 from Nicofuma/ticket/12836
[ticket/12836] Add event core.functions.redirect

* Nicofuma/ticket/12836:
  [ticket/12836] Add event core.functions.redirect
2014-08-07 11:47:37 +02:00
Marc Alexander
decc896bf5 Merge pull request #2799 from nickvergessen/ticket/12901
Ticket/12901 Wrong type hint in show_available_child_styles() doc block
2014-08-06 23:42:04 +02:00
Marc Alexander
964bf0b9f5 Merge pull request #2807 from nickvergessen/ticket/12875
[ticket/12875] Find language files in the default and english language
2014-08-06 23:37:55 +02:00
Joas Schilling
591d04157e [ticket/12875] Find language files in the default and english language ...
... when looking for info_xcp_ files.

PHPBB3-12875
2014-08-06 23:04:33 +02:00
rxu
a9c3c4056c [ticket/12913] Add more parameters to core.submit_post_end event
As @event core.modify_submit_post_data can modify any of the
function submit_post parameters, they may be needed to perform
actions directly after a post or topic has been submitted in
@event core.submit_post_end (includes/functions_posting.php).

PHPBB3-12913
2014-08-06 15:48:26 +08:00
Tristan Darricau
f3f54922be [ticket/12836] Add event core.functions.redirect
PHPBB3-12836
2014-08-04 10:19:32 +02:00
Joas Schilling
7755f5354f [ticket/12901] Fix another wrong type hint for $level
PHPBB3-12901
2014-08-03 22:42:17 +02:00
jeroendedauw
1d923260a6 [ticket/12901] Fix type hinting of style $level
PHPBB3-12901
2014-08-03 22:42:16 +02:00
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
2014-08-02 13:56:16 +02:00
Joas Schilling
66f859d109 Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeus
* ticket/JeroenDeDauw/12902:
  [ticket/12902] Remove duplicate entry in switch statement
2014-08-02 13:46:13 +02:00
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement
PHPBB3-12902
2014-08-02 13:44:51 +02:00
Marc Alexander
ce2c31d18a Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeus 2014-08-01 23:31:31 +02:00
Marc Alexander
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
brunoais
47bfe2999d [ticket/12801] Changed name change @since as requested
Changed name to core.load_drafts_draft_list_result as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12801
2014-08-01 11:12:29 +01:00
brunoais
25826fa587 [ticket/12880] Changed name change @since as requested
Changed name to core.display_user_activity_modify_actives as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12880
2014-08-01 11:09:26 +01:00
Tristan Darricau
702d567c69 Merge branch 'ticket/11480' into ticket/11480-ascraeus
* ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-07-30 21:01:05 +02:00
Tristan Darricau
8bdfda723c [ticket/11480] Move the test into get_folder()
PHPBB3-11480
2014-07-30 15:28:02 +02:00
Joas Schilling
6d39a5b015 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12492] Add support of special chars
2014-07-30 15:01:16 +02:00
Joas Schilling
9a3af2a052 Merge pull request #2425 from Zoddo/ticket/12492
[ticket/12492] Add support of special chars

* Zoddo/ticket/12492:
  [ticket/12492] Add support of special chars
2014-07-30 15:00:32 +02:00
Marc Alexander
98eeaacc36 [ticket/12895] Rename user style setting to resolve conflict with style param
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
2014-07-29 13:24:44 +02:00
Marc Alexander
d8867bb40d Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus 2014-07-28 16:44:37 +02:00
Joas Schilling
e226c99474 Merge pull request #2769 from rxu/ticket/12884
[ticket/12884] Add core event to the function upload_attachment()

* rxu/ticket/12884:
  [ticket/12884] Add core event to the function upload_attachment()
2014-07-27 19:45:07 +02:00
Joas Schilling
64f2d778cd Merge branch 'ticket/forumhulp/12896' into develop-ascraeus
* ticket/forumhulp/12896:
  [ticket/12896] Add php event for admin notices
2014-07-27 19:41:56 +02:00
Forumhulp.com
5dcf56c98d [ticket/12896] Add php event for admin notices
PHPBB3-12896
2014-07-27 19:35:07 +02:00
Joas Schilling
75aef80104 [ticket/12891] Replace template loops with 1 loop to reduce generation time
PHPBB3-12891
2014-07-25 13:27:49 +02:00
Andreas Fischer
b5c847c2ef [ticket/12887] Fix Typo: offest -> offset
PHPBB3-12887
2014-07-23 01:27:42 +02:00
rxu
9485f59c61 [ticket/12884] Add core event to the function upload_attachment()
Add core event to the function upload_attachment()
in functions_posting.php to provide ability for extensions
to perform additional actions on uploaded files, like resizing etc.

PHPBB3-12884
2014-07-23 00:31:15 +08:00
brunoais
51feab9ed6 [ticket/12800] removed superfulous tab character
PHPBB3-12800
2014-07-20 10:05:50 +01:00
brunoais
49a1d845fe [ticket/12800] Missing $phpbb_dispatcher as a global
PHPBB3-12800
2014-07-20 09:24:26 +01:00
brunoais
acaa1fe59c [ticket/12801] missing $phpbb_dispatcher as a global
PHPBB3-12801
2014-07-20 09:19:23 +01:00
rxu
7b91b66b87 [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
To make it consistent with another config.php constants,
PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well.

PHPBB3-12871
2014-07-19 14:09:22 +08:00
Joas Schilling
cd5fbd52c2 Merge pull request #2709 from rxu/ticket/12828
[ticket/12828] Add ucp_prefs.php common core event

* rxu/ticket/12828:
  [ticket/12828] Add ucp_prefs.php common core event
2014-07-16 16:15:30 +02:00
Oliver Schramm
021adcc14f [ticket/12854] Don't show contact page link if board emails are disabled
PHPBB3-12854
2014-07-15 22:19:56 +02:00
rxu
fe02caa8e0 [ticket/12828] Add ucp_prefs.php common core event
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.

PHPBB3-12828
2014-07-13 21:34:24 +08:00
Joas Schilling
b5492a07da [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development 2014-07-11 17:22:16 +02:00
Joas Schilling
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
Andreas Fischer
248b11c4db Merge pull request #2701 from Nicofuma/ticket/12818
[ticket/12818] Deleting a log entry in MCP produces a General error

* Nicofuma/ticket/12818:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
Andreas Fischer
b2a883d504 Merge pull request #2671 from Nicofuma/ticket/12775
[ticket/12775] Replace functions_container with a container_builder class.

* Nicofuma/ticket/12775: (34 commits)
  [ticket/12775] Set dbal.conn.driver as synthetic during installation
  [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
  [ticket/12775] Inject the connection when created in the container
  [ticket/12775] Extract the vars later in install/install_update.php
  [ticket/12775] Rename config_php_handler to config_php_file container_builder
  [ticket/12775] Set defined_vars as a property of config_php_file
  [ticket/12775] Fix doc blocks in the container builder
  [ticket/12775] Remove useless includes of config.php
  [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
  [ticket/12775] Fix comments
  [ticket/12775] Update doc blocks
  [ticket/12775] Fix container_builder
  [ticket/12775] Rename config_php to config_php_file
  [ticket/12775] Renamed to \phpbb\di\container_builder
  [ticket/12775] Remove the last include of functions_container
  [ticket/12775] Fix unit tests
  [ticket/12775] Add tests for \phpbb\config_php
  [ticket/12775] Add tests for the container factory
  [ticket/12775] Use a field instead of a local var in load_config_var()
  [ticket/12775] Update container and config in install/
  ...
2014-07-11 11:49:51 +02:00
Tristan Darricau
cc0f931473 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:26:27 +02:00
Marc Alexander
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
PHPBB3-12695
2014-07-10 14:39:53 +02:00
PayBas
0a286e044b [ticket/12804] Dont use ternary form
PHPBB3-12804
2014-07-07 11:28:06 +02:00
PayBas
c5b4d0afb7 [ticket/12804] Hide Jabber from UCP & member search when disabled
PHPBB3-12804
2014-07-07 09:05:57 +02:00
Tristan Darricau
d226a73111 [ticket/12775] Remove useless includes of config.php
PHPBB3-12775
2014-07-07 01:02:42 +02:00
Tristan Darricau
ed812a9dfb [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
PHPBB3-12775
2014-07-07 01:02:40 +02:00
Tristan Darricau
1d966fbc86 [ticket/12775] Add tests for the container factory
PHPBB3-12775
2014-07-07 01:02:27 +02:00
Tristan Darricau
e7804ecce4 [ticket/12775] Update phpBB/install/database_update.php
PHPBB3-12775
2014-07-07 01:02:19 +02:00
Andreas Fischer
0bec9897d7 Merge pull request #2697 from n-aleha/ticket/12816
[ticket/12816] Fix comment about logs in user_ban function

* n-aleha/ticket/12816:
  [ticket/12816] Fix comment about logs in user_ban function
2014-07-07 00:20:27 +02:00
brunoais
4629ebfc4f [ticket/12801] Add core.functions_posting.load_drafts_draft_list_results
Adding event core.functions_posting.load_drafts_draft_list_results

PHPBB3-12801
2014-07-06 20:10:44 +01:00
Tristan Darricau
b7fb2e557e [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
PHPBB3-12818
2014-07-06 00:00:58 +02:00