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
b1e92393ee
[ticket/14080] Add template events around the topic row in viewforum_body.html
...
PHPBB3-14080
2015-08-09 00:32:22 +07: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
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
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
Zoddo
92703127d3
[ticket/14013] Add documentation for acp_forums_custom_settings
...
PHPBB3-14013
2015-07-15 02:05:33 +02:00
rxu
42dc7eb0f5
[ticket/14002] Add template events before/after user details in ucp_main_front
...
PHPBB3-14002
2015-07-11 17:51:03 +07:00
javiexin
ed3f46a9b1
[ticket/13982] Add events around ranks
...
Add events to present information around ranks in the memberlist,
user profile, viewtopic profile and private message profile.
PHPBB3-13982
2015-07-04 01:51:06 +02:00
javiexin
d0cf674f33
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number again.
PHPBB3-13911
2015-06-27 12:45:56 +02:00
Andreas Fischer
65fef50869
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561
Merge pull request #3695 from javiexin/ticket/13931
...
[ticket/13931] Wrong order in docs/events.md
* javiexin/ticket/13931:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:29:18 +02:00
javiexin
41f78b5c49
[ticket/13931] Wrong order in docs/events.md
...
Reordered alphabetically (mcp before memberlist).
PHPBB3-13931
2015-06-08 11:26:59 +02:00
javiexin
9057f72fc7
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number and event name.
PHPBB3-13911
2015-06-04 19:13:23 +02:00
Joas Schilling
c28a213b1b
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/mcp_post.html
2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344
Merge pull request #3558 from javiexin/ticket/13786
...
[ticket/13786] Add events to add MCP post options
2015-06-04 17:45:21 +02:00
javiexin
0f6d16920b
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.
PHPBB3-13911
2015-06-02 13:18:33 +02:00
Joas Schilling
5bf48bddf8
Merge branch 'ticket/13808' into ticket/13808-master
...
* ticket/13808:
[ticket/13808] Fix version
Conflicts:
phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0
[ticket/13808] Fix version
...
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Joas Schilling
c5b2822cf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13808] search_body_form_before
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
2015-05-28 11:09:24 +02:00
Joas Schilling
8fda16527e
Merge pull request #3600 from dragosvr92/ticket/13808
...
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Oliver Schramm
c1ab364e28
Merge branch '3.1.x'
2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca
Merge pull request #3563 from rxu/ticket/13791
...
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
Marc Alexander
11167f6060
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8
Merge pull request #3540 from RMcGirr83/ticket/13699
...
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00
