Merge branch 'master' of https://github.com/Countly/countly-server

CHANGELOG.md

@@ -1,4 +1,42 @@
-15.06
+## Version 15.08
+
+  * Introduction of crash analytics ([Issue #152](https://github.com/Countly/countly-server/issues/152))
+
+  * Countly can now be run via [command line](http://blog.count.ly/post/127181109353/countly-behind-the-curtains-heres-how-we-make)
+
+  * Email reports plugin sending daily or weekly summary of your app statistics ([Issue #3](https://github.com/Countly/countly-server/issues/3))
+
+  * App sorting is now user specific
+
+  * Browser plugin displaying browser metric for Web SDK and other web platforms
+
+  * Stores plugin to track from which store was the app installed (Android)
+
+  * Enhancements to plugin mechanism (shared configs) ([Issue #175](https://github.com/Countly/countly-server/issues/175))
+
+  * Funnel segment applied to all steps ([Issue #173](https://github.com/Countly/countly-server/issues/173))
+
+  * Display time with logs ([Issue #155](https://github.com/Countly/countly-server/issues/155))
+
+  * Merging multiple same value metrics ([Issue #148](https://github.com/Countly/countly-server/issues/148))
+
+  * App Apps View fixes ([Issue #144](https://github.com/Countly/countly-server/issues/144))
+
+  * Metric switching on map ([Issue #141](https://github.com/Countly/countly-server/issues/141))
+
+  * Push plugin should stop sending notifications and return error for Mistmatch Sender ID GCM error ([Issue #163](https://github.com/Countly/countly-server/issues/163))
+
+  * Ability to run under Ubuntu 15.04 with systemd ([Issue #143](https://github.com/Countly/countly-server/issues/143))
+
+  * Languages should show long language names instead of language codes ([Issue #140](https://github.com/Countly/countly-server/issues/140))
+
+  * New metrics added to User Profiles, e.g crashes, attribution and other ([Issue #170] (https://github.com/Countly/countly-server/issues/170)) (Enterprise Edition)
+
+  * Enhanced Drill (Query Builder) with new metrics, user properties, custom properties, attribution campaigns and crashes (Enterprise Edition)
+
+  * Added Organic data to Referal Analytics ([Issue #153](https://github.com/Countly/countly-server/issues/153)) (Enterprise Edition)
+
+## Version 15.06
 
   * Api accepting both GET and POST requests
 
@@ -32,7 +70,8 @@
 
   * Fixed reset page
 
-15.03.02
+
+## Version 15.03.02
 
   * Fixed get_events api method
 
@@ -60,7 +99,7 @@
 
   * Allowing to change device_id
 
-15.03
+## Version 15.03
 
   * Introducing Plugins system, allowing other developers to write plugins which would extend Countly functionality without changing/breaking the core. For more information on how to write a plugin, see [Countly resources](http://resources.count.ly)
 
@@ -110,7 +149,8 @@
 
   * Numerous other minor fixes and improvements
 
-14.08
+
+## Version 14.08
 
   * Added density reporting for Android
 
@@ -128,7 +168,7 @@
 
   * Fix issue #96 (https://github.com/Countly/countly-server/issues/96)
 
-13.11
+## Version 13.11
 
   * Fix issue #88 (https://github.com/Countly/countly-server/issues/88)
 
@@ -138,15 +178,15 @@
 
   * Renamed LICENCE.md to LICENSE.md
 
-13.10
+## Version 13.10
 
   * Add new iPhone device names (iPhone 5S and iPhone 5C)
 
   * Add replica set configuration for MongoDB (https://github.com/Countly/countly-server/pull/74)
 
   * Fix issue #77 (https://github.com/Countly/countly-server/issues/77)
 
-13.09
+## Version 13.09
 
   * Optimizations and fixes to the API for viewing the data on Countly for iPhone
 
@@ -160,7 +200,7 @@
 
   * General UI optimizations
 
-13.06
+## Version 13.06
 
   * Added session durations view that shows users categorized into predefined
     session duration buckets. User is categorized into one of 0-10 seconds, 
@@ -198,7 +238,7 @@
     (/frontend/express/config.js and /api/config.js) to make it possible to 
     run dashboard and application on different servers (defaults to localhost)
 
-12.12
+## Version 12.12
 
   * Added Windows Phone and Blackberry WebWorks support.
 
@@ -225,7 +265,7 @@
 
   * Added awesome animation for closing popups with ESC key :)
 
-12.09
+## Version 12.09
 
   * Added localization support. All the pages have translations in the 
     following languages: Chinese, Dutch, French, German, Italian, Japanese, 
@@ -245,7 +285,7 @@
   * Optimized total user calculation for date ranges other than current 
     year, month and day which already show the absolute number.
 
-12.08
+## Version 12.08
 
   * Added custom event support. Each event has a key as well as a count and 
     an optional sum property. There can be unlimited number of segmentation 
@@ -269,7 +309,7 @@
     page reload. Active application and selected date are stored in 
     localStorage until user logs out.
 
-12.07
+## Version 12.07
 
   * Added platforms view under analytics section.
 
@@ -292,7 +332,7 @@
   * Fixed JSON escape issue for the read API when device name, carrier name 
     etc. contained a single quote.
 
-12.06
+## Version 12.06
 
   * Added user management support. A user can be created as a global admin to 
     manage & view all apps or can be assigned to any application as an

api/api.js

@@ -266,7 +266,7 @@ if (cluster.isMaster) {
 					common.returnMessage(params, 401, 'App does not exist');
 					return false;
 				}
-	
+                params.member = member;
 				params.app_id = app['_id'];
 				params.appTimezone = app['timezone'];
 				params.time = common.initTimeObj(params.appTimezone, params.qstring.timestamp);

bin/commands/countly.sh

@@ -10,7 +10,7 @@ done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 #get current countly version
-VERSION="$(grep -oP '"version":\s*"\K[0-9\.]*' $DIR/../../package.json)"
+VERSION="$(grep -oP 'version:\s*"\K[0-9\.]*' $DIR/../../frontend/express/version.info.js)"
 
 #stub commands to be overwritten
 countly_start (){

frontend/express/version.info.js

@@ -1,6 +1,6 @@
 var plugins = require('../../plugins/pluginManager.js');
 var versionInfo = {
-    version: "15.06",
+    version: "15.08",
     type: "777a2bf527a18e0fffe22fb5b3e322e68d9c07a6"
 };
 plugins.extendModule("versionInfo", versionInfo);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "countly-server",
-  "version": "15.6.0",
+  "version": "15.8.0",
   "description": "innovative, real-time, open source mobile analytics application",
   "keywords": [
     "analytics",