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
Matt Friedman
ced76b5f4d
[ticket/12841] Make config position default to after
...
PHPBB3-12841
2014-07-28 22:27:01 -05: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
Matt Friedman
056584680b
[ticket/12841] prefix function name with phpbb_
...
PHPBB3-12841
2014-07-24 07:44:35 -07:00
brunoais
a0feced63e
[ticket/12877] core.mcp_mcp_front_reports_listing_query_before
...
Adding core.mcp_mcp_front_reports_listing_query_before
PHPBB3-12877
2014-07-23 07:20:20 +01: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
Oliver Schramm
bef207e9b7
[ticket/10729] Update *_delete_user when user being deleted
...
PHPBB3-10729
2014-07-18 00:19:21 +02:00
Oliver Schramm
1e0775a3da
Merge branch 'ticket/10729' into ticket/10729-2
...
Conflicts:
phpBB/includes/functions_user.php
2014-07-18 00:17:20 +02:00
Oliver Schramm
da6b378e64
[ticket/10729] Update message_edit_user when user being deleted
...
PHPBB3-10729
2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0
[ticket/10729] Update post_edit_user when user being deleted
...
PHPBB3-10729
2014-07-17 16:28:32 +02:00
PayBas
8d8e0aae68
[ticket/12838] Update RC2 to RC3
...
PHPBB3-12838
2014-07-16 22:05:28 +02: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
Tristan Darricau
519e64205a
[ticket/12847] Allow the extensions to say if they can be enabled
...
PHPBB3-12847
2014-07-13 18:09:34 +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
Matt Friedman
14979e6399
[ticket/12841] Fix white space issues reported by sniffer
...
PHPBB3-12841
2014-07-11 13:40:45 -07:00
Matt Friedman
95032c31af
[ticket/12841] Allow extensions to position new config vars
...
PHPBB3-12841
2014-07-11 10:18:46 -07: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
PayBas
c9803b7ba3
[ticket/12838] Add raw row-data to acp_ranks core event
...
PHPBB3-12838
2014-07-10 16:24:49 +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
9468d173bc
[ticket/12838] Add core events to acp_ranks.php
...
PHPBB3-12838
2014-07-10 13:29:07 +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
n-aleha
182d22567d
[ticket/12816] Fix comment about logs in user_ban function
...
PHPBB3-12816
2014-07-05 23:00:13 +03:00
Nils Adermann
53ff23671c
Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
...
* github-nicofuma/ticket/12446:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
Cesar G
e1513a985b
[ticket/12013] Use the correct variable for the forum id.
...
PHPBB3-12013
2014-07-04 00:56:04 -07:00
Cesar G
2ff8302c51
[ticket/12013] Use path helper.
...
PHPBB3-12013
2014-07-04 00:56:03 -07:00
Cesar G
90a8c7e29a
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
...
PHPBB3-12013
2014-07-04 00:56:03 -07:00