Merge remote-tracking branch 'origin/master' into post-list-item-design

* origin/master:
  Update to bengott:avatar 0.1.4
  Update to use bengott:avatar 0.1.2
  Not using Notifications collection anymore, so get rid of this migration
  wrap newsletter banner helpers in startup block
  kadira version bump
  re-enable emailNotifications setting
  Add missing adminMongoQuery and notAdminMongoQuery
  Fixing VulcanJS#457
  Update Kadira package to latest release 2.11.2
  Update Kadira package to latest release 2.11.2
  Update it.js
  updating packages
  Make it possible to hide fields from quickform; cleanup
  Upgrading to 0.9.3.1
  Added Gitter badge
  Fully abstract isAdmin
  Add querystring updates to search
  herald integration
  Update to use bengott:avatar package for all user avatars

Conflicts:
	.meteor/packages
	.meteor/release
	.meteor/versions
	client/views/comments/comment_item.html
	client/views/posts/modules/post_admin.html
	packages/npm-container/versions.json
	packages/telescope-api/versions.json
	packages/telescope-base/versions.json
	packages/telescope-daily/versions.json
	packages/telescope-email/versions.json
	packages/telescope-i18n/versions.json
	packages/telescope-kadira/versions.json
	packages/telescope-lib/versions.json
	packages/telescope-module-embedly/versions.json
	packages/telescope-newsletter/versions.json
	packages/telescope-notifications/lib/client/templates/notifications_menu.js
	packages/telescope-notifications/versions.json
	packages/telescope-rss/versions.json
	packages/telescope-search/versions.json
	packages/telescope-tags/versions.json
	packages/telescope-theme-base/versions.json
	packages/telescope-update-prompt/versions.json

.meteor/packages

@@ -37,6 +37,11 @@ sacha:spin@2.0.4
 sacha:juice
 chuangbo:marked@0.3.3
 percolatestudio:synced-cron@0.1.1
+npm-container
+matb33:collection-hooks
+djedi:sanitize-html
+rajit:bootstrap3-datepicker
+bengott:avatar
 
 # Telescope Packages
 
@@ -54,12 +59,6 @@ telescope-email
 telescope-update-prompt
 telescope-notifications
 telescope-kadira
-
-
-npm-container
-matb33:collection-hooks
-djedi:sanitize-html
-rajit:bootstrap3-datepicker
 telescope-update-prompt
 telescope-notifications
 telescope-kadira
@@ -71,3 +70,5 @@ splendido:accounts-templates-unstyled
 font-awesome
 telescope-theme-base
 telescope-theme-allthingsfront
+
+splendido:accounts-templates-unstyled

.meteor/versions

@@ -7,6 +7,15 @@ accounts-ui-unstyled@1.1.3
 accounts-ui@1.1.2
 aldeed:autoform@3.2.0
 aldeed:collection2@2.2.0
+accounts-base@1.1.1
+accounts-facebook@1.0.1
+accounts-oauth@1.1.1
+accounts-password@1.0.2
+accounts-twitter@1.0.1
+accounts-ui-unstyled@1.1.2
+accounts-ui@1.1.1
+aldeed:autoform@3.1.0
+aldeed:collection2@2.1.0
 aldeed:simple-schema@1.0.3
 application-configuration@1.0.3
 autoupdate@1.1.2
@@ -18,6 +27,14 @@ blaze@2.0.2
 boilerplate-generator@1.0.1
 callback-hook@1.0.1
 check@1.0.2
+base64@1.0.0
+bengott:avatar@0.1.4
+binary-heap@1.0.0
+blaze-tools@1.0.0
+blaze@2.0.1
+boilerplate-generator@1.0.0
+callback-hook@1.0.0
+check@1.0.1
 chuangbo:marked@0.3.5
 cmather:handlebars-server@0.2.0
 coffeescript@1.0.4
@@ -48,12 +65,26 @@ less@1.0.10
 livedata@1.0.11
 localstorage@1.0.1
 logging@1.0.4
+iron:router@0.9.4
+jparker:crypto-core@0.1.0
+jparker:crypto-md5@0.1.1
+jparker:gravatar@0.3.0
+jquery@1.0.0
+json@1.0.0
+kestanous:herald-email@0.2.1
+kestanous:herald@0.6.0
+less@1.0.9
+livedata@1.0.10
+localstorage@1.0.0
+logging@1.0.3
 matb33:collection-hooks@0.7.6
 meteor-platform@1.1.2
 meteor@1.1.2
 meteorhacks:async@1.0.0
 meteorhacks:fast-render@1.1.2
 meteorhacks:kadira@2.5.0
+meteorhacks:kadira-binary-deps@1.2.0
+meteorhacks:kadira@2.11.2
 meteorhacks:npm@1.2.0
 meteorhacks:subs-manager@1.2.0
 minifiers@1.1.1
@@ -93,6 +124,14 @@ splendido:accounts-templates-core@0.9.16
 splendido:accounts-templates-unstyled@0.9.16
 srp@1.0.1
 standard-app-packages@1.0.3
+spacebars-compiler@1.0.2
+spacebars@1.0.2
+spiderable@1.0.3
+splendido:accounts-templates-core@0.9.9
+splendido:accounts-templates-unstyled@0.9.9
+srp@1.0.0
+standard-app-packages@1.0.2
+stylus@1.0.4
 telescope-api@0.0.0
 telescope-base@0.0.0
 telescope-daily@0.0.0

History.md

@@ -1,3 +1,13 @@
+## v0.9.8
+
+* Fixing #457 (pending posts view not working).
+* Added German translation (thanks @Helmi!).
+* Added `?q=` parameter to searches (thanks @yourcelf!).
+* Abstracting `isAdmin` (thanks @yourcelsf!).
+* Refactoring `getPostsParameters` (thanks @delgermurun!).
+* Using `bengott:avatar` package for avatars (thanks @bengott!).
+* Upgrading to Meteor 0.9.3.1.
+
 ## v0.9.7 “SettingsScope”
 
 * Updating to Meteor 0.9.3.

README.md

@@ -5,6 +5,7 @@ Telescope is an open-source, real-time social news site built with [Meteor](http
 Note that Telescope is distributed under the [MIT License](http://opensource.org/licenses/MIT)
 
 ### We Need Your Help!
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/TelescopeJS/Telescope?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A lot of work has already gone into Telescope, but it needs that final push to reach its full potential. 
 

client/helpers/config.js

@@ -41,3 +41,7 @@ Statuses={
 	approved: 2,
 	rejected: 3
 };
+
+Avatar.options = {
+	emailHashProperty: 'email_hash'
+};

client/views/comments/comment_item.html

@@ -16,6 +16,7 @@
               </a>
             </div>
         </div>
+        <div class="user-avatar">{{>avatar userId=userId class="circle"}}</div>
         <div class="comment-main">
           <div class="comment-meta">
             <a class="comment-username" href="{{profileUrl}}">{{authorName}}</a>&nbsp;
@@ -34,6 +35,16 @@
                 • <span>{{full_date}}</span>
               {{/if}}
             </div>
+            <a class="comment-username" href="{{profileUrl}}">{{authorName}}</a>
+            <span class="comment-time">{{ago}},</span>
+            <span class="points">{{upvotes}}</span> <span class="unit">points </span>
+            <a href="/comments/{{_id}}" class="comment-permalink icon-link goto-comment">{{i18n "link"}}</a>
+            {{#if can_edit}}
+              | <a class="edit-link" href="/comments/{{_id}}/edit">{{i18n "Edit"}}</a>
+            {{/if}}
+            {{#if isAdmin}}
+              | <span>{{full_date}}</span>
+            {{/if}}
           </div>
         </div>
       </div>

client/views/comments/comment_item.js

@@ -81,7 +81,7 @@ Template[getTemplate('comment_item')].helpers({
   },
   can_edit: function(){
     if(this.userId && Meteor.userId())
-      return Meteor.user().isAdmin || (Meteor.userId() === this.userId);
+      return isAdmin(Meteor.user()) || (Meteor.userId() === this.userId);
     else
       return false;
   },

client/views/posts/modules/post_admin.html

@@ -5,6 +5,7 @@
   </div>
   {{/if}}
   {{#if currentUser.isAdmin}}
+  {{#if isAdmin}}
     <div class="post-meta-item">
       {{#if postsMustBeApproved}}
         •
@@ -17,4 +18,4 @@
       • {{i18n "Score"}}: {{shortScore}} • {{i18n "Clicks"}}: {{clicks}}
     </div>
   {{/if}}
-</template>
+</template>

client/views/posts/modules/post_content.js

@@ -28,9 +28,10 @@ Template[getTemplate('postContent')].helpers({
     return moment(time).format("MMMM Do, h:mm:ss a");
   },
   userAvatar: function(){
+    // THIS FUNCTION IS DEPRECATED -- package bengott:avatar is used instead.
     var author = Meteor.users.findOne(this.userId, {reactive: false});
     if(!!author)
-      return getAvatarUrl(author);
+      return getAvatarUrl(author); // ALSO DEPRECATED
   },
   inactiveClass: function(){
     return (isAdmin(Meteor.user()) && this.inactive) ? i18n.t('inactive') : "";

client/views/settings/quickFormSettings.html

@@ -27,16 +27,18 @@ <h3 class="fieldset-heading">{{this}}</h3>
 </template>
 
 <template name="afFormGroup_settings">
-  <div class="form-group {{#if afFieldIsInvalid name=this.atts.name}}has-error{{/if}}">
-    {{> afFieldLabel afFieldLabelAtts}}
-    <div class="{{rightColumnClass}}">
-      {{> afFieldInput afFieldInputAtts}}
-      {{#if afFieldInstructions}}
-        <span class="instructions-block">{{afFieldInstructions}}</span>
-      {{/if}}
-      <span class="help-block">{{{afFieldMessage name=this.atts.name}}}</span>
+  {{#if showField}}
+    <div class="form-group {{#if afFieldIsInvalid name=this.atts.name}}has-error{{/if}}">
+      {{> afFieldLabel afFieldLabelAtts}}
+      <div class="{{rightColumnClass}}">
+        {{> afFieldInput afFieldInputAtts}}
+        {{#if afFieldInstructions}}
+          <span class="instructions-block">{{afFieldInstructions}}</span>
+        {{/if}}
+        <span class="help-block">{{{afFieldMessage name=this.atts.name}}}</span>
+      </div>
     </div>
-  </div>
+  {{/if}}
 </template>
 
 <template name="afObjectField_settings">

client/views/settings/quickFormSettings.js

@@ -69,66 +69,69 @@ Template[getTemplate('quickForm_settings')].helpers({
   }
 });
 
-Template["afFormGroup_settings"].afFieldInputAtts = function () {
-  var atts = _.clone(this.afFieldInputAtts || {});
-  if ('input-col-class' in atts) {
-    delete atts['input-col-class'];
+Template["afFormGroup_settings"].helpers({
+  afFieldInputAtts: function () {
+    var atts = _.clone(this.afFieldInputAtts || {});
+    if ('input-col-class' in atts) {
+      delete atts['input-col-class'];
+    }
+    atts.template = "bootstrap3";
+    return atts;
+  },
+  afFieldLabelAtts: function () {
+    var atts = _.clone(this.afFieldLabelAtts || {});
+    atts.template = "bootstrap3";
+    return atts;
+  },
+  afEmptyFieldLabelAtts: function () {
+    var atts = _.clone(this.afFieldLabelAtts || {});
+    var labelAtts = _.omit(atts, 'name', 'autoform', 'template');
+    // Add bootstrap class if necessary
+    if (typeof labelAtts['class'] === "string") {
+      labelAtts['class'] += " control-label"; //might be added twice but that shouldn't hurt anything
+    } else {
+      labelAtts['class'] = "control-label";
+    }
+    return labelAtts;
+  },
+  rightColumnClass: function () {
+    var atts = this.afFieldInputAtts || {};
+    return atts['input-col-class'] || "";
+  },
+  showField: function () {
+    return "showField" in this.afFieldInputAtts ? this.afFieldInputAtts.showField : true;
+  },
+  afFieldInstructions: function () {
+    return this.afFieldInputAtts.instructions;
   }
-  atts.template = "bootstrap3";
-  return atts;
-};
-
-Template["afFormGroup_settings"].afFieldLabelAtts = function () {
-  var atts = _.clone(this.afFieldLabelAtts || {});
-  atts.template = "bootstrap3";
-  return atts;
-};
+});
 
-Template["afFormGroup_settings"].afEmptyFieldLabelAtts = function () {
-  var atts = _.clone(this.afFieldLabelAtts || {});
-  var labelAtts = _.omit(atts, 'name', 'autoform', 'template');
-  // Add bootstrap class if necessary
-  if (typeof labelAtts['class'] === "string") {
-    labelAtts['class'] += " control-label"; //might be added twice but that shouldn't hurt anything
-  } else {
-    labelAtts['class'] = "control-label";
+Template["afObjectField_settings"].helpers({
+  rightColumnClass: function () {
+    var atts = this.atts || {};
+    return atts['input-col-class'] || "";
+  },
+  afFieldLabelAtts: function () {
+    var atts = this.atts;
+    return {
+      template: "bootstrap3",
+      "class": atts["label-class"],
+      "name": atts.name
+    }
   }
-  return labelAtts;
-};
-
-Template["afFormGroup_settings"].rightColumnClass = function () {
-  var atts = this.afFieldInputAtts || {};
-  return atts['input-col-class'] || "";
-};
-
-Template["afFormGroup_settings"].afFieldInstructions = function () {
-  return this.afFieldInputAtts.instructions;
-};
-
-Template["afObjectField_settings"].rightColumnClass = function () {
-  var atts = this.atts || {};
-  return atts['input-col-class'] || "";
-};
-
-Template["afObjectField_settings"].afFieldLabelAtts = function () {
-  var atts = this.atts;
-  return {
-    template: "bootstrap3",
-    "class": atts["label-class"],
-    "name": atts.name
-  };
-};
-
-Template["afArrayField_settings"].rightColumnClass = function () {
-  var atts = this.atts || {};
-  return atts['input-col-class'] || "";
-};
+});
 
-Template["afArrayField_settings"].afFieldLabelAtts = function () {
-  var atts = this.atts || {};
-  return {
-    template: "bootstrap3",
-    "class": atts["label-class"],
-    "name": atts.name
-  };
-};
+Template["afArrayField_settings"].helpers({
+  rightColumnClass: function () {
+    var atts = this.atts || {};
+    return atts['input-col-class'] || "";
+  },
+  afFieldLabelAtts: function () {
+    var atts = this.atts || {};
+    return {
+      template: "bootstrap3",
+      "class": atts["label-class"],
+      "name": atts.name
+    };
+  }
+});

client/views/users/user_item.html

@@ -1,6 +1,6 @@
 <template name="user_item">
 <tr class="user">
-	<td>{{>avatar user=this}}</td>
+	<td>{{>avatar user=this class="circle"}}</td>
 	<td>
 		<a href="{{getProfileUrl}}">{{displayName}}</a>
 		<br/>