mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-25 16:49:58 +02:00
Code Issues Releases Wiki Activity
30,056 Commits 18 Branches 192 Tags
Commit Graph

10619 Commits

Author SHA1 Message Date
Tristan Darricau
1844b8ca2a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15011] Use exception interface for 3.2
 2017-04-21 23:51:42 +02:00
javiexin
6a61e73e00 [ticket/15011] Use exception interface for 3.2 
Update the mentioned ticket to 3.2 by using exception_inteface
instead of the actual exception class.
Also, use adm_back_link consistently.

PHPBB3-15011
 2017-04-21 21:28:29 +02:00
Tristan Darricau
edf6aefd2a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:02:03 +02:00
Tristan Darricau
c61e43cc91
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:01:35 +02:00
Tristan Darricau
a8d28d6bc8
Merge pull request #4657 from marc1706/ticket/7336 
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:00:37 +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
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
Marc Alexander
465ceab1e6
Merge branch '3.2.x' 2017-04-16 19:41:19 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array 
PHPBB3-14990
 2017-04-16 23:40:16 +07:00
rxu
1ea114ca20 [ticket/14990] Fix event name, email parsing, installer and dispatcher calls 
PHPBB3-14990
 2017-04-16 22:43:50 +07:00
Marc Alexander
c92c2aa2f4
Merge branch '3.2.x' 2017-04-16 11:42:53 +02:00
Marc Alexander
d44d1f115f
Merge pull request #4698 from javiexin/ticket/15087 
[ticket/15087] Optimize creation of metadata objects by caching
 2017-04-16 11:15:45 +02:00
Marc Alexander
82e1b8fd72
Merge pull request #4581 from javiexin/ticket/14919 
[ticket/14919] Do not directly use globals in acp_extensions
 2017-04-16 09:49:21 +02:00
Marc Alexander
fba8595421
Merge branch '3.2.x' 2017-04-11 21:28:08 +02:00
Marc Alexander
f9a596c544
Merge pull request #4761 from VSEphpbb/ticket/15142 
[ticket/15142] Check extension updates on current branch
 2017-04-11 21:26:52 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x 
PHPBB3-15142
 2017-04-10 15:51:22 -07: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
Marc Alexander
f23ff335c7
Merge branch '3.2.x' 2017-03-25 16:37:37 +01:00
Marc Alexander
936426178b
Merge pull request #4762 from Nicofuma/ticket/15137 
[ticket/15137] Global Announcements shouldn't always be never ending
 2017-03-25 16:37:33 +01:00
Tristan Darricau
38cf5c10f9
[ticket/15137] Global Announcements shouldn't always be never ending 
PHPBB3-15137
 2017-03-25 14:11:20 +01:00
Tristan Darricau
e4c13af894
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15143] Fix display of version update in ACP
 2017-03-24 23:20:08 +01:00
Tristan Darricau
e86f199d16
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15143] Fix display of version update in ACP
 2017-03-24 23:19:54 +01:00
Tristan Darricau
1f1baf3e30
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15135] Correctly pass exception arguments and add back link again
  [ticket/15135] Parse language files in acp_extensions instead of md manager
 2017-03-24 23:08:02 +01:00
Matt Friedman
91ab27ecc9 [ticket/15142] Check extension updates on current branch 
PHPBB3-15142
 2017-03-24 09:37:14 -07:00
Marc Alexander
a975a35734
[ticket/15135] Correctly pass exception arguments and add back link again 
PHPBB3-15135
 2017-03-23 21:52:35 +01:00
Matt Friedman
45c3cb52e4 [ticket/15143] Fix display of version update in ACP 
PHPBB3-15143
 2017-03-22 12:14:05 -07:00
Marc Alexander
6f1de69bbe
[ticket/15135] Parse language files in acp_extensions instead of md manager 
PHPBB3-15135
 2017-03-19 22:37:19 +01:00
Tristan Darricau
d64726815c
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15102] Missing parameter calling version_check
 2017-03-19 18:53:22 +01:00
Tristan Darricau
bd34b2301e
Merge pull request #4711 from javiexin/ticket/15102 
[ticket/15102] Missing parameter calling version_check

* github.com:phpbb/phpbb:
  [ticket/15102] Missing parameter calling version_check
 2017-03-19 18:53:19 +01:00
Tristan Darricau
7d0692eff3
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14806] Fix ACP test emails authentication failure
 2017-03-19 18:45:39 +01:00
Tristan Darricau
c46efa461e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14806] Fix ACP test emails authentication failure
 2017-03-19 18:45:29 +01:00
Tristan Darricau
6abcfe41e0
Merge pull request #4734 from rxu/ticket/14806 
[ticket/14806] Fix ACP test emails authentication failure

* github.com:phpbb/phpbb:
  [ticket/14806] Fix ACP test emails authentication failure
 2017-03-19 18:44:41 +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
Marc Alexander
0dc61deb77
Merge branch '3.2.x' 2017-03-19 16:01:42 +01:00
Marc Alexander
e497937dd4
Merge branch '3.1.x' into 3.2.x 2017-03-19 16:01:37 +01:00
Marc Alexander
948ce2d84f
Merge pull request #4578 from javiexin/ticket/14849 
[ticket/14849] Add core.acp_extensions_run_action
 2017-03-19 16:01:33 +01:00
Marc Alexander
adc2ea3f0c
Merge branch '3.2.x' 2017-03-19 15:53:27 +01:00
Marc Alexander
9958a68c57
Merge branch '3.1.x' into 3.2.x 2017-03-19 15:53:08 +01:00
Marc Alexander
59396771e6
Merge pull request #4703 from javiexin/ticket/15011 
[ticket/15011] All errors on metadata throw exceptions
 2017-03-19 15:49:33 +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
Marc Alexander
0f95e607ff
Merge pull request #4743 from rubencm/ticket/14820 
[ticket/14820] Add style version in ACP
 2017-03-19 00:01:30 +01:00
rxu
2cc9b6a857 [ticket/13558] Make SSL context specific options more SMTP general 
PHPBB3-13558
 2017-03-18 01:11:32 +07:00
rxu
ac87784a11 [ticket/13558] Add smtp SSL context configuration options 
PHPBB3-13558
 2017-03-17 01:21:57 +07:00