Commit graph

2934 commits

Author SHA1 Message Date
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
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
Marc Alexander
af4f477a1b
[ticket/14961] Also translate "learn more" link
PHPBB3-14961
2017-01-06 01:04:14 +01:00
Marc Alexander
e0eeea800c
[ticket/14961] Add cookie notice as enablable feature
Uses Insites cookieconsent v3.0.3:
https://cookieconsent.insites.com

PHPBB3-14961
2017-01-06 00:57:12 +01:00
Marc Alexander
e5cc7b6631
Merge branch '3.2.x' 2017-01-04 17:44:15 +01:00
Marc Alexander
03be94c1f7
Merge branch '3.1.x' into 3.2.x 2017-01-04 17:44:11 +01:00
Marc Alexander
7cad25e4cb
[ticket/14838] Do not query full attachments table in feeds
The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.

PHPBB3-14838
2017-01-03 22:56:42 +01:00
Tristan Darricau
58734f960d
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14895] Fix broken tests
  [ticket/14895] Fix issues in CLI classes
  [ticket/14895] Use SymfonyStyle in all CLI
  [ticket/14895] Use SymfonyIO styling
  [ticket/14895] CLI reparser:list should display proper list
2016-12-11 20:25:12 +01:00
Tristan Darricau
8c9d6add2e
Merge pull request #4564 from VSEphpbb/ticket/14895
[ticket/14895] CLI should use SymfonyStyle

* VSEphpbb/ticket/14895:
  [ticket/14895] Fix broken tests
  [ticket/14895] Fix issues in CLI classes
  [ticket/14895] Use SymfonyStyle in all CLI
  [ticket/14895] Use SymfonyIO styling
  [ticket/14895] CLI reparser:list should display proper list
2016-12-11 20:25:09 +01:00
Tristan Darricau
31dbdfe6b6
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED
2016-12-11 19:49:40 +01:00
Christian Schnegelberger
a0adf07453 [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED
PHPBB3-14910
2016-12-11 14:11:55 +01:00
Matt Friedman
74cd513a88 [ticket/14895] CLI reparser:list should display proper list
PHPBB3-14895
2016-12-07 10:13:09 -08:00
Marc Alexander
e75fa8d834
Merge branch '3.2.x' 2016-12-05 18:13:36 +01:00