1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

28418 Commits

Author SHA1 Message Date
Marc Alexander
e578450077 Merge pull request #4334 from rmcgirr83/ticket_14649
[ticket/14649] Add preview variable back to ucp_profile for event
2016-05-26 15:47:20 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event
PHPBB3-14649
2016-05-26 06:26:14 -04:00
Mark Shaw
548357e14c [ticket/14648] Remove whitespace at the end of a line
PHPBB3-14648
2016-05-25 18:28:07 -04:00
Mark Shaw
2576993564 [ticket/14648] Fix bug where default notifications stop working if another setting is set.
When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work.

PHPBB3-14648
2016-05-25 14:30:04 -04:00
Marc Alexander
3e88ea9c06 Merge pull request #4325 from DavidIQ/ticket/14591
[ticket/14591] Use the correct delimiter for MSSQL
2016-05-24 21:47:31 +02:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
PHPBB3-13978
2016-05-24 18:07:11 +02:00
Jakub Senko
7e6371ea8e [ticket/11446] Use sql_in_set properly in phpbb_notification_manager
PHPBB3-11446
2016-05-23 18:13:17 +02:00
Máté Bartus
283a039647 Merge pull request #4327 from paul999/ticket/14645
[ticket/14645] Language pack not reconised when using a symlink
2016-05-22 21:43:34 +02:00
Jakub Senko
c3fd07a5f0 [ticket/13865] Add id_ary, show_results to core.search_modify_param_before
PHPBB3-13865
2016-05-22 14:26:01 +02:00
Paul Sohier
1a68504174
[ticket/14645] Language pack not reconised when using a symlink
Symfony finder does not follow symlinks by default.
With this change it does, so a user is able to have the language pack outside
the phpBB directory, and linked with a symlink into phpBB/language/

PHPBB3-14645
2016-05-21 19:50:12 +02:00
Crizzo
3f1580263c [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docu
PHPBB3-14640
2016-05-18 22:18:15 +02:00
David Colón
3bafbc81ef [ticket/14591] Use the correct delimiter for MSSQL
PHPBB3-14591
2016-05-18 14:53:52 -04:00
Richard McGirr
0d7625c534 [ticket/13716] Remove extra br tag and correct missing closing a html tag
PHPBB3-13716
2016-05-16 18:01:55 -04:00
Richard McGirr
06507f9fa6 [ticket/14630] Change event name and fix capitalization
PHPBB3-14630
2016-05-16 17:57:26 -04:00
Marc Alexander
90cefcf0f4 Merge pull request #4315 from Nicofuma/ticket/14628
[ticket/14628] Supports translatable error messages in the CLI installer
2016-05-16 14:05:24 +02:00
Máté Bartus
7a28b7514a Merge pull request #4320 from marc1706/ticket/14624
[ticket/14624] Remove no longer existing event argumemt
2016-05-16 12:06:38 +02:00
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
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
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
Matt Friedman
40aac1cd57 [ticket/14547] Ignore backup config.php files
PHPBB3-14547
2016-04-28 08:36:49 -07: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
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
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