1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00

1753 Commits

Author SHA1 Message Date
Marc Alexander
fdca5532e6 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-08-22 10:32:41 +02:00
Marc Alexander
b09e1ad26d Merge pull request #3852 from marc1706/ticket/14068
[ticket/14068] Add template events before and after poll panel in viewtopic
2015-08-22 10:32:09 +02:00
Marc Alexander
1cc3d24cd8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
2015-08-22 09:09:08 +02:00
Marc Alexander
583068da9d Merge pull request #3771 from Zoddo/ticket/14025
[ticket/14091] Add mcp_topic_subject_* template events

Conflicts:
	phpBB/docs/events.md
2015-08-22 09:08:11 +02:00
javiexin
04b0ba9f6d [ticket/14068] Add template events before and after poll panel
In viewtopic.

PHPBB3-14068
2015-08-22 08:28:33 +02:00
Marc Alexander
6cdb61e68c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_history.html
2015-08-22 08:18:21 +02:00
Marc Alexander
ccd1e1eebb Merge pull request #3803 from rxu/ticket/14064
[ticket/14064] Add template events to ucp_pm_history.html
2015-08-22 08:17:50 +02:00
Marc Alexander
c8db7ae7c4 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
2015-08-22 08:14:18 +02:00
Marc Alexander
a959e5f4cc Merge pull request #3806 from rxu/ticket/14067
[ticket/14067] Add template events to overall_header.html around feeds
2015-08-22 08:13:39 +02:00
Marc Alexander
d30b5207b8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
2015-08-22 08:11:15 +02:00
Marc Alexander
697ccd41c4 Merge pull request #3804 from rxu/ticket/14065
[ticket/14065] Add template events to attachment.html
2015-08-22 08:10:27 +02:00
Marc Alexander
648389af6f Merge branch '3.1.x'
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/mcp_forum.html
2015-08-20 10:23:56 +02:00
Marc Alexander
ffe72e500c Merge pull request #3797 from RMcGirr83/ticket/13863
[ticket/13863] Add topic_row_append/prepend to mcp_forum.html
2015-08-20 10:22:42 +02:00
Marc Alexander
7cdaa03e20 Merge branch '3.1.x' 2015-08-20 10:17:50 +02:00
Marc Alexander
6f1d848087 Merge pull request #3783 from Zoddo/ticket/14041
[ticket/14041] Add viewtopic_dropdown_*_custom template event
2015-08-20 10:17:45 +02:00
Marc Alexander
5ae821ee28 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
2015-08-20 10:08:47 +02:00
Marc Alexander
00aab15f7c Merge pull request #3769 from Zoddo/ticket/14023
[ticket/14090] Add mcp_topic_topic_title_* template events
2015-08-20 10:08:06 +02:00
Marc Alexander
a2e19e4ea8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-08-14 13:38:09 +02:00
Marc Alexander
e466318dc2 Merge pull request #3761 from Zoddo/ticket/13997
[ticket/13997] Add posting_editor_submit_buttons template event
2015-08-14 13:36:22 +02:00
Zoddo
146c4b1624 [ticket/14091] Add mcp_topic_subject_* template events
Add some options (field, checkbox, ...) before/after the subject
field when split a subject

PHPBB3-14091
2015-08-11 20:15:39 +02:00
Zoddo
4bab984dac [ticket/14090] Add mcp_topic_topic_title_* template events
Allows to add some information before/after the topic title

PHPBB3-14090
2015-08-11 20:10:45 +02:00
Marc Alexander
81e045628d Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_forum.html
2015-08-11 09:14:23 +02:00
Zoddo
40666dd96f [ticket/14086] Add mcp_forum_topic_title_* template events
Allows to add some information before/after the topic title

PHPBB3-14086
2015-08-10 22:27:19 +02:00
Marc Alexander
32c3267295 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-08-09 20:59:14 +02:00
Zoddo
9a2c74a68c [ticket/14019] Add posting_topic_title_before template event
Allows to add some information on the left of the topic title
in the posting form

PHPBB3-14019
2015-08-09 13:42:34 +02:00
Zoddo
166e0b5961 [ticket/13997] Add posting_editor_submit_buttons template event
PHPBB3-13997
2015-08-09 11:36:49 +02:00
Marc Alexander
7b8f8d7d90 Merge branch '3.1.x' 2015-08-09 10:08:06 +02:00
Marc Alexander
9e38f412ea Merge pull request #3756 from rxu/ticket/14005
[ticket/14005] Allow extensions control post buttons displaying
2015-08-09 10:08:00 +02:00
Marc Alexander
e41fcab3de Merge branch '3.1.x' 2015-08-08 22:40:40 +02:00
Marc Alexander
8e80425c82 Merge pull request #3759 from Zoddo/ticket/14013
[ticket/14013] Add acp_forums_custom_settings event
2015-08-08 22:40:35 +02:00
rxu
49bc477a87 [ticket/14067] Add template events to overall_header.html around feeds
PHPBB3-14067
2015-08-05 16:29:06 +07:00
rxu
6a7978965d [ticket/14065] Add template events to attachment.html
Additionally remove some unnecessary empty lines.

PHPBB3-14065
2015-08-03 18:35:15 +07:00
rxu
478a4c4133 [ticket/14064] Add template events to ucp_pm_history.html
PHPBB3-14064
2015-08-03 03:48:20 +07:00
RMcGirr83
30449b69af [ticket/13863] Spaces not tabs
PHPBB3-13863
2015-07-29 12:47:31 -04:00
Richard McGirr
9c67d02bd2 [ticket/13863] Add topic_row_append/prepend to mcp_forum.html
PHPBB3-13863
2015-07-28 05:53:30 -04:00
Tristan Darricau
a0258ae25c Merge pull request #3514 from CHItA/ticket/13740
[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
2015-07-27 11:24:43 +02:00
Mate Bartus
0e3b7e2de6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13982] Remove extra new line
2015-07-23 21:32:01 +02:00
Marc Alexander
4bf0534bf9 [ticket/13982] Remove extra new line
PHPBB3-13982
2015-07-23 18:05:12 +02:00
Marc Alexander
b677bc41c9 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_view.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-07-23 12:12:03 +02:00
Marc Alexander
da53d95b95 Merge pull request #3739 from javiexin/ticket/13982
[ticket/13982] Add events around ranks

Conflicts:
	phpBB/docs/events.md
2015-07-23 12:10:27 +02:00
Marc Alexander
8bfbd77828 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_profile.php
2015-07-22 10:38:35 +02:00
Marc Alexander
5da50fcf6e Merge pull request #3719 from javiexin/ticket/13911
[ticket/13911] Add events to configure options for profile fields
2015-07-22 10:37:16 +02:00
Marc Alexander
b3974ed0f6 Merge branch '3.1.x' 2015-07-22 10:14:50 +02:00
Marc Alexander
49bffc1851 [ticket/13843] Fix merge issues and update @since version
PHPBB3-13843
2015-07-22 09:45:55 +02:00
alf007
8b21e7c0d9 [ticket/13843] Add templates events to insert custom panel in posting
Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body

PHPBB3-13843
2015-07-22 09:43:59 +02:00
Zoddo
7e21d1dab5 [ticket/14041] Add viewtopic_dropdown_*_custom template event
Allows an extension to create a custom dropdown menu.

PHPBB3-14041
PHPBB3-14042
2015-07-21 16:33:45 +02:00
Mate Bartus
030f6da911 [ticket/13740] Remove extra dot from config sample's name
PHPBB3-13740
2015-07-21 15:30:31 +02:00
Mate Bartus
846ab1d22f [ticket/13740] Move install-config.yml to docs/
PHPBB3-13740
2015-07-20 18:12:50 +02:00
Marc Alexander
69c66db459 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_main_front.html
2015-07-20 13:07:32 +02:00
rxu
64b41f314e [ticket/14005] Allow extensions control post buttons displaying for PM
PHPBB3-14005
2015-07-17 00:55:16 +07:00