1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

2924 Commits

Author SHA1 Message Date
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
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
Marc Alexander
cddb884be6 Merge pull request #4354 from Stanzilla/smtp_explain
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
2016-07-06 19:23:54 +02:00
Crizzo
53b9216c78 [ticket/14704] Removes unused function and language files in base.php
PHPBB3-14704
2016-07-03 14:22:08 +02:00
Marc Alexander
219977ccf3 Merge branch '3.1.x' into 3.2.x 2016-06-19 22:07:42 +02:00
rxu
773a701d62 [ticket/14683] Fix typos in email templates.
PHPBB3-14683
2016-06-20 00:15:37 +07:00
Marc Alexander
9639f6ad63 Merge pull request #4326 from Crizz0/ticket/14640
[ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2
2016-06-19 18:56:04 +02:00
Marc Alexander
a460aec68c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/language/en/install.php
2016-06-19 18:25:16 +02:00
Benjamin Staneck
3708770eb9 [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
2016-06-17 08:46:02 +02:00
Jakub Senko
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick
PHPBB3-14654
2016-06-11 21:32:16 +02:00
Jakub Senko
33d1d19f97 [ticket/14586] Add OAuth1 support
PHPBB3-14586
2016-05-30 13:02:49 +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
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
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
3Di
269e253524 [ticket/14596] Deny installation of Ascraeus under PHP 7
PHPBB3-14596
2016-04-23 07:11:34 +02:00
Richard McGirr
c938077172 [ticket/13716] Fix verboseness
PHPBB3-13716
2016-04-12 05:17:02 -04: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
9163cc2864 [ticket/14589] Add error messages for failable installer requirements
PHPBB3-14589
2016-04-10 10:30:15 +02:00
Richard McGirr
e80f79fc9a [ticket/13716] Fix grammar and href title tags
PHPBB3-13716
2016-04-06 06:18:26 -04:00
Richard McGirr
04f320cb01 [ticket/13716] Check phpBB version against config version
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
2016-04-05 07:09:12 -04:00
Tristan Darricau
f929db6190 Merge pull request #4248 from VSEphpbb/ticket/14561
[ticket/14561] Add more user commands

* VSEphpbb/ticket/14561:
  [ticket/14561] Remove requires for functions in tests
  [ticket/14561] Small change to progress bar output
  [ticket/14561] Fix function docblock in activate command
  [ticket/14561] Add a progress bar to reclean command
  [ticket/14561] Use the user loader where appropriate
  [ticket/14561] Add extra help explaining reclean command
  [ticket/14561] Import classes with use statements
  [ticket/14561] Remove unused use statements
  [ticket/14561] Refactor tests
  [ticket/14561] Reclean usernames command
  [ticket/14561] User activate command
  [ticket/14561] User delete command
2016-04-03 16:32:25 +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
Matt Friedman
afb69d7cd2 [ticket/14561] Add a progress bar to reclean command
PHPBB3-14561
2016-03-31 15:07:59 -07:00
Matt Friedman
ed0f151d86 [ticket/14561] Add extra help explaining reclean command
PHPBB3-14561
2016-03-31 15:07:59 -07:00
Matt Friedman
16f9b4630c [ticket/14561] Reclean usernames command
PHPBB3-14561
2016-03-31 15:07:43 -07:00
Matt Friedman
91f1116e04 [ticket/14561] User activate command
PHPBB3-14561
2016-03-31 15:07:43 -07:00
Matt Friedman
8a9429efa4 [ticket/14561] User delete command
PHPBB3-14561
2016-03-31 15:07:43 -07:00
Richard McGirr
4a14eb8488 [ticket/14329] Add missing ACP language vars
PHPBB3-14329
2016-03-27 06:54:50 -04:00
Marc Alexander
465eabbc65 Merge branch '3.1.x' into 3.2.x 2016-03-27 12:34:49 +02:00
Marc Alexander
5e96738ca1 Merge pull request #4230 from Senky/ticket/13028
[ticket/13028] Rename unanswered search label
2016-03-27 12:33:48 +02:00
Tristan Darricau
4db229ff6c Merge pull request #4199 from VSEphpbb/ticket/12684
[ticket/12684] Add console command user:add

* VSEphpbb/ticket/12684: (26 commits)
  [ticket/12684] Use a switch statement for readability
  [ticket/12684] Refactor a test
  [ticket/12684] Use interactive method correctly
  [ticket/12684] Extract interactivity to a method
  [ticket/12684] Update option help
  [ticket/12684] Add extended help for the user:add command
  [ticket/12684] Add shorthand alternates to the options
  [ticket/12684] Remove whitespace
  [ticket/12684] Add an error on user creation failure
  [ticket/12684] Remove unnecessary null arguments
  [ticket/12684] Additional clean up
  [ticket/12684] Allowed to use $this in enclosure
  [ticket/12684] Move all lang keys to cli
  [ticket/12684] Fix a few mistakes and clean it up
  [ticket/12684] Some code clean up
  [ticket/12684] Another little fix
  [ticket/12684] Fix tests
  [ticket/12684] Update to use non-deprecated methods
  [ticket/12684] Add send email option
  [ticket/12684] Add input validation
  ...
2016-03-26 19:38:58 +01:00
Tristan Darricau
1f962dacaf Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13013] Explain to user explicitl what "participate more" means
2016-03-26 19:21:36 +01:00
Jakub Senko
9ef5b126ec [ticket/13013] Explain to user explicitl what "participate more" means
PHPBB3-13013
2016-03-26 19:17:41 +01:00
Tristan Darricau
e873ed6944 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
2016-03-25 11:43:05 +01:00
Jakub Senko
4dc8841e33 [ticket/13028] Rename unanswered search label
PHPBB3-13028
2016-03-18 11:54:46 +01:00
Marc Alexander
215fad420f [ticket/14241] Log fatal captcha error to error log
PHPBB3-14241
2016-03-12 10:24:07 +01:00
Marc Alexander
4c5c289f75 [ticket/14241] Prevent empty q&a as a result of improper settings
Improper setup of the q&a captcha in combination with the admin choosing a
default language that does not have any questions and answers set might
result in the user being presented empty questions and answers. This
change will try to fall back to any question in case the admin incorrectly
set the default language and has no questions & answers set. If that does
not work, the captcha will not allow passing it and suggest to contact the
board admin to resolve this issue.

PHPBB3-14241
2016-03-11 10:51:07 +01:00
Matt Friedman
00bf1ef8b8 [ticket/12684] Update option help
PHPBB3-12684
2016-03-08 10:46:34 -08:00
Matt Friedman
0f8790dd2e [ticket/12684] Add extended help for the user:add command
PHPBB3-12684
2016-03-08 00:34:27 -08:00
Marc Alexander
e5344ae135 Merge branch '3.2.x' 2016-03-05 12:12:36 +01:00
Marc Alexander
f53a27e891 Merge branch '3.1.x' into 3.2.x 2016-03-05 12:12:27 +01:00
Richard McGirr
83fd8e88d6 [ticket/14508] Adjust account inactive language
PHPBB3-14508
2016-03-03 06:55:36 -05:00
Richard McGirr
65ce507dda [ticket/14508] Change language notice on account activation
PHPBB3-14508
2016-03-02 07:05:37 -05:00
Matt Friedman
0ca4484525 [ticket/12684] Move all lang keys to cli
PHPBB3-12684
2016-02-29 21:03:32 -08:00
Marc Alexander
b324cf1907 Merge branch '3.2.x' 2016-02-29 21:45:16 +01:00
Matt Friedman
f32b4c0547 [ticket/12684] Add send email option
PHPBB3-12684
2016-02-29 11:42:23 -08:00
Matt Friedman
6fe084a2fd [ticket/12684] Updates for 3.2 API
PHPBB3-12684
2016-02-29 11:41:07 -08:00
Tristan Darricau
52dffef03c [ticket/14499] Fix wording and comments
PHPBB3-14499
2016-02-29 20:27:12 +01:00
Matt Friedman
d17a8ab523 [ticket/12684] Fix merge errors
PHPBB3-12684
2016-02-29 08:28:37 -08:00