1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 13:47:55 +02:00

322 Commits

Author SHA1 Message Date
Tristan Darricau
df505d772d Merge branch '3.1.x'
* 3.1.x:
  [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
2016-02-05 20:36:57 +01:00
Tristan Darricau
8a2f564f3d Merge pull request #4164 from rxu/ticket/14356-fix
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description

* rxu/ticket/14356-fix:
  [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
2016-02-05 20:36:47 +01:00
rxu
408ba75321 [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
PHPBB3-14356
2016-02-06 00:37:00 +07:00
Marc Alexander
3a4dae369d Merge branch '3.1.x' 2016-01-27 14:31:29 +01:00
Marc Alexander
3c4f150859 Merge pull request #4029 from RMcGirr83/ticket_14289
[ticket/14289] Add events to navbar header
2016-01-27 14:29:14 +01:00
Richard McGirr
3af3c391a7 [ticket/14289] Fix location in events.md file
PHPBB3-14289
2016-01-19 06:29:09 -05:00
Richard McGirr
9b51fe2dd5 [ticket/14289] Move append before prepend in events doc
PHPBB3-14289
2016-01-16 09:21:07 -05:00
Richard McGirr
469b975f94 [ticket/14289] Change to 3.1.8-RC1 and rename event
PHPBB3-14289
2016-01-10 07:17:43 -05:00
Marc Alexander
d3ca327f2c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2016-01-07 16:28:44 +01:00
rxu
33db45edac [ticket/14356] Add template events to viewtopic around back2top link
PHPBB3-14356
2015-12-17 23:18:37 +07:00
Marc Alexander
780e472458 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-11-15 19:56:30 +01:00
Marc Alexander
e3f1cca911 Merge pull request #3888 from Senky/ticket/14146
[ticket/14146] Add viewtopic_body_post_subject_before event
2015-11-15 19:48:50 +01:00
Richard McGirr
7c736d527d [ticket/14289] Add events to navbar header
PHPBB3-14289
2015-11-13 05:50:10 -05:00
Marc Alexander
f7a25ad8c3 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
2015-11-13 09:36:04 +01:00
rxu
19c84dabe1 [ticket/14066] Change the events listing order in events.md.
PHPBB3-14066
2015-11-12 20:53:36 +07:00
rxu
9ef06d67e6 [ticket/14066] Add template events to search_body.html
PHPBB3-14066
2015-11-12 20:53:35 +07:00
Marc Alexander
fc1008f6a3 Merge branch '3.1.x' 2015-11-10 17:40:41 +01:00
Marc Alexander
1c1fe43e16 Merge pull request #3930 from rxu/ticket/14201
[ticket/14201] Add multiple ACP template events
2015-11-10 17:40:04 +01:00
Jakub Senko
d507bce98a [ticket/14146] Add viewtopic_body_post_subject_before event
PHPBB3-14146
2015-10-12 20:05:48 +02:00
rxu
1260f92813 [ticket/14201] Add events.md descriptions, fix accidentally swapped events
PHPBB3-14201
2015-10-12 21:31:09 +07:00
Tristan Darricau
b7fe324ed7 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:05:07 +02:00
Tristan Darricau
e87209742b Merge pull request #3887 from Senky/ticket/14144
[ticket/14144] Add quickreply_editor_subject_before event

* Senky/ticket/14144:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:03:17 +02:00
Tristan Darricau
93b88393f6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14187] Add acp_styles_list_before event
2015-10-12 11:23:10 +02:00
Tristan Darricau
8c3aa1458c Merge pull request #3921 from Senky/ticket/14187
[ticket/14187] Add acp_styles_list_before event

* Senky/ticket/14187:
  [ticket/14187] Add acp_styles_list_before event
2015-10-12 11:23:10 +02:00
Jakub Senko
fcf6c20291 [ticket/14144] Add quickreply_editor_subject_before event
PHPBB3-14144
2015-10-12 09:40:08 +02:00
Marc Alexander
a0ba6b7dc6 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-10-08 14:44:58 +02:00
Marc Alexander
c05a27396d Merge pull request #3820 from rxu/ticket/14080
[ticket/14080] Add template events around the topic row in viewforum_body.html
2015-10-08 14:43:12 +02:00
Jakub Senko
65997eb577 [ticket/14187] Add acp_styles_list_before event
PHPBB3-14187
2015-09-23 11:03:42 +02:00
Marc Alexander
baf95d3ca2 [ticket/14089] Remove subsilver2 file from events.md
PHPBB3-14089
2015-09-12 14:33:23 +02:00
Marc Alexander
087a42a887 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-09-12 13:24:29 +02:00
Marc Alexander
c166adf3c7 Merge pull request #3767 from Zoddo/ticket/14020
[ticket/14089] Add posting_topic_title_after template event

Conflicts:
	phpBB/docs/events.md
2015-09-12 13:23:47 +02:00
Tristan Darricau
28da758163 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
2015-09-02 12:04:49 +02:00
Tristan Darricau
58af8606c1 Merge pull request #3853 from marc1706/ticket/14075
[ticket/14075] Add template event after poll preview panel

* marc1706/ticket/14075:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
2015-09-02 12:03:58 +02:00
Tristan Darricau
058c3116ed Merge branch '3.1.x'
* 3.1.x:
  [ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 12:00:48 +02:00
Marc Alexander
5a51acd643 [ticket/14075] Update version to 3.1.7-RC1
PHPBB3-14075
2015-08-25 15:22:09 +02:00
Kailey Truscott
d08c5edcca [ticket/14126] Add viewtopic_topic_title_after template event
Add content directly after the topic title link on the View topic screen
(outside of the h2 HTML tag).

PHPBB3-14126
2015-08-24 17:53:09 -04:00
Zoddo
0caaf86158 [ticket/14089] Add posting_topic_title_after template event
Allows to add some information after the topic title in the posting form

PHPBB3-14089
2015-08-23 14:12:44 +02:00
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
f153342fb3 [ticket/14075] Add template event after poll preview panel
PHPBB3-14075
2015-08-22 08:57:26 +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