Merge pull request #323 from AndreasHassing/0.4.0

Fix #283 & #321 path issues [+1 for Windows]
meanjs · Jan 7, 2015 · 90c9ddb · 90c9ddb
2 parents 87217da + ab18e14
commit 90c9ddb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/config.js b/config/config.js
@@ -89,7 +89,7 @@ var initGlobalConfigFolders = function(config, assets) {
     };
 
     // Setting globbed client paths
-    config.folders.client = getGlobbedPaths(path.join(process.cwd(), 'modules/*/client/'), process.cwd());
+    config.folders.client = getGlobbedPaths(path.join(process.cwd(), 'modules/*/client/'), process.cwd().replace(new RegExp(/\\/g),'/'));
 };
 
 /**

diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
@@ -26,14 +26,14 @@
 	<meta property="og:title" content="{{title}}">
 	<meta property="og:description" content="{{description}}">
 	<meta property="og:url" content="{{url}}">
-	<meta property="og:image" content="/img/brand/logo.png">
+	<meta property="og:image" content="{{url}}modules/core/img/brand/logo.png">
 	<meta property="og:type" content="website">
 
 	<!-- Twitter META -->
 	<meta name="twitter:title" content="{{title}}">
 	<meta name="twitter:description" content="{{description}}">
 	<meta name="twitter:url" content="{{url}}">
-	<meta name="twitter:image" content="/img/brand/logo.png">
+	<meta name="twitter:image" content="{{url}}modules/core/img/brand/logo.png">
 
 	<!-- Fav Icon -->
 	<link href="/modules/core/img/brand/favicon.ico" rel="shortcut icon" type="image/x-icon">