1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

10752 Commits

Author SHA1 Message Date
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
Erwan Nader
4cf998e9df [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-03-18 18:27:24 +01:00
Erwan Nader
716cff0c97 [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-03-18 17:58:06 +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
Rubén Calvo
d10a5b67a1 [ticket/14820] Add style version in ACP
PHPBB3-14820
2017-03-16 00:00:50 +01:00
rxu
4826f7c1d3 [ticket/14806] Fix ACP test emails authentication failure
PHPBB3-14806
2017-03-11 17:06:26 +07:00
Marc Alexander
173ca21ca1
Merge branch '3.2.x' 2017-03-08 21:27:15 +01:00
Marc Alexander
1edb0bd173
Merge pull request #4700 from DavidIQ/ticket/15089
[ticket/15089] Reverse the order of cookie secure radio buttons
2017-03-08 21:27:11 +01:00
Richard McGirr
d7c417de69 [ticket/15107] Add message_parser to event
https://tracker.phpbb.com/browse/PHPBB3-15107

PHPBB3-15107
2017-03-07 06:35:01 -05:00
RMcGirr83
63f7fb1ea6 [ticket/15107] Add message_parser to event
https://tracker.phpbb.com/browse/PHPBB3-15107

PHPBB3-15107
2017-03-02 09:29:39 -05:00
javiexin
34e867c590 [ticket/15102] Missing parameter calling version_check
PHPBB3-15102
2017-02-24 00:25:04 +01:00
Marc Alexander
d956ac418d Merge branch '3.2.x' 2017-02-22 11:09:30 +01:00
Marc Alexander
dbf7f2b7ee Merge branch '3.1.x' into 3.2.x 2017-02-22 11:09:02 +01:00
Marc Alexander
4c3ddea09f Merge remote-tracking branch 'origin/ticket/14927' into 3.1.x 2017-02-22 11:08:22 +01:00
Marc Alexander
bc86210db8
[ticket/14927] Put vars on one line
PHPBB3-14927
2017-02-21 22:15:12 +01:00
Marc Alexander
7794696317
Merge branch '3.2.x' 2017-02-21 21:14:34 +01:00
Marc Alexander
efe6bcf95a
Merge branch '3.1.x' into 3.2.x 2017-02-21 21:14:12 +01:00
Marc Alexander
896249f0e8
Merge pull request #4604 from rxu/ticket/13344
[ticket/13344] Add core event to acp/info/acp_logs.php
2017-02-21 21:10:35 +01:00
david63
bac6dbda5e
[ticket/14927] Corrected order in docblock of event & target version
PHPBB3-14927
2017-02-21 20:46:58 +01:00
david63
1b46435734
[ticket/14927] Add items to core.user_add_modify_data
PHPBB3-14927
2017-02-21 20:44:00 +01:00
javiexin
cdca848018 [ticket/14849] Add core.acp_extensions_run_action
Rename event to core.acp_extensions_run_action_before

PHPBB-14849
2017-02-19 22:01:02 +01:00
nomind60s
65513c79f5 [ticket/15097] Resolve travis-ci error
Make sure indentation is using tabs not spaces per code guidelines

PHPBB3-15097
2017-02-17 16:15:00 -07:00
nomind60s
c30ad4ce60 [ticket/15097] Add PHP version to Board statistics
Rework commit message per DavidIQ's guidance and change variable name
to avoid confusion

PHPBB3-15907
2017-02-17 15:31:43 -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
javiexin
7f69580df3 Merge branch '3.1.x' into ticket/15011 2017-02-15 23:56:52 +01:00
javiexin
7646280d51 [ticket/15011] All errors on metadata throw exceptions
There is inconsistency in the way error are treated in metadata_manager.
Some method return false on error, others throw exception.  With this,
the usage is homogeneus, and the uses of these are also adapted.
Using same ticket as it is the same issue, solved in a different way.

PHPBB3-15011
2017-02-15 23:51:08 +01:00
David Colón
e1910b9a0f [ticket/15089] Reverse the order of cookie secure radio buttons 2017-02-12 22:26:40 -05:00