mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-01 21:27:55 +02:00
Code Issues Releases Wiki Activity
27,812 Commits 18 Branches 192 Tags
Commit Graph

1818 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
Tristan Darricau
3e0aa1b3a4 [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1 2016-02-05 15:56:28 +01: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
Joas Schilling
7f7b09fdeb Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
 2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-01-09 18:42:07 +01:00
Joas Schilling
85e98a9d70 [prep-release-3.1.7] Add changelog for 3.1.7-pl1 2016-01-09 09:46:32 +01: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
Marc Alexander
a7058d968f Merge pull request #4079 from rxu/ticket/14356 
[ticket/14356] Add template events to viewtopic around back2top link
 2016-01-07 16:26:16 +01:00
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