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

2004 Commits

Author SHA1 Message Date
Tristan Darricau
7381e99517 [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2 2015-12-19 17:17:01 +01:00
rxu
33db45edac [ticket/14356] Add template events to viewtopic around back2top link
PHPBB3-14356
2015-12-17 23:18:37 +07:00
Joas Schilling
b2a26ab5f4 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-12-12 15:24:29 +01:00
Joas Schilling
099a1b5f75 [prep-release-3.1.7] Add changelog for 3.1.7-RC1 2015-12-12 01:37:56 +01:00
Tristan Darricau
4bcec475fe Merge branch '3.1.x'
* 3.1.x:
  [ticket/14271] Properly use try_files in nginx sample config
  [ticket/14271] Improve try_files and use split path info
  [ticket/14271] Update sample config
2015-12-08 19:48:12 +01:00
Tristan Darricau
901785bc5e Merge pull request #4018 from marc1706/ticket/14271
[ticket/14271] Update sample config

* marc1706/ticket/14271:
  [ticket/14271] Properly use try_files in nginx sample config
  [ticket/14271] Improve try_files and use split path info
  [ticket/14271] Update sample config
2015-12-08 19:48:02 +01:00
Marc Alexander
61255a8982 [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions"
PHPBB3-14339
2015-12-07 21:35:23 +01:00
Marc Alexander
1dba763e09 Merge branch 'ticket/14339' into ticket/14339-master
Conflicts:
	phpBB/composer.json
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
2015-12-07 21:33:59 +01:00
Marc Alexander
e8247faacc [ticket/14339] Properly state PHP version support
PHPBB3-14339
2015-12-05 13:54:39 +01:00
Tristan Darricau
3698e9b8e0 Merge branch 'prep-release-3.2.0-a1'
* prep-release-3.2.0-a1:
  [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
  [prep-release-3.2.0-a1] Add migration for 3.2.0-a1
  [prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-23 23:17:01 +01: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
Marc Alexander
966c34d0ad [ticket/14271] Properly use try_files in nginx sample config
PHPBB3-14271
2015-11-10 08:32:51 +01:00
Tristan Darricau
67f43b1a06 [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1 2015-11-09 20:24:46 +01:00
Marc Alexander
b27be0b857 [ticket/14271] Improve try_files and use split path info
PHPBB3-14271
2015-11-09 09:26:05 +01:00
Marc Alexander
27e95864a8 [ticket/14271] Update sample config
PHPBB3-14271
2015-11-05 16:55:19 +01:00
Andreas Fischer
a0f1365953 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
2015-10-14 08:33:36 +02:00
Cesar G
14966a2962 [ticket/14114] Update 3.0.x version references in INSTALL.html.
PHPBB3-14114
2015-10-13 21:05:04 -07: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
17dbe4c17a Merge branch '3.1.x'
* 3.1.x:
  [ticket/14164] Add instructions to use the CLI for database updates
2015-10-12 11:45:37 +02:00
Tristan Darricau
bc34217c14 Merge pull request #3906 from Zoddo/ticket/14164
[ticket/14164] Add instructions to use the CLI for database updates

* Zoddo/ticket/14164:
  [ticket/14164] Add instructions to use the CLI for database updates
2015-10-12 11:45:36 +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
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