nickvergessen

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2da0f09..39c4065 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -44,5 +44,5 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_ARGUMENT_VALUE_MISSING'	=> 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
 	'CONTROLLER_NOT_SPECIFIED'			=> 'No controller has been specified.',
 	'CONTROLLER_METHOD_NOT_SPECIFIED'	=> 'No method was specified for the controller.',
-	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
+	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller “<strong>%s</strong>” is not defined in ./config/services.yml.',

nickvergessen

Todo List for 3.1.8

General

• Make sure phpBB/docs/CREDTIS.txt is up to date
• Make sure Contributors have their ranks
• Make sure all reports in the security tracker are closed or invalid
• Go through Issues fixed in 3.1.8 and correct any unreadable descriptions
• Check the feature hightlights wiki page for completeness
• Branch of prep-release-3.1.8 from 3.1.x:

nickvergessen

{"reqId":"byzACVvfhAscHVi4RgP8","remoteAddr":"10.0.2.2","app":"PHP","message":"Call to a member function update() on null at \/home\/nickv\/ownCloud\/master\/core\/lib\/private\/files\/storage\/wrapper\/encryption.php#263","level":3,"time":"2016-02-10T10:34:24+00:00"}

nickvergessen

diff --git a/lib/private/app.php b/lib/private/app.php
index 718adcd..35e9398 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -439,6 +439,7 @@ class OC_App {
 		// if the user is logged-in
 		if (OC_User::isLoggedIn()) {
 			// personal menu
+			if (!\OC::$server->getGroupManager()->isInGroup(\OC_User::getUser(), 'customers')) {
 			$settings[] = array(

nickvergessen

diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 13433c3..f1a34bc 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = prosilver
 copyright = © phpBB Limited, 2007
-style_version = 3.1.6
-phpbb_version = 3.1.6

nickvergessen

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index b9aeed8..2e80e61 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -155,9 +155,10 @@ $lang = array_merge($lang, array(
 	'ACL_M_SPLIT'	=> 'Can split topics',
 	'ACL_M_MERGE'	=> 'Can merge topics',
 
-	'ACL_M_INFO'	=> 'Can view post details',
-	'ACL_M_WARN'	=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)

nickvergessen

Todo List for 3.1.7

General

• Make sure phpBB/docs/CREDTIS.txt is up to date
• Make sure Contributors have their ranks
• Make sure all reports in the security tracker are closed or invalid
• Go through Issues fixed in 3.1.7 and correct any unreadable descriptions
• Check the feature hightlights wiki page for completeness
• Branch of prep-release-3.1.7 from 3.1.x:

nickvergessen

--- /home/nickv/ownCloud/Desktop/client/shell_integration/nautilus/CMakeLists.txt
+++ /home/nickv/ownCloud/Desktop/client/shell_integration/nemo/CMakeLists.txt
@@ -1,4 +1,4 @@
-# copy the python nautilus plugin to build dir as it is going to
+# copy the python nemo plugin to build dir as it is going to
 # be changed.
 if( UNIX AND NOT APPLE )
 
@@ -10,7 +10,7 @@
                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

nickvergessen

$ php composer.phar update phpbb/translation-validator
Loading composer repositories with package information
Updating dependencies (including require-dev)



  [RuntimeException]
  Could not load package monolog/monolog in http://packagist.org: [Unexpected
  ValueException] Could not parse version constraint >=0.90 <3.0: Invalid ver
  sion string "0.90 <3.0"

nickvergessen

Set proxy configuration to use system configuration 
[11/18 15:49:20.889160, 9] csync_exclude_load:  Adding entry: *~
[11/18 15:49:20.889175, 9] csync_exclude_load:  Adding entry: ~$*
[11/18 15:49:20.889178, 9] csync_exclude_load:  Adding entry: .~lock.*
[11/18 15:49:20.889180, 9] csync_exclude_load:  Adding entry: ~*.tmp
[11/18 15:49:20.889182, 9] csync_exclude_load:  Adding entry: ]*.~*
[11/18 15:49:20.889184, 9] csync_exclude_load:  Adding entry: ]Icon\r*
[11/18 15:49:20.889187, 9] csync_exclude_load:  Adding entry: ].DS_Store
[11/18 15:49:20.889189, 9] csync_exclude_load:  Adding entry: ].ds_store
[11/18 15:49:20.889191, 9] csync_exclude_load:  Adding entry: ._*