1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00

2945 Commits

Author SHA1 Message Date
Tristan Darricau
57b122cc16
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
2017-04-19 17:08:28 +02:00
Tristan Darricau
7cc2f8aa43
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
2017-04-19 17:08:16 +02:00
Tristan Darricau
d550f925ab
Merge pull request #4781 from nomind60s/ticket/15151
[ticket/15151] ACP Cookie settings add explanatory text

* github.com:phpbb/phpbb:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
2017-04-19 17:05:47 +02:00
nomind60s
d0486964ce [ticket/15151] Use redirected link for consistency
Other phpbb.com links used in the core use a redirect rather than a direct link
so change to make the Cookie settings link a redirect also.

PHPBB3-15151
2017-04-19 06:34:16 -06:00
Tristan Darricau
451a7ce43c
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
2017-04-18 23:15:10 +02:00
Tristan Darricau
4cbf619fd5
Merge pull request #4705 from nomind60s/ticket/15097
[ticket/15097] Add PHP version to Board statistics

* github.com:phpbb/phpbb:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
2017-04-18 23:14:56 +02:00
nomind60s
d4ecb910d8 [ticket/15151] ACP Cookie settings explanatory text
Fixed extraneous whitespace at end of line.

PHPBB3-15151
2017-03-29 14:42:02 -06:00
nomind60s
5bf3e4b3c6 [ticket/15151] ACP Cookie settings add explanatory text where it was missing
Improve the lead section to include a link to the phpBB.com Knowledge Base and
add explanation text for the Cookie domain, Cookie name and Cookie path fields.

PHPBB3-15151
2017-03-29 12:30:09 -06:00
Tristan Darricau
9b6fa7421b
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15137] Missed one language string change
  [ticket/15137] Global announcements can stick for a non-zero number of days
2017-03-21 16:29:38 +01:00
Tristan Darricau
c9aab0baef
Merge pull request #4752 from nomind60s/ticket/15137
[ticket/15137] Global Announcements shouldn't always be never ending

* github.com:phpbb/phpbb:
  [ticket/15137] Missed one language string change
  [ticket/15137] Global announcements can stick for a non-zero number of days

fixes #4752
2017-03-21 16:29:10 +01:00
nomind60s
d15b88af2a [ticket/15137] Missed one language string change
Change STICKY_ANNOUNCE_TIME_LIMIT for consistency

PHPBB3-15137
2017-03-21 06:50:25 -06:00
nomind60s
7609ba71e9 [ticket/15137] Global announcements can stick for a non-zero number of days
To be consistent with Sticky and Announcements topic types, Global
announcements can now stick for a non-zero number of days, i.e. they are
no longer never ending.

Before this change, if the topic type was Global and a non-zero number of
days where set to stick topic, the number was silently ignored and a Global
announcement was always never ending.

PHPBB3-15137
2017-03-20 23:06:34 -06:00
Tristan Darricau
e0bdec4709
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14758] Improve the ACP Parameter wording
2017-03-19 18:49:59 +01:00
Tristan Darricau
d1248ad5ce
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14758] Improve the ACP Parameter wording
2017-03-19 18:49:47 +01:00
Mukesh Kumar Kharita
dcdb0dcd23
[ticket/14758] Improve the ACP Parameter wording
PHPBB3-14758
2017-03-19 18:48:55 +01:00
Tristan Darricau
0d701f0bd1
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14928] fixing valid stability %s
2017-03-19 18:39:10 +01:00
Rishabh04-02
12a70f63b4
[ticket/14928] fixing valid stability %s
PHPBB3-14928
2017-03-19 18:38:43 +01:00
Tristan Darricau
e2701bd28b
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15123] modified return error codes
  [ticket/15123] modified language strings
  [ticket/15123] modified language string
  [ticket/15123] removed blank spaces
  [ticket/15123] add check before enable or disable extension
2017-03-19 18:17:45 +01:00
Tristan Darricau
4b6b73ea9d
Merge pull request #4736 from rubencm/ticket/15123
[ticket/15123] Check if extension was enabled/disabled before enable or disable

* rubencm/ticket/15123:
  [ticket/15123] modified return error codes
  [ticket/15123] modified language strings
  [ticket/15123] modified language string
  [ticket/15123] removed blank spaces
  [ticket/15123] add check before enable or disable extension
2017-03-19 18:17:41 +01:00
Tristan Darricau
9c49aebfe9
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14974] make cookie notice configurable via language files
2017-03-19 18:11:43 +01:00
Tristan Darricau
224330f3a5
Merge pull request #4740 from rubencm/ticket/14974
[ticket/14974] Make cookie notice configurable via language files

* rubencm/ticket/14974:
  [ticket/14974] make cookie notice configurable via language files
2017-03-19 18:11:40 +01:00
Tristan Darricau
d81afd4af1
Merge branch '3.2.x'
* 3.2.x:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:10:46 +01:00
Tristan Darricau
552da2e805
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:07:14 +01:00
Tristan Darricau
0b2369901a
Merge pull request #4745 from rxu/ticket/13558
[ticket/13558] Add smtp SSL context configuration options

* rxu/ticket/13558:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:04:53 +01:00
rxu
22b8632426 [ticket/13558] Change options prefix and add settings precautions.
PHPBB3-13558
2017-03-19 14:32:53 +07:00
Marc Alexander
6676aefa36
Merge branch '3.2.x' 2017-03-19 00:01:38 +01:00
Marc Alexander
e4d253ce76
Merge branch '3.1.x' into 3.2.x 2017-03-19 00:01:34 +01:00
rxu
ac87784a11 [ticket/13558] Add smtp SSL context configuration options
PHPBB3-13558
2017-03-17 01:21:57 +07:00
Rubén Calvo
d10a5b67a1 [ticket/14820] Add style version in ACP
PHPBB3-14820
2017-03-16 00:00:50 +01:00
Rubén Calvo
9b3609d6f6 [ticket/15123] modified language strings
PHPBB3-15123
2017-03-13 22:20:51 +01:00
Rubén Calvo
8994295f2b [ticket/15123] modified language string
PHPBB3-15123
2017-03-13 22:20:45 +01:00
Rubén Calvo
891aab0593 [ticket/15123] add check before enable or disable extension
PHPBB3-15123
2017-03-13 22:20:20 +01:00
Rubén Calvo
74f1b19dfe [ticket/14974] make cookie notice configurable via language files
PHPBB3-14974
2017-03-13 03:09:35 +01:00
Marc Alexander
37ee22a0e6
Merge branch '3.2.x' 2017-03-08 21:09:40 +01:00
Vinny
8227289ecc [ticket/14732] Remove PHP Code syntax highlighting references
PHPBB3-14732
2017-02-28 05:26:20 -03:00
nomind60s
f677376b8c [ticket/15097] New 'Installed software' lead section
Created a new lead section showing the installed software (phpBB,
PHP and Database server) and their versions. Implementation is
inspired by MediaWiki's Special:Version page.

Removed those items from Board statistics section.

PHPBB3-15097
2017-02-19 11:49:07 -07:00
nomind60s
16dbc4195a [ticket/15097] Resolve travis-ci error
Make sure indentation is using tabs not spaces per code guidelines

PHPBB3-15097
2017-02-17 16:25:30 -07:00
nomind60s
c06f4756ec [ticket/15097] Add PHP version to Board statistics
The ACP main page shows the phpBB version and the database version,
but didn't show the PHP version.

With this change the PHP version is displayed as part of the
Board statistics.

PHPBB3-15097
2017-02-17 15:30:02 -07:00
Máté Bartus
e906b2c609 Merge branch '3.2.x' 2017-01-29 14:43:15 +01:00
Marc Alexander
a03047da5b
[ticket/15044] Add module task for creating search index during install
PHPBB3-15044
2017-01-24 21:47:20 +01:00
Tristan Darricau
7f82d28f6f
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:16:23 +01:00
Tristan Darricau
7c77e33313
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:15:26 +01:00
Marc Alexander
a620ce0713
[ticket/14968] Display possible upgrade on acp index and update page
PHPBB3-14968
2017-01-22 16:37:20 +01:00
Tristan Darricau
3d61d2b370
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15011] Output meaningful errors when validating all metadata
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:16:45 +01:00
Tristan Darricau
c4ee378456
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:13:00 +01:00
Marc Alexander
cb44dbc8cb
[ticket/11076] State current and minimum required versions in old PHP notice
PHPBB3-11076
2017-01-15 15:32:55 +01:00
Tristan Darricau
51500977b2
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:29 +01:00
Tristan Darricau
4fd6b0fd88
Merge pull request #4632 from VSEphpbb/ticket/14989
[ticket/14989] Allow more admin-configurable schemes in post links

* VSEphpbb/ticket/14989:
  [ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:26 +01:00
Matt Friedman
a3accfaf46 [ticket/14989] Allow more admin-configurable schemes in post links
PHPBB3-14989
2017-01-11 01:55:39 -08:00
Marc Alexander
663bdda53c
Merge branch '3.2.x' 2017-01-07 00:20:22 +01:00