mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
29,604 Commits 10 Branches 193 Tags
7973984821ff697d2c86b264066a12deef4690ee
Commit Graph

1977 Commits

Author SHA1 Message Date
Marc Alexander
019e85d064 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_move.html
 2016-07-16 21:25:17 +02:00
Marc Alexander
b54aa81cdd Merge pull request #4337 from Senky/ticket/14506 
Add mcp_move_before template event
 2016-07-16 21:24:33 +02:00
Crizzo
c9cfde7837 [ticket/14620] Adds link to Translations forum 
PHPBB3-14620
 2016-07-14 20:23:46 +02:00
Marc Alexander
113738fce9 Merge branch '3.2.x' 2016-07-07 19:20:42 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-07 19:19:40 +02:00
Marc Alexander
55b854906d Merge pull request #4342 from Senky/ticket/14654 
[ticket/14654] Change Imagemagick to ImageMagick
 2016-07-07 19:15:33 +02:00
Tristan Darricau
f9d251943b Merge branch '3.2.x' 
* 3.2.x:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:56:21 +02:00
Tristan Darricau
dbf02b4514 Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x 
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:54:41 +02:00
David King
7f1c4cd205 [ticket/14695] Updated version number in events.md 
PHPBB3-14695
 2016-06-25 22:58:57 +01:00
David King
e4336de68d [ticket/14695] Add posting_editor_subject_prepend/append template events 
PHPBB3-14695
 2016-06-25 21:16:54 +01:00
Crizzo
63b902c2f9 [ticket/14620] Changes specific update-support to general: <=beta to >=RC1 
PHPBB3-14620
 2016-06-21 20:18:15 +02:00
Marc Alexander
155d24107a Merge branch '3.2.x' 
Conflicts:
	phpBB/composer.lock
 2016-06-20 21:24:46 +02:00
Marc Alexander
597e7163c0 Merge pull request #4233 from VSEphpbb/ticket/14547 
[ticket/14547] Add Vagrant support to phpBB
 2016-06-20 21:22:34 +02:00
Matt Friedman
d5e342db3a [ticket/14547] Fix Docs and increase PHP memory limit 
PHPBB3-14547
 2016-06-19 09:40:51 -07:00
Marc Alexander
a6863249a1 Merge branch '3.2.x' 2016-06-19 18:07:55 +02:00
Marc Alexander
450e5b36b8 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2016-06-19 18:07:29 +02:00
Tristan Darricau
e8c6a3aa0a [prep-release-3.2.0-RC1] Update changelog 2016-06-19 18:01:48 +02:00
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md 
PHPBB3-14672
 2016-06-13 06:26:55 -04:00
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
Tristan Darricau
ddcd458167 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595
  [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595
 2016-05-15 10:20:38 +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
Tristan Darricau
c43fabf502 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
 2016-05-02 21:19:58 +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
Tristan Darricau
6949ee162d erge branch 'prep-release-3.2.0-b2' 
* 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:51:23 +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
4a1d1dd6a5 Merge branch '3.2.x' 2016-04-09 19:53:57 +02: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
Tristan Darricau
93f932b80f [ticket/14495] Revert changes in master 
PHPBB3-14495
 2016-04-02 12:12:24 +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