Merge remote-tracking branch 'upstream/master'

Author: leepope

.gitignore

@@ -35,6 +35,7 @@ config/discourse.pill
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+/logfile
 
 # Ignore Eclipse .project file
 /.project

CONTRIBUTING.md

@@ -42,16 +42,18 @@ Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/d
 3. Code
 
   Make some magic happen! Remember to:
+  
   * Adhere to conventions.
-  * Update CHANGELOG with a description of your work.
+  * Update CHANGELOG with a detailed description of your work.
   * Include tests, and ensure they pass.
   * Remember to check to see if your new functionality has an impact on our Documentation, and include updates as appropriate.
 
   Completing these steps will increase the chances of your code making it into **[Discourse/Discourse](https://github.com/discourse/discourse)**.
 
 4. Follow the Coding Conventions
 
- Discourse follows those code style conventions:
+ Discourse follows these general code style conventions:
+ 
  * two spaces, no tabs
  * no trailing whitespaces, blank lines should have no spaces
  * use spaces around operators, after commas, colons, semicolons, around `{` and before `}`
@@ -119,10 +121,10 @@ Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/d
   * Fill in some details about your potential patch including a meaningful title.
   * Click "Send pull request".
 
-  Once these steps are done, you will soon receive feedback from The Discourse team!
+  Thanks for that -- we'll get to your pull request ASAP, we love pull requests!
 
 10. Responding to Feedback
 
-  The Discourse team may recommend adjustments to your code, and this is perfectly normal. Part of interacting with a healthy open-source community requires you to be open to learning new techniques and strategies; *don't get discouraged!* Remember: if the Discourse team suggest changes to your code, **they care enough about your work that they want to include it**, and hope that you can assist by implementing those revisions on your own.
+  The Discourse team may recommend adjustments to your code. Part of interacting with a healthy open-source community requires you to be open to learning new techniques and strategies; *don't get discouraged!* Remember: if the Discourse team suggest changes to your code, **they care enough about your work that they want to include it**, and hope that you can assist by implementing those revisions on your own.
 
 [m]: http://meta.discourse.org

Gemfile

@@ -36,8 +36,6 @@ gem 'image_optim'
 # note: for image_sorcery to correctly work you need
 # sudo apt-get install -y imagemagick
 gem 'image_sorcery'
-# it patches stuff, I think we need it in prd
-gem 'jquery-rails'
 gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'

Gemfile.lock

@@ -16,7 +16,7 @@ GIT
 
 GIT
   remote: https://github.com/SamSaffron/message_bus
-  revision: 031a107bbe6e468caa67ff540485d70230d1c362
+  revision: 9c16e7ebaafaf2a3933a84fa1c517c0eba44b052
   specs:
     message_bus (0.0.2)
       eventmachine
@@ -243,9 +243,6 @@ GEM
       coffee-rails
       haml
     journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
     jshint_on_rails (1.0.2)
     json (1.7.7)
     jwt (0.1.8)
@@ -268,7 +265,7 @@ GEM
     minitest (4.7.3)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    multi_json (1.7.6)
     multipart-post (1.2.0)
     mustache (0.99.4)
     net-scp (1.1.0)
@@ -516,7 +513,6 @@ DEPENDENCIES
   image_optim
   image_sorcery
   jasminerice
-  jquery-rails
   jshint_on_rails
   librarian (>= 0.0.25)
   listen

Guardfile

@@ -58,10 +58,21 @@ unless ENV["USING_AUTOSPEC"]
   end
 end
 
+
 module ::Guard
   class AutoReload < ::Guard::Guard
 
     require File.dirname(__FILE__) + '/config/environment'
+
+    def self.message_bus
+      MessageBus::Instance.new.tap do |bus|
+        bus.site_id_lookup do
+          # this is going to be dev the majority of the time, if you have multisite configured in dev stuff may be different
+          "default"
+        end
+      end
+    end
+
     def run_on_change(paths)
       paths.map! do |p|
         hash = nil
@@ -73,8 +84,7 @@ module ::Guard
         p = p.sub /^app\/assets\/stylesheets/, "assets"
         {name: p, hash: hash}
       end
-      # target dev
-      MessageBus::Instance.new.publish "/file-change", paths
+      self.class.message_bus.publish "/file-change", paths
     end
 
     def run_all
@@ -85,7 +95,7 @@ end
 Thread.new do
   Listen.to('tmp/') do |modified,added,removed|
     modified.each do |m|
-      MessageBus::Instance.new.publish "/file-change", ["refresh"] if m =~ /refresh_browser/
+      Guard::AutoReload.message_bus.publish "/file-change", ["refresh"] if m =~ /refresh_browser/
     end
   end
 end

README.md

@@ -49,7 +49,7 @@ Discourse is built for the *next* 10 years of the Internet, so our requirements
   - Windows 8
 3. Modern small screen mobile/smartphones *as soon as possible*:
   - Windows Phone 8
-  - iOS 5+
+  - iOS 6+
   - Android 4.0+
 
 ## Built With

app/assets/images/default-apple-touch-icon.png

@@ -1,21 +1,29 @@
 /**
-  This controller supports the interface for reviewing email logs.
+  This controller supports email functionality.
 
-  @class AdminEmailLogsController
-  @extends Ember.ArrayController
+  @class AdminEmailIndexController
+  @extends Discourse.Controller
   @namespace Discourse
   @module Discourse
 **/
-Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Presence, {
+Discourse.AdminEmailIndexController = Discourse.Controller.extend(Discourse.Presence, {
 
   /**
     Is the "send test email" button disabled?
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: function() {
-    return this.blank('testEmailAddress');
-  }.property('testEmailAddress'),
+  sendTestEmailDisabled: Em.computed.empty('testEmailAddress'),
+
+  /**
+    Clears the 'sentTestEmail' property on successful send.
+
+    @method testEmailAddressChanged
+  **/
+  testEmailAddressChanged: function() {
+    this.set('sentTestEmail', false);
+  }.observes('testEmailAddress'),
+
 
   /**
     Sends a test email to the currently entered email address
@@ -26,7 +34,7 @@ Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Pres
     this.set('sentTestEmail', false);
 
     var adminEmailLogsController = this;
-    Discourse.ajax("/admin/email_logs/test", {
+    Discourse.ajax("/admin/email/test", {
       type: 'POST',
       data: { email_address: this.get('testEmailAddress') }
     }).then(function () {

app/assets/javascripts/admin/controllers/admin_email_logs_controller.js renamed to app/assets/javascripts/admin/controllers/admin_email_index_controller.js

@@ -0,0 +1,21 @@
+/**
+  This controller previews an email digest
+
+  @class AdminEmailPreviewDigestController
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.AdminEmailPreviewDigestController = Discourse.ObjectController.extend(Discourse.Presence, {
+
+  refresh: function() {
+    var model = this.get('model');
+    var controller = this;
+    controller.set('loading', true);
+    Discourse.EmailPreview.findDigest(this.get('lastSeen')).then(function (email) {
+      model.setProperties(email.getProperties('html_content', 'text_content'));
+      controller.set('loading', false);
+    })
+  }
+
+});

app/assets/javascripts/admin/controllers/admin_email_preview_digest_controller.js

@@ -1,15 +1,8 @@
 Discourse.AdminReportsController = Ember.ObjectController.extend({
   viewMode: 'table',
 
-  // true if we're viewing the table mode
-  viewingTable: function() {
-    return this.get('viewMode') === 'table';
-  }.property('viewMode'),
-
-  // true if we're viewing the bar chart mode
-  viewingBarChart: function() {
-    return this.get('viewMode') === 'barChart';
-  }.property('viewMode'),
+  viewingTable: Em.computed.equal('viewMode', 'table'),
+  viewingBarChart: Em.computed.equal('viewMode', 'barChart'),
 
   // Changes the current view mode to 'table'
   viewAsTable: function() {

app/assets/javascripts/admin/controllers/admin_reports_controller.js

@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.AdminSiteContentEditController = Discourse.ObjectController.extend({
+Discourse.AdminSiteContentEditController = Discourse.Controller.extend({
 
   saveDisabled: function() {
     if (this.get('saving')) return true;

app/assets/javascripts/admin/controllers/admin_site_content_edit_controller.js

@@ -15,7 +15,7 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
 
     @property filteredContent
   **/
-  filteredContent: (function() {
+  filteredContent: function() {
 
     // If we have no content, don't bother filtering anything
     if (!this.present('content')) return null;
@@ -37,7 +37,7 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
 
       return true;
     });
-  }).property('filter', 'content.@each', 'onlyOverridden'),
+  }.property('filter', 'content.@each', 'onlyOverridden'),
 
   /**
     Reset a setting to its default value

app/assets/javascripts/admin/controllers/admin_site_settings_controller.js

@@ -118,6 +118,7 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
   **/
   approveUsers: function() {
     Discourse.AdminUser.bulkApprove(this.get('content').filterProperty('selected'));
+    this.refreshUsers();
   }
 
 });

app/assets/javascripts/admin/controllers/admin_users_list_controller.js

@@ -20,8 +20,10 @@ Discourse.AdminApi = Discourse.Model.extend({
 
 Discourse.AdminApi.reopenClass({
   find: function() {
-    return Discourse.ajax("/admin/api").then(function(data) {
-      return Discourse.AdminApi.create(data);
+    var model = Discourse.AdminApi.create();
+    Discourse.ajax("/admin/api").then(function(data) {
+      model.setProperties(data);
     });
+    return model;
   }
 });

app/assets/javascripts/admin/models/admin_api.js

@@ -150,6 +150,28 @@ Discourse.AdminUser = Discourse.User.extend({
     });
   },
 
+  unblock: function() {
+    Discourse.ajax('/admin/users/' + this.id + '/unblock', {type: 'PUT'}).then(function() {
+      // succeeded
+      window.location.reload();
+    }, function(e) {
+      // failed
+      var error = Em.String.i18n('admin.user.unblock_failed', { error: "http: " + e.status + " - " + e.body });
+      bootbox.alert(error);
+    });
+  },
+
+  block: function() {
+    Discourse.ajax('/admin/users/' + this.id + '/block', {type: 'PUT'}).then(function() {
+      // succeeded
+      window.location.reload();
+    }, function(e) {
+      // failed
+      var error = Em.String.i18n('admin.user.block_failed', { error: "http: " + e.status + " - " + e.body });
+      bootbox.alert(error);
+    });
+  },
+
   sendActivationEmail: function() {
     Discourse.ajax('/users/' + this.get('username') + '/send_activation_email').then(function() {
       // succeeded
@@ -206,6 +228,9 @@ Discourse.AdminUser.reopenClass({
       user.set('can_approve', false);
       return user.set('selected', false);
     });
+
+    bootbox.alert(Em.String.i18n("admin.user.approve_bulk_success"));
+
     return Discourse.ajax("/admin/users/approve-bulk", {
       type: 'PUT',
       data: {

app/assets/javascripts/admin/models/admin_user.js

@@ -18,7 +18,7 @@ Discourse.EmailLog.reopenClass({
 
   findAll: function(filter) {
     var result = Em.A();
-    Discourse.ajax("/admin/email_logs.json", {
+    Discourse.ajax("/admin/email/logs.json", {
       data: { filter: filter }
     }).then(function(logs) {
       logs.each(function(log) {

app/assets/javascripts/admin/models/email_log.js

@@ -0,0 +1,21 @@
+/**
+  Our data model for showing a preview of an email
+
+  @class EmailPreview
+  @extends Discourse.Model
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.EmailPreview = Discourse.Model.extend({});
+
+Discourse.EmailPreview.reopenClass({
+  findDigest: function(last_seen_at) {
+    return $.ajax("/admin/email/preview-digest.json", {
+      data: {last_seen_at: last_seen_at}
+    }).then(function (result) {
+      return Discourse.EmailPreview.create(result);
+    });
+  }
+});
+
+

app/assets/javascripts/admin/models/email_preview.js

@@ -0,0 +1,17 @@
+/**
+  Our data model for representing the current email settings
+
+  @class EmailSettings
+  @extends Discourse.Model
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.EmailSettings = Discourse.Model.extend({});
+
+Discourse.EmailSettings.reopenClass({
+  find: function() {
+    return Discourse.ajax("/admin/email.json").then(function (settings) {
+      return Discourse.EmailSettings.create(settings);
+    });
+  }
+});

app/assets/javascripts/admin/models/email_settings.js

@@ -66,6 +66,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
 Discourse.FlaggedPost.reopenClass({
   findAll: function(filter) {
     var result = Em.A();
+    result.set('loading', true);
     Discourse.ajax("/admin/flags/" + filter + ".json").then(function(data) {
       var userLookup = {};
       data.users.each(function(u) {
@@ -76,6 +77,7 @@ Discourse.FlaggedPost.reopenClass({
         f.userLookup = userLookup;
         result.pushObject(f);
       });
+      result.set('loading', false);
     });
     return result;
   }

app/assets/javascripts/admin/models/flagged_post.js

@@ -81,7 +81,7 @@ Discourse.Group.reopenClass({
   findAll: function(){
     var list = Discourse.SelectableArray.create();
 
-    Discourse.ajax("/admin/groups").then(function(groups){
+    Discourse.ajax("/admin/groups.json").then(function(groups){
       groups.each(function(group){
         list.addObject(Discourse.Group.create(group));
       });

app/assets/javascripts/admin/models/group.js

@@ -10,10 +10,6 @@ Discourse.AdminApiRoute = Discourse.Route.extend({
 
   model: function() {
     return Discourse.AdminApi.find();
-  },
-
-  renderTemplate: function() {
-    this.render({into: 'admin/templates/admin'});
   }
 
 });