Commit graph

2979 commits

Author SHA1 Message Date
Marc Alexander
509ea30aa2
Merge branch '3.2.x' 2017-06-05 11:02:49 +02:00
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e
Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00
Tristan Darricau
3fd197f37a
Merge pull request #4828 from hubaishan/ticket/15221
[ticket/15221] add missing commas

* github.com:phpbb/phpbb:
  [ticket/15221] add missing commas
2017-05-08 14:56:01 +02:00
Tristan Darricau
985d822706
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15221] add missing commas
2017-05-08 14:56:01 +02:00
hubaishan
2d8985e4a4 [ticket/15221] add missing commas
in language/en/install.php

PHPBB3-15221
2017-05-07 16:28:00 +03:00
Marc Alexander
47231fe435
Merge branch '3.2.x' 2017-04-26 19:08:30 -04:00
Matt Friedman
95f61af798 [ticket/15198] Add PHP version to board stats in the ACP
PHPBB3-15198
2017-04-26 09:40:15 -07:00
Tristan Darricau
69571f9cef
[ticket/11150] Fix comments
PHPBB3-11150
2017-04-23 21:01:15 +02:00
Tristan Darricau
ab162b2fa6
[ticket/11150] Do not generate actions links in templates
PHPBB3-11150
2017-04-23 21:01:15 +02:00
Tristan Darricau
87ce6cadaf
[ticket/11150] Fix wording
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
efe37cd5a8
[ticket/11150] Wording
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
4599799fba
[ticket/11150] Improves requirements check
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
1703b678d0
[ticket/11150] Skip invalid extensions, not the whole list
PHPBB3-11150
2017-04-23 21:01:13 +02:00
Tristan Darricau
ea4a4acee0
[ticket/11150] CS and wording
PHPBB3-11150
2017-04-23 21:01:11 +02:00
Tristan Darricau
8ea2ecf835
[ticket/11150] Disable packagist and add titania
PHPBB3-11150
2017-04-23 21:01:11 +02:00
Tristan Darricau
0926e94955
[ticket/11150] CS
PHPBB3-11150
2017-04-23 21:01:10 +02:00
Tristan Darricau
60086b5c41
[ticket/11150] Add language key
PHPBB3-11150
2017-04-23 21:01:09 +02:00
Tristan Darricau
317c90cf48
[ticket/11150] Makes minimum-stability configurable
PHPBB3-11150
2017-04-23 21:01:09 +02:00
Tristan Darricau
f1e80830b7
[ticket/11150] Wording
PHPBB3-11150
2017-04-23 21:01:08 +02:00
Tristan Darricau
38a58df41b
[ticket/11150] Gallery => Catalog
PHPBB3-11150
2017-04-23 21:01:08 +02:00
Tristan Darricau
560d4729f9
[ticket/11150] Small fix
PHPBB3-11150
2017-04-23 21:01:07 +02:00
Tristan Darricau
1acef8d268
[ticket/11150] Updates CLI wording
PHPBB3-11150
2017-04-23 21:01:07 +02:00
Tristan Darricau
cc0a762866
[ticket/11150] Disable if directories not writable
PHPBB3-11150
2017-04-23 21:01:06 +02:00
Tristan Darricau
0a809fb90e
[ticket/11150] Add missing language keys
PHPBB3-11150
2017-04-23 21:01:06 +02:00
Tristan Darricau
9b69cd74ae
[ticket/11150] Language keys
PHPBB3-11150
2017-04-23 21:01:06 +02:00
Tristan Darricau
b75087a433
[ticket/11150] Repositories settings, beginning
PHPBB3-11150
2017-04-23 21:01:06 +02:00
Tristan Darricau
3640302afd
[ticket/11150] Set settings
PHPBB3-11150
2017-04-23 21:01:05 +02:00
Tristan Darricau
88b32580dc
[ticket/11150] Add Remove && Update buttons
PHPBB3-11150
2017-04-23 21:01:04 +02:00
Tristan Darricau
51916def9c
[ticket/11150] Display extension status in "gallery"
PHPBB3-11150
2017-04-23 21:01:04 +02:00
Tristan Darricau
adb8d30d98
[ticket/11150] Add ACP gallery
PHPBB3-11150
2017-04-23 21:01:03 +02:00
Tristan Darricau
e3fadc1fc7
[ticket/11150] Display and translate composer output
PHPBB3-11150
2017-04-23 21:01:02 +02:00
Tristan Darricau
00229c20f0
[ticket/11150] Add extension:start-managing command
PHPBB3-11150
2017-04-23 21:01:02 +02:00
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
Rubén Calvo
32f3ddca70 [ticket/15150] Add Jabber SSL context configuration options
PHPBB3-15150
2017-03-30 10:04:50 +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