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

1871 Commits

Author SHA1 Message Date
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
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
2015-10-04 16:19:48 +02:00
Lady_G
cb71a7b8d2 [ticket/14164] Add instructions to use the CLI for database updates
PHPBB3-14164
2015-09-27 12:40:57 +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
Joas Schilling
05851e2b4b Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-08-23 18:27:30 +02:00
Joas Schilling
5be06ec66a [prep-release-3.1.6] Add changelog for 3.1.6-RC1 2015-08-23 17:20:22 +02: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
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
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