Commit graph

25179 commits

Author SHA1 Message Date
Derek Held
9c34594bc3 [ticket/14595] Added smtp_port where places where smtp_host exists.
PHPBB3-14595
2016-05-14 09:19:26 -07:00
Derek Held
bf37cdf878 [ticket/14595] Added SMTP port to getConfigTreeBuilder
PHPBB3-14595
2016-05-14 07:57:55 -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
Marc Alexander
b70b9714dd Merge branch '3.2.x' 2016-05-12 19:18:31 +02:00
Marc Alexander
961ffee684 Merge branch '3.1.x' into 3.2.x 2016-05-12 19:16:03 +02:00
Richard McGirr
03348087d8 [ticket/14610] Implement lavigor method
PHPBB3-14610
2016-05-09 17:28:55 -04:00
Richard McGirr
f57f09f814 [ticket/14610] Remove whitespace
PHPBB3-14610
2016-05-08 09:24:11 -04:00
Richard McGirr
3572f4c92e [ticket/14610] Don't log an error if the Q&A captcha has been solved
https://tracker.phpbb.com/browse/PHPBB3-14610

PHPBB3-14610
2016-05-08 08:50:06 -04:00
Richard McGirr
c7bbcd7b84 [ticket/14630] Add event to modify pm message
https://tracker.phpbb.com/browse/PHPBB3-14630

PHPBB3-14630
2016-05-06 06:31:35 -04:00
Tristan Darricau
1629e6aaf3
[ticket/14628] Supports translatable error messages in the CLI installer
PHPBB3-14628
2016-05-05 17:05:17 +02:00
Richard McGirr
c0f3463819 [ticket/14624] Remove whitespace
PHPBB3-14624
2016-05-05 06:42:28 -04:00
Richard McGirr
c3b30144e3 [ticket/14624] Fix typo and phpBB version
PHPBB3-14624
2016-05-05 06:10:56 -04:00
Richard McGirr
aa3c5286cd [ticket/14624] Move event so it actually works
PHPBB3-14624
2016-05-05 06:09:11 -04:00
Richard McGirr
8e1102b1da [ticket/14624] Add event to ucp_profile in signature section
PHPBB3-14624
2016-05-05 05:26:19 -04: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
Tristan Darricau
ef226138c8
Merge pull request #4310 from Crizz0/ticket/14619
[ticket/14619] Updates "docs" from 3.1.x/ascraeus to 3.2.x/rhea

* Crizz0/ticket/14619:
  [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
2016-05-02 21:18:47 +02:00
Tristan Darricau
7c8f383bf2
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14607] Add missing auto_increment to report_id
2016-05-02 21:14:35 +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
Marc Alexander
6eda942a7f [ticket/14607] Add missing auto_increment to report_id
PHPBB3-14607
2016-05-01 17:29:10 +02:00
Tristan Darricau
21bd3b7c0a
Merge branch '3.2.x'
* 3.2.x:
  [ticket/13969] Remove obsolute language files
2016-04-29 20:16:48 +02:00
Tristan Darricau
c941041963
Merge pull request #4303 from paul999/ticket/13969
[ticket/13969] Remove obsolute language files

* paul999/ticket/13969:
  [ticket/13969] Remove obsolute language files
2016-04-29 20:15:40 +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
Paul Sohier
39c4590f01
[ticket/13969] Remove obsolute language files
These help_*.php files have been moved to help/

PHPBB3-13969
2016-04-28 21:33:36 +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
Marc Alexander
682c44cee4 Merge branch '3.2.x' 2016-04-23 23:04:13 +02:00
Marc Alexander
ead261e6db Merge pull request #4286 from VSEphpbb/ticket/14569
[ticket/14569] Extract CLI progress bar creation to a method
2016-04-23 23:04:05 +02:00
cyberalien
877188c114 [ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
PHPBB3-14612
2016-04-23 22:46:52 +03:00
3Di
269e253524 [ticket/14596] Deny installation of Ascraeus under PHP 7
PHPBB3-14596
2016-04-23 07:11:34 +02:00
Tristan Darricau
23bdb2eede
[ticket/security-196] Escapes the exception messages before displaying them
SECURITY-196
2016-04-19 12:03:32 +02:00
Joas Schilling
4b51590520 Merge branch '3.2.x' 2016-04-16 12:51:06 +02:00
Joas Schilling
29bb1ab72d Merge branch '3.1.x' into 3.2.x 2016-04-16 12:50:31 +02:00
Joas Schilling
4cdec74e94 Merge branch 'prep-release-3.1.9' into 3.1.x 2016-04-16 12:48:56 +02:00
Joas Schilling
1b01667c7b [prep-release-3.1.9] Add migration for 3.1.9 2016-04-16 12:16:23 +02:00
Joas Schilling
fdcedb262f [prep-release-3.1.9] Update version for 3.1.9 final 2016-04-16 12:13:36 +02:00
Tristan Darricau
36c87313a4
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14589] Fix @var usage
2016-04-13 19:14:18 +02:00
Máté Bartus
4614cc972f [ticket/14589] Fix @var usage
PHPBB3-14589
2016-04-13 19:02:43 +02:00
Máté Bartus
caf63ba86b [ticket/14601] Fix composer.lock
PHPBB3-14601
2016-04-13 10:52:12 +02:00
Máté Bartus
13a3e99848 Merge branch '3.2.x'
* 3.2.x:
  [ticket/13616] Fix CS + constant in the core extension
  [ticket/13616] Fix UI tests
  [ticket/13616] Cleanup globals after installing the board in func tests
  [ticket/13616] Updates direct call to twig environment constructor
  [ticket/13616] Uses a php 5.4 compatible version
  [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

Conflicts:
	phpBB/composer.lock
2016-04-13 10:14:47 +02:00
Máté Bartus
4c257d47a6 Merge pull request #4236 from Nicofuma/ticket/13616
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
2016-04-13 10:11:24 +02:00
Matt Friedman
d713ce94ff [ticket/14569] Extract CLI progress bar creation to a method
PHPBB3-14569
2016-04-12 10:56:23 -07:00
Tristan Darricau
94853ba2dd
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14589] Fix grammatical errors in language strings
  [ticket/14589] Add error messages for failable installer requirements
2016-04-12 11:27:03 +02:00
Tristan Darricau
560bee1be4
Merge pull request #4284 from CHItA/ticket/14589
[ticket/14589] Add error messages for failable installer requirements

* CHItA/ticket/14589:
  [ticket/14589] Fix grammatical errors in language strings
  [ticket/14589] Add error messages for failable installer requirements
2016-04-12 11:27:03 +02:00
Richard McGirr
c938077172 [ticket/13716] Fix verboseness
PHPBB3-13716
2016-04-12 05:17:02 -04:00
Marc Alexander
ffcde0c95a Merge branch '3.2.x' 2016-04-11 21:27:20 +02:00
Máté Bartus
972255247b [ticket/14589] Fix grammatical errors in language strings
PHPBB3-14589
2016-04-11 19:42:40 +02:00
Máté Bartus
f41c7bd2b1 [ticket/14590] Prevent refresh requests after the last tasks in modules
PHPBB3-14590
2016-04-11 18:18:09 +02:00