1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00

29022 Commits

Author SHA1 Message Date
Tristan Darricau
3ba8e7bda3
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14906] Delete redundant sig key in user_cache_data array
2016-12-11 19:51:56 +01:00
Tristan Darricau
ad3b7830b4
Merge pull request #4573 from rxu/ticket/14906
[ticket/14906] Delete redundant sig key in user_cache_data array

* rxu/ticket/14906:
  [ticket/14906] Delete redundant sig key in user_cache_data array
2016-12-11 19:51:53 +01:00
Tristan Darricau
bd6e5144dd
Merge pull request #4576 from Crizz0/ticket/14910
[ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED

* Crizz0/ticket/14910:
  [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED
2016-12-11 19:49:37 +01:00
Marc Alexander
dbd003a0d1
Merge branch '3.1.x' into 3.2.x 2016-12-11 15:59:08 +01:00
Marc Alexander
96adf7f0d6
Merge pull request #4514 from senky/ticket/14759
[ticket/14759] Add core.mcp_main_modify_shadow_sql event
2016-12-11 15:58:12 +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
Marc Alexander
04e68c092b
Merge pull request #4574 from Crizz0/ticket/14908
[ticket/14908] Uses lang-variable instead of english text
2016-12-10 23:02:11 +01:00
Christian Schnegelberger
dfe42e9603 [ticket/14908] Uses lang-variable instead of english text
PHPBB3-14908
2016-12-10 21:50:09 +01:00
rxu
7d5d5b0f06 [ticket/14906] Delete redundant sig key in user_cache_data array
PHPBB3-14906
2016-12-11 00:52:32 +07:00
Marc Alexander
f7049bd0dc
Merge branch '3.1.x' into 3.2.x 2016-12-10 13:37:56 +01:00
Marc Alexander
c084990a68
Merge pull request #4513 from senky/ticket/14760
[ticket/14760] Add core.mcp_main_modify_fork_sql event
2016-12-10 13:37:52 +01:00
Marc Alexander
cff3dbf00e
[3.2.x] Update version numbers to 3.2.0-RC3-dev 2016-12-10 00:32:41 +01:00
Marc Alexander
886ec98dc7
Merge branch 'prep-release-3.2.0-RC2' into 3.2.x 2016-12-10 00:25:58 +01:00
Marc Alexander
af7dca6acd
[prep-release-3.2.0-RC2] Update changelog release-3.2.0-RC2 2016-12-09 20:52:35 +01:00
Marc Alexander
c494d8f53e
[prep-release-3.2.0-RC2] Update changelog 2016-12-09 20:50:48 +01:00
Marc Alexander
a35c8a924e
[prep-release-3.2.0-RC2] Add migration file for 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
9d72c4a66a
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
185bda094b
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
ddfc52a5f6
Merge pull request #4571 from marc1706/ticket/14894
[ticket/14894] Use correct config name for conflicts archive extension
2016-12-09 20:48:14 +01:00
Marc Alexander
37a3bd131b
[ticket/14894] Use correct config name for conflicts archive extension
PHPBB3-14894
2016-12-09 19:54:58 +01:00
Máté Bartus
54751991ad Merge pull request #4569 from marc1706/ticket/14891
[ticket/14891] Use own proxy instantiator for open_basedir compatibility
2016-12-09 12:40:57 +01:00
Marc Alexander
90b59bb547 [ticket/14891] Don't rely on sys_get_temp_dir() being available
Or actually returning a path. It might also return an empty string
or null.

PHPBB3-14891
2016-12-09 11:32:13 +01:00
Marc Alexander
6a568719d0 [ticket/14891] Use filesystem classes for checking on tmp dir
The cache dir will now also only be used if tmp dir does not exist
or if it's not writable.

PHPBB3-14891
2016-12-09 11:10:28 +01:00
Marc Alexander
5f56e9025b [ticket/14891] Remove unused use statements
PHPBB3-14891
2016-12-09 09:33:21 +01:00
Marc Alexander
7fedc19cc4
[ticket/14891] Use own proxy instantiator for open_basedir compatibility
Also reverted random_compat lib to 1.4.x.

PHPBB3-14891
2016-12-09 08:17:51 +01:00
Marc Alexander
467e603570
Merge pull request #4568 from marc1706/ticket/14900
[ticket/14900] Do not state missing cached version check means ext is invalid
2016-12-08 22:00:40 +01:00
Marc Alexander
4c36ca4b85
[ticket/14900] Do not state missing cached version check means ext is invalid
Also fixed typo in code that was looming there for a while.

PHPBB3-14900
2016-12-08 21:17:50 +01:00
Máté Bartus
1be233a801 Merge pull request #4565 from marc1706/ticket/14896
[ticket/14896] Do not overwrite login when finishing install
2016-12-08 20:55:14 +01:00
Marc Alexander
69a5ed78cf
Merge pull request #4566 from CHItA/ticket/14897
[ticket/14897] Add $restart_progress_bar to iohandler base
2016-12-08 20:32:15 +01:00
Máté Bartus
f2fde5e7a3 [ticket/14897] Add $restart_progress_bar to iohandler base
PHPBB3-14897
2016-12-07 21:01:47 +01:00
Marc Alexander
829e147504
[ticket/14896] Do not overwrite login when finishing install
Otherwise the user will be "logged in" again as guest user which will
prevent any redirectiong to the ACP after the installation.

PHPBB3-14896
2016-12-07 20:56:27 +01:00
Marc Alexander
129bfd5e62 Merge branch 'ticket/14892' into 3.2.x 2016-12-06 15:03:24 +01:00
Marc Alexander
e5504b74f0 [ticket/14892] Revert to twig 1.24 to have working assets again
Twig 1.25 and after introduced a way of handling both relative and
absolute paths. However, it seems to handle absolute windows paths as
relative paths. This breaks any assets or similar ways of including files
into the main template files.

PHPBB3-14892
2016-12-06 14:42:14 +01:00
Marc Alexander
72529cd179
Merge branch '3.1.x' into 3.2.x 2016-12-05 19:15:37 +01:00
Marc Alexander
3322117c38
Merge pull request #4559 from javiexin/ticket/14890
[ticket/14890] Typo in input validation of profile fields of type string
2016-12-05 19:15:34 +01:00
javiexin
591eff9e78 [ticket/14890] Typo in input validation of profile fields of type string
This bug was introduced by PHPBB3-14272

PHPBB3-14890
2016-12-05 18:35:16 +01:00
Marc Alexander
375e264a47
Merge pull request #3856 from Nicofuma/ticket/12610
[ticket/12610] Add command to check if the board is up to date.
2016-12-05 18:13:33 +01:00
Marc Alexander
103d344cd4
[ticket/12610] Fix tests and use getOption() for console
PHPBB3-12610
2016-12-05 15:46:05 +01:00
Tristan Darricau
32aa0596f3
[ticket/12610] Use Symfony style guide
PHPBB3-12610
2016-12-04 17:43:51 +01:00
Tristan Darricau
6c35ca80ed
[ticket/12610] Add a better error message when an extension is missing
PHPBB3-12610
2016-12-04 17:06:35 +01:00
Tristan Darricau
164a4190d5
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14888] Missing check for disabled profile field types
2016-12-04 10:31:32 +01:00
Tristan Darricau
533d2b90b8
Merge pull request #4555 from javiexin/ticket/14888
[ticket/14888] Missing check for disabled profile field types

* javiexin/ticket/14888:
  [ticket/14888] Missing check for disabled profile field types
2016-12-04 10:31:29 +01:00
javiexin
99a99c5412 [ticket/14888] Missing check for disabled profile field types
Checks if a profile field type is enabled before using it.

PHPBB3-14888
2016-12-04 04:28:27 +01:00
Tristan Darricau
57915a8aaa
[ticket/12610] Correctly handle empty cache
PHPBB3-12610
2016-12-03 16:37:36 +01:00
Tristan Darricau
ab58bb8744
[ticket/12610] Ignor exception due to the version check in extensions list
PHPBB3-12610
2016-12-03 16:37:36 +01:00
Tristan Darricau
c9e493a911
[ticket/12610] Display the latest version and not the branch name in CLI
PHPBB3-12610
2016-12-03 16:37:35 +01:00
Tristan Darricau
0256c69191
[ticket/12610] CS
PHPBB3-12610
2016-12-03 16:37:35 +01:00
Tristan Darricau
45dda53310
[ticket/12610] Improve output
PHPBB3-12610
2016-12-03 16:37:35 +01:00
Tristan Darricau
1f305e4025
[ticket/12610] Skip extensions with no update info
PHPBB3-12610
2016-12-03 16:37:35 +01:00
Tristan Darricau
8481bd4e18
[ticket/12610] Use exception_interface
PHPBB3-12610
2016-12-03 16:37:35 +01:00