mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 11:11:23 +02:00
Code Issues Releases Wiki Activity
28,290 Commits 18 Branches 192 Tags
Commit Graph

28290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt 
PHPBB3-14624
 2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-05-15 23:57:16 +02:00
Marc Alexander
e7262e2d39 Merge pull request #4314 from rmcgirr83/ticket_14624 
[ticket/14624] Add event to ucp_profile in signature section
 2016-05-15 23:52:37 +02:00
Tristan Darricau
40a00bd4e5
Merge pull request #4319 from derekheld/ticket/14595 
[ticket/14595] Installer will now ask for a SMTP port as part of email setup.

* derekheld/ticket/14595:
  [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:17:01 +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
Derek Held
bf37cdf878 [ticket/14595] Added SMTP port to getConfigTreeBuilder 
PHPBB3-14595
 2016-05-14 07:57:55 -07:00
Marc Alexander
961ffee684 Merge branch '3.1.x' into 3.2.x 2016-05-12 19:16:03 +02:00
Marc Alexander
734972cc3d Merge pull request #4317 from rmcgirr83/ticket_14610 
[ticket/14610] Don't log an error if the Q&A captcha has been solved
 2016-05-12 19:15:58 +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
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
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
43c16ca4c3
Merge pull request #4308 from marc1706/ticket/14607 
[ticket/14607] Add missing auto_increment to report_id

* marc1706/ticket/14607:
  [ticket/14607] Add missing auto_increment to report_id
 2016-05-02 21:14:18 +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
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
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
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
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 release-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
1b0b78dabc
Merge pull request #4289 from CHItA/ticket/14589 
[ticket/14589] Fix @var usage

* CHItA/ticket/14589:
  [ticket/14589] Fix @var usage
 2016-04-13 19:13:25 +02:00
Máté Bartus
4614cc972f [ticket/14589] Fix @var usage 
PHPBB3-14589
 2016-04-13 19:02:43 +02:00
Máté Bartus
68645d38ef Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14598] Support vars docblock in sniffer
 2016-04-13 10:20:07 +02:00
Máté Bartus
ed378a2ec3 Merge pull request #4287 from Nicofuma/ticket/14598 
[ticket/14598] Support vars docblock in sniffer
 2016-04-13 10:18:34 +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
Tristan Darricau
96bdcedacd
[ticket/14598] Support vars docblock in sniffer 
PHPBB3-14598
 2016-04-12 22:26:57 +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
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
Marc Alexander
336f5b49a7 Merge pull request #4285 from CHItA/ticket/14590 
[ticket/14590] Prevent refresh requests after the last tasks in modules
 2016-04-11 21:27:12 +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
Máté Bartus
9163cc2864 [ticket/14589] Add error messages for failable installer requirements 
PHPBB3-14589
 2016-04-10 10:30:15 +02:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
58dfff38fa [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
Joas Schilling
c4ef83e4d2 Merge branch 'prep-release-3.1.9' into 3.1.x 2016-04-09 19:48:35 +02:00
Joas Schilling
e7043dc044 [prep-release-3.1.9] Add changelog for 3.1.9-RC1 release-3.1.9-RC1 2016-04-09 08:19:34 +02:00
Joas Schilling
5ee6c216e5 [prep-release-3.1.9] Add migration for 3.1.9-RC1 2016-04-09 08:13:31 +02:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
Joas Schilling
45a3e4d04f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14587] Remove sectionGroup from web.config
 2016-04-08 16:35:00 +02:00
Joas Schilling
2ae17d6caf
Merge pull request #4283 from DavidIQ/ticket/14587 
[ticket/14587] Remove sectionGroup from web.config

* DavidIQ/ticket/14587:
  [ticket/14587] Remove sectionGroup from web.config
 2016-04-08 16:34:43 +02:00
David Colón
ebbedf29e0 [ticket/14587] Remove sectionGroup from web.config 
Causes errors on some IIS installations.

PHPBB3-14587
 2016-04-07 17:20:34 -04:00
Marc Alexander
4e8981ee37 Merge branch '3.1.x' into 3.2.x 2016-04-07 21:59:36 +02:00
Marc Alexander
901f36e982 Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x 
[ticket/13683] Respects force_server_vars settings when generating URLs
 2016-04-07 21:59:36 +02:00