upgrade version 1.5.3

Keplerjs · Nov 13, 2018 · 49c9fe2 · 49c9fe2
1 parent 15c3926
commit 49c9fe2
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 53 deletions.
diff --git a/.meteor/versions b/.meteor/versions
@@ -55,30 +55,30 @@ iron:[email protected]
 iron:[email protected]
 [email protected]
 juliancwirko:[email protected]
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].0
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].0
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].2
-keplerjs:[email protected].0
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
+keplerjs:[email protected].3
 kidovate:[email protected]
 konecty:[email protected]
 [email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 Complete list of releases [here](https://github.com/Keplerjs/Kepler/releases)
 
 ## Next version
+- new settings to disable user markers settings.public.map.layerUsers.enabled
 - disable placeholders by settings.json
 - fix panelUser template
 - block email send if user created by admin

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keplerjs",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "The open source full-stack geosocial network platform",
   "repository": {
     "type": "git",

diff --git a/packages/admin/package.js b/packages/admin/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/api/package.js b/packages/api/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/base/package.js b/packages/base/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/categories/package.js b/packages/categories/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/convers/package.js b/packages/convers/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/core/Kepler.js b/packages/core/Kepler.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 /**
  * Kepler global container
  * @type {[type]}

diff --git a/packages/core/client/Profile.js b/packages/core/client/Profile.js
@@ -38,7 +38,7 @@ Kepler.Profile = {
 
 			if(self.data.checkin)
 				self.placeCheckin = K.placeById(self.data.checkin);
-
+		
 			if(self.data.status==='online' || self.data.status==='away')
 				Meteor.subscribe('friendsByIds', K.Profile.data.friends, function() {
 					_.map(K.Profile.data.friends, function(id) {
@@ -49,6 +49,7 @@ Kepler.Profile = {
 				_.map(K.Profile.data.friends, function(id) {
 					K.Map.removeItem(K.userById(id));
 				});
+
 		});
 
 		if(self.data.mob !== K.Util.isMobile()) {

diff --git a/packages/core/client/User.js b/packages/core/client/User.js
@@ -97,6 +97,7 @@ Kepler.User = Class.extend({
 
 		var opts = K.settings.public.map;
 
+		//TODO move this in self.update
 		if(!opts.layerUsers.enabled)
 			return null;
 

diff --git a/packages/core/modules/Plugin.js b/packages/core/modules/Plugin.js
@@ -17,6 +17,7 @@ Kepler.Plugin = function(plugin) {
 			if(_.isObject(ptmpls)) {
 
 				for(var placeholder in ptmpls) {
+
 					if(ptmpls[placeholder] && !_.has(K.templates,placeholder) )
 						K.templates[placeholder]= {};
 				}
@@ -127,10 +128,10 @@ if(Meteor.isClient) {
 
 			for(var t in tmpls) {
 				if(!Template[t]) {
-					console.warn('Template not exists: "'+t+'", defined in plugin: '+tmpls[t].plugin)
+					console.warn('Template not exists: "'+t+'", defined in plugin: '+(tmpls[t] && tmpls[t].plugin))
 					delete tmpls[t];
 				}
-			}	
+			}
 		}
 
 		for(var placeholder in sets) {

diff --git a/packages/core/package.js b/packages/core/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/edit/package.js b/packages/edit/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/events/package.js b/packages/events/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/favorites/package.js b/packages/favorites/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/geoinfo/package.js b/packages/geoinfo/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/i18n/package.js b/packages/i18n/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/import/package.js b/packages/import/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/lib/package.js b/packages/lib/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/notifs/package.js b/packages/notifs/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/osm/package.js b/packages/osm/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/pois/package.js b/packages/pois/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/share/package.js b/packages/share/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/stats/package.js b/packages/stats/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/theme/package.js b/packages/theme/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/theme/plugin.js b/packages/theme/plugin.js
@@ -4,7 +4,6 @@ K.Plugin({
 	templates: {
 		pageHome: 'pageHome_theme',
 		footer: {
-			'show': false,
 			'footer_theme':{ order: 10 }
 		}
 	},

diff --git a/packages/tracks/package.js b/packages/tracks/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/ui/package.js b/packages/ui/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/packages/upload/package.js b/packages/upload/package.js
@@ -1,4 +1,4 @@
-var version = '1.5.2';
+var version = '1.5.3';
 
 Package.describe({
   version: version,

diff --git a/private/settings.light-ui.json b/private/settings.light-ui.json
@@ -19,7 +19,7 @@
 			},
 			"layerUsers": {
 				"enabled": false
-			},			
+			},
 			"controls": {
 				"zoom": {
 					"enabled": true,