mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 22:58:10 +02:00
Code Issues Releases Wiki Activity
30,334 Commits 18 Branches 192 Tags
Commit Graph

2004 Commits

Author SHA1 Message Date
Jakub Senko
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick 
PHPBB3-14654
 2016-06-11 21:32:16 +02:00
Crizzo
25ae8876b6 [ticket/14620] Adds section update from 3.0/3.1 to 3.2 
PHPBB3-14620
 2016-06-08 22:06:01 +02:00
Crizzo
797565dfa7 [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date 
PHPBB3-14620
 2016-06-08 21:45:52 +02:00
Crizzo
800b7be873 [ticket/14620] Updates section 4.i. Full package to 3.2.0 
PHPBB3-14620
 2016-06-08 20:29:17 +02:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event 
PHPBB3-14506
 2016-05-29 11:41:54 +02:00
Crizzo
85fdff8230 [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html 
PHPBB3-14620
 2016-05-24 22:44:07 +02:00
Derek Held
9c34594bc3 [ticket/14595] Added smtp_port where places where smtp_host exists. 
PHPBB3-14595
 2016-05-14 09:19:26 -07:00
Crizzo
96973a7cec [ticket/14620] Changes 3.1 to 3.2 links in FAQ.html 
PHPBB3-14620
 2016-05-14 15:26:05 +02:00
Crizzo
42053efb51 [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues 
PHPBB3-14620
 2016-05-14 15:13:14 +02:00
Crizzo
2ca49e02b4 [ticket/14620] Start to change install.html to 3.2.0 usage. 
PHPBB3-14620
 2016-05-02 22:41:44 +02:00
Crizzo
e9b7cb1324 [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea 
PHPBB3-14619
 2016-05-01 22:31:39 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Matt Friedman
3cd0c53118 [ticket/14547] Use package compatible with phpBB requirements 
PHPBB3-14547
 2016-04-28 08:36:49 -07:00
Matt Friedman
6196e4ae4d [ticket/14547] Add Vagrant to phpBB 
PHPBB3-14547
 2016-04-28 08:36:49 -07:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
e7043dc044 [prep-release-3.1.9] Add changelog for 3.1.9-RC1 2016-04-09 08:19:34 +02:00
Marc Alexander
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x 
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
 2016-04-02 10:06:59 +02:00
Tristan Darricau
3eb6f7176a Merge pull request #4193 from marc1706/ticket/14497 
[ticket/14497] Support second app.php script in install folder

* marc1706/ticket/14497:
  [ticket/14497] Do not check for doctype on index and use correct return
  [ticket/14497] Add test for visiting installer
  [ticket/14497] Use nginx sample config in travis tests
  [ticket/14497] Support second app.php script in install folder
 2016-03-25 11:46:15 +01:00
Tristan Darricau
f6cc30cbfe Merge pull request #4245 from JoshyPHP/ticket/14381 
[ticket/14381] Set the mode in message parser to "reparse"

* JoshyPHP/ticket/14381:
  [ticket/14381] Set the mode in message parser to "reparse"
  [ticket/14495] Updates the version to 3.3.0-a1-dev
 2016-03-25 11:03:27 +01:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x 
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag 
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
 2016-03-24 16:07:07 +01:00
Tristan Darricau
97bf5e8a8d [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 2016-03-03 22:54:13 +01:00
Marc Alexander
b324cf1907 Merge branch '3.2.x' 2016-02-29 21:45:16 +01:00
Marc Alexander
b80cb8e796 Merge pull request #4194 from Nicofuma/ticket/14499 
[ticket/14499] Add command to update the board from CLI
 2016-02-29 21:45:11 +01:00
Tristan Darricau
52dffef03c [ticket/14499] Fix wording and comments 
PHPBB3-14499
 2016-02-29 20:27:12 +01:00
Tristan Darricau
8ec1a60156 [ticket/14499] Add missing config settings 
PHPBB3-14499
 2016-02-28 20:49:18 +01:00
Marc Alexander
47f70a4cfd Merge branch '3.2.x' 2016-02-27 10:55:17 +01:00
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
 2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316 
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
 2016-02-27 10:52:09 +01:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view 
PHPBB3-14316
 2016-02-27 11:53:19 +07:00
Tristan Darricau
5bdfc6167b [ticket/14499] Add command to update the board from CLI 
PHPBB3-14499
 2016-02-25 22:39:42 +01:00
Marc Alexander
37b2791837 [ticket/14497] Support second app.php script in install folder 
PHPBB3-14497
 2016-02-25 15:34:32 +01:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev 
PHPBB3-14495
 2016-02-24 22:25:41 +01:00
Joas Schilling
8663edce76 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2016-02-13 18:08:01 +01:00
Joas Schilling
cafd165bd0 [prep-release-3.1.8] Update changelog 2016-02-13 16:45:51 +01:00
Joas Schilling
e63493115a [prep-release-3.1.8] Add changelog for 3.1.8-RC1 2016-02-13 14:57:53 +01:00
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