From f59c11b4ab05fb374b9b33f30384d2cafc2f9e07 Mon Sep 17 00:00:00 2001 From: cpradio Date: Mon, 31 Oct 2016 17:27:57 -0400 Subject: [PATCH 001/266] FIX: Advanced Search to utilize Category Selector so it can distinguish uncategorized from no category selected --- .../components/search-advanced-options.js.es6 | 24 +++++++++---------- .../components/search-advanced-options.hbs | 2 +- .../acceptance/search-full-test.js.es6 | 10 ++++---- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 index b45f54b530..4d154491b5 100644 --- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 +++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 @@ -60,7 +60,7 @@ export default Em.Component.extend({ this.setProperties({ searchedTerms: { username: '', - category: null, + category: '', group: [], badge: [], tags: [], @@ -167,21 +167,21 @@ export default Em.Component.extend({ const userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]); if ((!existingInput && userInput) || (existingInput && userInput && existingInput.id !== userInput.id)) - this.set('searchedTerms.category', userInput.id); + this.set('searchedTerms.category', [userInput]); } else if (isNaN(subcategories)) { const userInput = Discourse.Category.findSingleBySlug(subcategories[0]); if ((!existingInput && userInput) || (existingInput && userInput && existingInput.id !== userInput.id)) - this.set('searchedTerms.category', userInput.id); + this.set('searchedTerms.category', [userInput]); } else { const userInput = Discourse.Category.findById(subcategories[0]); if ((!existingInput && userInput) || (existingInput && userInput && existingInput.id !== userInput.id)) - this.set('searchedTerms.category', userInput.id); + this.set('searchedTerms.category', [userInput]); } } else - this.set('searchedTerms.category', null); + this.set('searchedTerms.category', ''); }, setSearchedTermValueForGroup() { @@ -278,16 +278,16 @@ export default Em.Component.extend({ @observes('searchedTerms.category') updateSearchTermForCategory() { const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX); - const categoryFilter = Discourse.Category.findById(this.get('searchedTerms.category')); + const categoryFilter = this.get('searchedTerms.category'); let searchTerm = this.get('searchTerm') || ''; const slugCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_SLUG) : null; const idCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_ID) : null; - if (categoryFilter && categoryFilter.length !== 0) { - const id = categoryFilter.id; - const slug = categoryFilter.slug; - if (categoryFilter && categoryFilter.parentCategory) { - const parentSlug = categoryFilter.parentCategory.slug; + if (categoryFilter && categoryFilter[0]) { + const id = categoryFilter[0].id; + const slug = categoryFilter[0].slug; + if (categoryFilter[0].parentCategory) { + const parentSlug = categoryFilter[0].parentCategory.slug; if (slugCategoryMatches) searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${parentSlug}:${slug}`); else if (idCategoryMatches) @@ -296,7 +296,7 @@ export default Em.Component.extend({ searchTerm += ` #${parentSlug}:${slug}`; this.set('searchTerm', searchTerm.trim()); - } else if (categoryFilter) { + } else { if (slugCategoryMatches) searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${slug}`); else if (idCategoryMatches) diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs index 554a2d689c..21322e0f3d 100644 --- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs +++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs @@ -13,7 +13,7 @@
- {{category-chooser value=searchedTerms.category}} + {{category-selector categories=searchedTerms.category single="true"}}
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6 index 29d863912d..9804e6db07 100644 --- a/test/javascripts/acceptance/search-full-test.js.es6 +++ b/test/javascripts/acceptance/search-full-test.js.es6 @@ -76,7 +76,7 @@ test("validate population of advanced search", assert => { andThen(() => { assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated'); - assert.ok(exists('.search-advanced-options .category-combobox .select2-choice .select2-chosen:contains("bug")'), 'has "bug" pre-populated'); + assert.ok(exists('.search-advanced-options .badge-category:contains("bug")'), 'has "bug" pre-populated'); //assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated'); //assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated'); assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated'); @@ -118,11 +118,13 @@ test("update category through advanced search ui", assert => { visit("/search"); fillIn('.search input.full-page-search', 'none'); click('.search-advanced-btn'); - selectDropdown('.search-advanced-options .category-combobox', 4); - click('.search-advanced-options'); // need to click off the combobox for the search-term to get updated + fillIn('.search-advanced-options .category-selector', 'faq'); + click('.search-advanced-options .category-selector'); + keyEvent('.search-advanced-options .category-selector', 'keydown', 8); + keyEvent('.search-advanced-options .category-selector', 'keydown', 9); andThen(() => { - assert.ok(exists('.search-advanced-options .category-combobox .select2-choice .select2-chosen:contains("faq")'), 'has "faq" populated'); + assert.ok(exists('.search-advanced-options .badge-category:contains("faq")'), 'has "faq" populated'); assert.equal(find('.search input.full-page-search').val(), "none #faq", 'has updated search term to "none #faq"'); }); }); From 764a572070aa065221a36c9fbb19ed3a9b483d09 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 2 Nov 2016 15:29:33 -0400 Subject: [PATCH 002/266] FIX: when subcategories with the same name exist, filtering by tags might use the wrong subcategory --- app/controllers/tags_controller.rb | 2 +- spec/controllers/tags_controller_spec.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 43e6f8aee9..dad7ee9512 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -270,7 +270,7 @@ class TagsController < ::ApplicationController page: params[:page], topic_ids: param_to_integer_list(:topic_ids), exclude_category_ids: params[:exclude_category_ids], - category: params[:category], + category: @filter_on_category ? @filter_on_category.id : params[:category], order: params[:order], ascending: params[:ascending], min_posts: params[:min_posts], diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index cc0ad376cd..7c2e7aff06 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/spec/controllers/tags_controller_spec.rb @@ -68,6 +68,19 @@ describe TagsController do xhr :get, :show_latest, tag_id: tag.name, category: 'none', parent_category: category.slug expect(response).to be_success end + + it "can handle subcategories with the same name" do + category2 = Fabricate(:category) + subcategory2 = Fabricate(:category, + parent_category_id: category2.id, + name: subcategory.name, + slug: subcategory.slug + ) + t = Fabricate(:topic, category_id: subcategory2.id, tags: [other_tag]) + xhr :get, :show_latest, tag_id: other_tag.name, category: subcategory2.slug, parent_category: category2.slug + expect(response).to be_success + expect(assigns(:list).topics).to include(t) + end end end From 3255a215ec8b213aefe049137cf6f63c1ffd32b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 3 Nov 2016 01:46:46 +0100 Subject: [PATCH 003/266] bump onebox --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 48c8b97299..9361ef7f4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.50) + onebox (1.5.60) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From 17169b3037037103a54317c1f03b86f1359ed1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 3 Nov 2016 02:26:12 +0100 Subject: [PATCH 004/266] FIX: issues with 'X-MSYS-API' custom header --- lib/email/sender.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 6e58a70434..8cad0c8067 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -203,11 +203,16 @@ module Email end def merge_json_x_header(name, value) - mc_metadata = JSON.parse(@message.header[name].to_s) rescue nil - mc_metadata ||= {} - mc_metadata.merge!(value) + data = JSON.parse(@message.header[name].to_s) rescue nil + data ||= {} + data.merge!(value) + # /!\ @message.header is not a standard ruby hash. + # It can have multiple values attached to the same key... + # In order to remove all the previous keys, we have to "nil" it. + # But for "nil" to work, there must already be a key... + @message.header[name] = "" @message.header[name] = nil - @message.header[name] = mc_metadata.to_json + @message.header[name] = data.to_json end end From 4ce99c998b6b77fce4b2590c17b921b3b76faa38 Mon Sep 17 00:00:00 2001 From: rizka10 Date: Thu, 3 Nov 2016 11:11:17 +0200 Subject: [PATCH 005/266] Improve summing poll percentages to 100 My first JavaScript! I have little experience with C++ and even less with Java, but that was enough to figure out a way to solve the task. The solution is rather good, but there may be better ways. I'm going to start a pull request. Even if it gets rejected, an expert can use the idea. NOTE: The code needs some serious testing before potential merging. I did some testing and it worked, but don't trust in my skills. --- .../assets/javascripts/lib/even-round.js.es6 | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/plugins/poll/assets/javascripts/lib/even-round.js.es6 b/plugins/poll/assets/javascripts/lib/even-round.js.es6 index 0395f1f16a..5446c874c5 100644 --- a/plugins/poll/assets/javascripts/lib/even-round.js.es6 +++ b/plugins/poll/assets/javascripts/lib/even-round.js.es6 @@ -1,17 +1,29 @@ -// stolen from http://stackoverflow.com/a/13484088/11983 +// works as described on http://stackoverflow.com/a/13483710 function sumsUpTo100(percentages) { return percentages.map(p => Math.floor(p)).reduce((a, b) => a + b) === 100; } export default (percentages) => { - const sumOfDecimals = Math.ceil(percentages.map(a => a % 1).reduce((a, b) => a + b)); - // compensate error by adding 1 to the first n "non-zero" items - for (let i = 0, max = percentages.length; i < sumOfDecimals && i < max; i++) { - if (percentages[i] > 0) { - percentages[i] = ++percentages[i]; - // quit early when there is a rounding issue - if (sumsUpTo100(percentages)) break; + var decimals = percentages.map(a => a % 1); + const sumOfDecimals = Math.ceil(decimals.reduce((a, b) => a + b)); + // compensate error by adding 1 to n items with the greatest decimal part + for (let i = 0, max = decimals.length; i < sumOfDecimals && i < max; i++) { + // find the greatest item in the decimals array, set it to 0, + // and increase the corresponding item in the percentages array by 1 + let greatest = 0; + let index = 0; + for (let j=0; j < decimals.length; j++) { + if (decimals[j] > greatest) { + index = j; + greatest = decimals[j]; + } } + ++percentages[index]; + decimals[index] = 0; + // quit early when there is a rounding issue + if (sumsUpTo100(percentages)) break; } + return percentages.map(p => Math.floor(p)); }; + From b825a6bc7f0c3b93e84f433cc3ffba2f6b382a75 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 3 Nov 2016 17:17:45 +0800 Subject: [PATCH 006/266] Move timecop to test group. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9e5b727f9a..023ad9f5de 100644 --- a/Gemfile +++ b/Gemfile @@ -122,6 +122,7 @@ end group :test do gem 'fakeweb', '~> 1.3.0', require: false gem 'minitest', require: false + gem 'timecop' end group :test, :development do @@ -138,7 +139,6 @@ group :test, :development do gem 'rspec-rails', require: false gem 'shoulda', require: false gem 'simplecov', require: false - gem 'timecop' gem 'rspec-given' gem 'rspec-html-matchers' gem 'spork-rails' From 464f5099413de02ec59f9e9fda9aca4b128790d8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 2 Nov 2016 13:38:54 -0400 Subject: [PATCH 007/266] In Ember 2.0 `this.resource` is deprecated --- .../admin/routes/admin-route-map.js.es6 | 50 +++++++++---------- .../discourse/mapping-router.js.es6 | 4 +- .../discourse/routes/app-route-map.js.es6 | 32 ++++++------ 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 index 69b51e5cab..9b1b2c72c2 100644 --- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 @@ -3,11 +3,11 @@ export default { map() { this.route('dashboard', { path: '/' }); - this.resource('adminSiteSettings', { path: '/site_settings' }, function() { - this.resource('adminSiteSettingsCategory', { path: 'category/:category_id'} ); + this.route('adminSiteSettings', { path: '/site_settings', resetNamespace: true }, function() { + this.route('adminSiteSettingsCategory', { path: 'category/:category_id', resetNamespace: true} ); }); - this.resource('adminEmail', { path: '/email'}, function() { + this.route('adminEmail', { path: '/email', resetNamespace: true}, function() { this.route('sent'); this.route('skipped'); this.route('bounced'); @@ -16,72 +16,72 @@ export default { this.route('previewDigest', { path: '/preview-digest' }); }); - this.resource('adminCustomize', { path: '/customize' } ,function() { + this.route('adminCustomize', { path: '/customize', resetNamespace: true } ,function() { this.route('colors'); - this.resource('adminCustomizeCssHtml', { path: 'css_html' }, function() { + this.route('adminCustomizeCssHtml', { path: 'css_html', resetNamespace: true }, function() { this.route('show', {path: '/:site_customization_id/:section'}); }); - this.resource('adminSiteText', { path: '/site_texts' }, function() { + this.route('adminSiteText', { path: '/site_texts', resetNamespace: true }, function() { this.route('edit', { path: '/:id' }); }); - this.resource('adminUserFields', { path: '/user_fields' }); - this.resource('adminEmojis', { path: '/emojis' }); - this.resource('adminPermalinks', { path: '/permalinks' }); - this.resource('adminEmbedding', { path: '/embedding' }); - this.resource('adminCustomizeEmailTemplates', { path: '/email_templates' }, function() { + this.route('adminUserFields', { path: '/user_fields', resetNamespace: true }); + this.route('adminEmojis', { path: '/emojis', resetNamespace: true }); + this.route('adminPermalinks', { path: '/permalinks', resetNamespace: true }); + this.route('adminEmbedding', { path: '/embedding', resetNamespace: true }); + this.route('adminCustomizeEmailTemplates', { path: '/email_templates', resetNamespace: true }, function() { this.route('edit', { path: '/:id' }); }); }); - this.resource('adminApi', { path: '/api' }, function() { - this.resource('adminApiKeys', { path: '/keys' }); + this.route('adminApi', { path: '/api', resetNamespace: true }, function() { + this.route('adminApiKeys', { path: '/keys', resetNamespace: true }); - this.resource('adminWebHooks', { path: '/web_hooks' }, function() { + this.route('adminWebHooks', { path: '/web_hooks', resetNamespace: true }, function() { this.route('show', { path: '/:web_hook_id' }); this.route('showEvents', { path: '/:web_hook_id/events' }); }); }); - this.resource('admin.backups', { path: '/backups' }, function() { + this.route('admin.backups', { path: '/backups', resetNamespace: true }, function() { this.route('logs'); }); - this.resource('adminReports', { path: '/reports/:type' }); + this.route('adminReports', { path: '/reports/:type', resetNamespace: true }); - this.resource('adminFlags', { path: '/flags' }, function() { + this.route('adminFlags', { path: '/flags', resetNamespace: true }, function() { this.route('list', { path: '/:filter' }); }); - this.resource('adminLogs', { path: '/logs' }, function() { + this.route('adminLogs', { path: '/logs', resetNamespace: true }, function() { this.route('staffActionLogs', { path: '/staff_action_logs' }); this.route('screenedEmails', { path: '/screened_emails' }); this.route('screenedIpAddresses', { path: '/screened_ip_addresses' }); this.route('screenedUrls', { path: '/screened_urls' }); }); - this.resource('adminGroups', { path: '/groups' }, function() { + this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() { this.route('bulk'); this.route('bulkComplete', { path: 'bulk-complete' }); - this.resource('adminGroupsType', { path: '/:type' }, function() { - this.resource('adminGroup', { path: '/:name' }); + this.route('adminGroupsType', { path: '/:type', resetNamespace: true }, function() { + this.route('adminGroup', { path: '/:name', resetNamespace: true }); }); }); - this.resource('adminUsers', { path: '/users' }, function() { - this.resource('adminUser', { path: '/:user_id/:username' }, function() { + this.route('adminUsers', { path: '/users', resetNamespace: true }, function() { + this.route('adminUser', { path: '/:user_id/:username', resetNamespace: true }, function() { this.route('badges'); this.route('tl3Requirements', { path: '/tl3_requirements' }); }); - this.resource('adminUsersList', { path: '/list' }, function() { + this.route('adminUsersList', { path: '/list', resetNamespace: true }, function() { this.route('show', { path: '/:filter' }); }); }); - this.resource('adminBadges', { path: '/badges' }, function() { + this.route('adminBadges', { path: '/badges', resetNamespace: true }, function() { this.route('show', { path: '/:badge_id' }); }); } diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6 index 0223dfe41b..306910624c 100644 --- a/app/assets/javascripts/discourse/mapping-router.js.es6 +++ b/app/assets/javascripts/discourse/mapping-router.js.es6 @@ -61,14 +61,14 @@ export function mapRoutes() { // Apply other resources next. A little hacky but works! standalone.forEach(function(r) { - router.resource(r, {path: paths[r]}, function() { + router.route(r, {path: paths[r], resetNamespace: true}, function() { var res = this; resources[r].forEach(function(m) { m.call(res); }); var s = segments[r]; if (s) { var full = r + '.' + s; - res.resource(s, {path: paths[full]}, function() { + res.route(s, {path: paths[full], resetNamespace: true}, function() { var nestedRes = this; resources[full].forEach(function(m) { m.call(nestedRes); }); }); diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index 002f998c35..76f3803c9f 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -4,17 +4,17 @@ export default function() { // Error page this.route('exception', { path: '/exception' }); - this.resource('about', { path: '/about' }); + this.route('about', { path: '/about', resetNamespace: true }); // Topic routes - this.resource('topic', { path: '/t/:slug/:id' }, function() { + this.route('topic', { path: '/t/:slug/:id', resetNamespace: true }, function() { this.route('fromParams', { path: '/' }); this.route('fromParamsNear', { path: '/:nearPost' }); }); - this.resource('topicBySlug', { path: '/t/:slug' }); + this.route('topicBySlug', { path: '/t/:slug', resetNamespace: true }); this.route('topicUnsubscribe', { path: '/t/:slug/:id/unsubscribe' }); - this.resource('discovery', { path: '/' }, function() { + this.route('discovery', { path: '/', resetNamespace: true }, function() { // top this.route('top'); this.route('topParentCategory', { path: '/c/:slug/l/top' }); @@ -50,7 +50,7 @@ export default function() { this.route(defaultHomepage(), { path: '/' }); }); - this.resource('group', { path: '/groups/:name' }, function() { + this.route('group', { path: '/groups/:name', resetNamespace: true }, function() { this.route('members'); this.route('posts'); this.route('topics'); @@ -59,10 +59,10 @@ export default function() { }); // User routes - this.resource('users'); - this.resource('user', { path: '/users/:username' }, function() { + this.route('users', { resetNamespace: true }); + this.route('user', { path: '/users/:username', resetNamespace: true }, function() { this.route('summary'); - this.resource('userActivity', { path: '/activity' }, function() { + this.route('userActivity', { path: '/activity', resetNamespace: true }, function() { this.route('topics'); this.route('replies'); this.route('likesGiven', {path: 'likes-given'}); @@ -70,7 +70,7 @@ export default function() { this.route('pending'); }); - this.resource('userNotifications', {path: '/notifications'}, function(){ + this.route('userNotifications', {path: '/notifications', resetNamespace: true}, function(){ this.route('responses'); this.route('likesReceived', { path: 'likes-received'}); this.route('mentions'); @@ -81,14 +81,14 @@ export default function() { this.route('flaggedPosts', { path: '/flagged-posts' }); this.route('deletedPosts', { path: '/deleted-posts' }); - this.resource('userPrivateMessages', { path: '/messages' }, function() { + this.route('userPrivateMessages', { path: '/messages', resetNamespace: true }, function() { this.route('sent'); this.route('archive'); this.route('group', { path: 'group/:name'}); this.route('groupArchive', { path: 'group/:name/archive'}); }); - this.resource('preferences', function() { + this.route('preferences', { resetNamespace: true }, function() { this.route('username'); this.route('email'); this.route('about', { path: '/about-me' }); @@ -96,7 +96,7 @@ export default function() { this.route('card-badge', { path: '/card-badge' }); }); - this.resource('userInvited', { path: '/invited' }, function() { + this.route('userInvited', { path: '/invited', resetNamespace: true }, function() { this.route('show', { path: '/:filter' }); }); @@ -114,15 +114,15 @@ export default function() { this.route('new-topic', {path: '/new-topic'}); this.route('new-message', {path: '/new-message'}); - this.resource('badges', function() { + this.route('badges', { resetNamespace: true }, function() { this.route('show', {path: '/:id/:slug'}); }); - this.resource('queued-posts', { path: '/queued-posts' }); + this.route('queued-posts', { path: '/queued-posts', resetNamespace: true }); this.route('full-page-search', {path: '/search'}); - this.resource('tags', function() { + this.route('tags', { resetNamespace: true }, function() { this.route('show', {path: '/:tag_id'}); this.route('showCategory', {path: '/c/:category/:tag_id'}); this.route('showParentCategory', {path: '/c/:parent_category/:category/:tag_id'}); @@ -135,7 +135,7 @@ export default function() { this.route('show', {path: 'intersection/:tag_id/*additional_tags'}); }); - this.resource('tagGroups', {path: '/tag_groups'}, function() { + this.route('tagGroups', {path: '/tag_groups', resetNamespace: true}, function() { this.route('show', {path: '/:id'}); }); } From 2d126cff8f138c55fcea6f6d24d13bf339592b03 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 2 Nov 2016 15:37:26 -0400 Subject: [PATCH 008/266] `Ember.String.fmt` is deprecated --- .../javascripts/discourse/lib/computed.js.es6 | 31 ++++++------------- .../javascripts/ember-addons/fmt.js.es6 | 24 ++++++++++++++ app/assets/javascripts/main_include.js | 1 + 3 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 app/assets/javascripts/ember-addons/fmt.js.es6 diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6 index 1fb7e745cb..02d38869fe 100644 --- a/app/assets/javascripts/discourse/lib/computed.js.es6 +++ b/app/assets/javascripts/discourse/lib/computed.js.es6 @@ -1,3 +1,4 @@ +import addonFmt from 'ember-addons/fmt'; /** Returns whether two properties are equal to each other. @@ -46,14 +47,10 @@ export function propertyLessThan(p1, p2) { @params {String} format the i18n format string @return {Function} computedProperty function **/ -export function i18n() { - const args = Array.prototype.slice.call(arguments, 0); +export function i18n(...args) { const format = args.pop(); - const computed = Em.computed(function() { - const self = this; - return I18n.t(format.fmt.apply(format, args.map(function (a) { - return self.get(a); - }))); + const computed = Ember.computed(function() { + return I18n.t(addonFmt(format, ...args.map(a => this.get(a)))); }); return computed.property.apply(computed, args); } @@ -67,14 +64,10 @@ export function i18n() { @params {String} format the format string @return {Function} computedProperty function **/ -export function fmt() { - const args = Array.prototype.slice.call(arguments, 0); +export function fmt(...args) { const format = args.pop(); - const computed = Em.computed(function() { - const self = this; - return format.fmt.apply(format, args.map(function (a) { - return self.get(a); - })); + const computed = Ember.computed(function() { + return addonFmt(format, ...args.map(a => this.get(a))); }); return computed.property.apply(computed, args); } @@ -88,14 +81,10 @@ export function fmt() { @params {String} format the format string for the URL @return {Function} computedProperty function returning a URL **/ -export function url() { - const args = Array.prototype.slice.call(arguments, 0); +export function url(...args) { const format = args.pop(); - const computed = Em.computed(function() { - const self = this; - return Discourse.getURL(format.fmt.apply(format, args.map(function (a) { - return self.get(a); - }))); + const computed = Ember.computed(function() { + return Discourse.getURL(addonFmt(format, ...args.map(a => this.get(a)))); }); return computed.property.apply(computed, args); } diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js.es6 new file mode 100644 index 0000000000..191fbe20ac --- /dev/null +++ b/app/assets/javascripts/ember-addons/fmt.js.es6 @@ -0,0 +1,24 @@ +import Ember from 'ember'; + +const inspect = Ember.inspect; +const isArray = Ember.isArray; + +export default function(str, formats) { + let cachedFormats = formats; + + if (!isArray(cachedFormats) || arguments.length > 2) { + cachedFormats = new Array(arguments.length - 1); + + for (let i = 1, l = arguments.length; i < l; i++) { + cachedFormats[i - 1] = arguments[i]; + } + } + + // first, replace any ORDERED replacements. + let idx = 0; // the current index for non-numerical replacements + return str.replace(/%@([0-9]+)?/g, function(s, argIndex) { + argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++; + s = cachedFormats[argIndex]; + return (s === null) ? '(null)' : (s === undefined) ? '' : inspect(s); + }); +} diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 440edeee65..96b3abcd9d 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -2,6 +2,7 @@ //= require ./ember-addons/decorator-alias //= require ./ember-addons/macro-alias //= require ./ember-addons/ember-computed-decorators +//= require ./ember-addons/fmt //= require_tree ./discourse-common //= require ./discourse //= require ./deprecated From 95c8d66fe09ecf3e77ca1ea70af1099740ea8616 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 2 Nov 2016 16:22:52 -0400 Subject: [PATCH 009/266] FIX: In Ember 2.0 you can't bind Query Parametrs like this --- .../controllers/admin-site-text-index.js.es6 | 35 ++++--------------- .../discourse/components/d-checkbox.js.es6 | 15 +++++--- .../templates/components/d-checkbox.hbs | 2 +- 3 files changed, 19 insertions(+), 33 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 index 0c770bd06b..bc2147e923 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 @@ -1,38 +1,14 @@ -import { default as computed } from 'ember-addons/ember-computed-decorators'; - let lastSearch; +let lastOverridden; export default Ember.Controller.extend({ - _q: null, searching: false, siteTexts: null, preferred: false, - _overridden: null, queryParams: ['q', 'overridden'], - @computed - overridden: { - set(value) { - if (!value || value === "false") { value = false; } - this._overridden = value; - return value; - }, - get() { - return this._overridden; - } - }, - - @computed - q: { - set(value) { - if (Ember.isEmpty(value)) { value = null; } - this._q = value; - return value; - }, - get() { - return this._q; - } - }, + q: null, + overridden: null, _performSearch() { this.store.find('site-text', this.getProperties('q', 'overridden')).then(results => { @@ -46,11 +22,14 @@ export default Ember.Controller.extend({ }, search(overridden) { + this.set('overridden', overridden); + const q = this.get('q'); - if (q !== lastSearch || overridden) { + if (q !== lastSearch || overridden !== lastOverridden) { this.set('searching', true); Ember.run.debounce(this, this._performSearch, 400); lastSearch = q; + lastOverridden = overridden; } } } diff --git a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 b/app/assets/javascripts/discourse/components/d-checkbox.js.es6 index bb15966c4d..5e50bf98ed 100644 --- a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 +++ b/app/assets/javascripts/discourse/components/d-checkbox.js.es6 @@ -3,16 +3,23 @@ import { on } from "ember-addons/ember-computed-decorators"; export default Ember.Component.extend({ tagName: 'label', - @on('didInsertElement') - _watchChanges() { + didInsertElement() { + this._super(); + + const checked = this.get('checked'); + if (checked && checked !== "false") { + this.$('input').prop('checked', true); + } + // In Ember 13.3 we can use action on the checkbox `{{input}}` but not in 1.11 this.$('input').on('click.d-checkbox', () => { - Ember.run.scheduleOnce('afterRender', () => this.sendAction('change', true)); + Ember.run.scheduleOnce('afterRender', () => this.sendAction('change', this.$('input').prop('checked'))); }); }, @on('willDestroyElement') - _stopWatching() { + willDestroyElement() { + this._super(); this.$('input').off('click.d-checkbox'); } }); diff --git a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs index b4bbae64a2..f39a68e79c 100644 --- a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs +++ b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs @@ -1,2 +1,2 @@ -{{input type="checkbox" checked=checked}} + {{i18n label}} From beac81d0ee67e08178d290eb1152611aa02df424 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 3 Nov 2016 11:52:30 -0400 Subject: [PATCH 010/266] Support both `_actions` and `actions` for delegating --- .../components/topic-footer-buttons.js.es6 | 13 +++---------- .../discourse/mixins/delegated-actions.js.es6 | 16 ++++++++++++++++ .../javascripts/discourse/widgets/widget.js.es6 | 9 +++++++-- app/assets/javascripts/main_include.js | 1 + 4 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 app/assets/javascripts/discourse/mixins/delegated-actions.js.es6 diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 index d9aad34dcc..aeb9db8baa 100644 --- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 @@ -1,6 +1,7 @@ import computed from 'ember-addons/ember-computed-decorators'; +import DelegatedActions from 'discourse/mixins/delegated-actions'; -export default Ember.Component.extend({ +export default Ember.Component.extend(DelegatedActions, { elementId: 'topic-footer-buttons', // Allow us to extend it @@ -8,15 +9,7 @@ export default Ember.Component.extend({ init() { this._super(); - - this._actions = this._actions || {}; - - (this.get('topicDelegated') || []).forEach(m => { - this._actions[m] = function() { - this.sendAction(m); - }; - this.set(m, m); - }); + this.delegateAll(this.get('topicDelegated')); }, @computed('topic.details.can_invite_to') diff --git a/app/assets/javascripts/discourse/mixins/delegated-actions.js.es6 b/app/assets/javascripts/discourse/mixins/delegated-actions.js.es6 new file mode 100644 index 0000000000..8940c1d49b --- /dev/null +++ b/app/assets/javascripts/discourse/mixins/delegated-actions.js.es6 @@ -0,0 +1,16 @@ + +export const TARGET_NAME = (Ember.VERSION[0] === "2") ? 'actions' : '_actions'; + +export default Ember.Mixin.create({ + + delegateAll(actionNames) { + actionNames = actionNames || []; + + this[TARGET_NAME] = this[TARGET_NAME] || {}; + + actionNames.forEach(m => { + this[TARGET_NAME][m] = function() { this.sendAction(m); }; + this.set(m, m); + }); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index bef20bf04e..851ad09bd9 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -1,6 +1,11 @@ -import { WidgetClickHook, WidgetClickOutsideHook, WidgetKeyUpHook, WidgetKeyDownHook, WidgetDragHook } from 'discourse/widgets/hooks'; +import { WidgetClickHook, + WidgetClickOutsideHook, + WidgetKeyUpHook, + WidgetKeyDownHook, + WidgetDragHook } from 'discourse/widgets/hooks'; import { h } from 'virtual-dom'; import DecoratorHelper from 'discourse/widgets/decorator-helper'; +import { TARGET_NAME } from 'discourse/mixins/delegated-actions'; function emptyContent() { } @@ -266,7 +271,7 @@ export default class Widget { if (target) { // TODO: Use ember closure actions - const actions = target._actions || target.actionHooks || {}; + const actions = target[TARGET_NAME] || target.actionHooks || {}; const method = actions[actionName]; if (method) { promise = method.call(target, param); diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 96b3abcd9d..c18248dffb 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -25,6 +25,7 @@ //= require ./discourse/lib/formatter //= require ./discourse/lib/eyeline //= require ./discourse/mixins/scrolling +//= require ./discourse/mixins/scrolling //= require ./discourse/models/model //= require ./discourse/models/rest //= require ./discourse/models/badge-grouping From a9d7569ddad9adac3b1f35fe2e6870451a3e4777 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 3 Nov 2016 13:09:43 -0400 Subject: [PATCH 011/266] Replace computed properties for topic query params --- .../components/toggle-deleted.js.es6 | 12 ---- .../discourse/controllers/topic.js.es6 | 58 +++++-------------- .../discourse/controllers/user-card.js.es6 | 4 +- .../discourse/models/post-stream.js.es6 | 12 +--- .../javascripts/discourse/models/topic.js.es6 | 1 - .../javascripts/discourse/routes/topic.js.es6 | 2 - .../templates/components/toggle-deleted.hbs | 7 --- .../models/post-stream-test.js.es6 | 15 +---- 8 files changed, 21 insertions(+), 90 deletions(-) delete mode 100644 app/assets/javascripts/discourse/components/toggle-deleted.js.es6 delete mode 100644 app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs diff --git a/app/assets/javascripts/discourse/components/toggle-deleted.js.es6 b/app/assets/javascripts/discourse/components/toggle-deleted.js.es6 deleted file mode 100644 index 72ad47d004..0000000000 --- a/app/assets/javascripts/discourse/components/toggle-deleted.js.es6 +++ /dev/null @@ -1,12 +0,0 @@ -export default Ember.Component.extend({ - layoutName: 'components/toggle-deleted', - tagName: 'section', - classNames: ['information'], - postStream: Em.computed.alias('topic.postStream'), - - actions: { - toggleDeleted: function() { - this.get('postStream').toggleDeleted(); - } - } -}); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 787196c4a0..b64e00a3c1 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -20,7 +20,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { editingTopic: false, selectedPosts: null, selectedReplies: null, - queryParams: ['filter', 'username_filters', 'show_deleted'], + queryParams: ['filter', 'username_filters'], loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'), enteredAt: null, enteredIndex: null, @@ -29,6 +29,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { _progressIndex: null, hasScrolled: null, + username_filters: null, + filter: null, + topicDelegated: [ 'toggleMultiSelect', 'deleteTopic', @@ -53,6 +56,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { 'showFlagTopic' ], + updateQueryParams() { + const postStream = this.get('model.postStream'); + this.setProperties(postStream.get('streamFilters')); + }, + _titleChanged: function() { const title = this.get('model.title'); if (!Ember.isEmpty(title)) { @@ -79,32 +87,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return this.capabilities.isAndroid && loading; }, - @computed('model.postStream.summary') - show_deleted: { - set(value) { - const postStream = this.get('model.postStream'); - if (!postStream) { return; } - postStream.set('show_deleted', value); - return postStream.get('show_deleted') ? true : undefined; - }, - get() { - return this.get('postStream.show_deleted') ? true : undefined; - } - }, - - @computed('model.postStream.summary') - filter: { - set(value) { - const postStream = this.get('model.postStream'); - if (!postStream) { return; } - postStream.set('summary', value === "summary"); - return postStream.get('summary') ? "summary" : undefined; - }, - get() { - return this.get('postStream.summary') ? "summary" : undefined; - } - }, - @computed('model', 'topicTrackingState.messageCount') browseMoreMessage(model) { @@ -157,19 +139,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { I18n.t("suggested_topics.title"); }, - @computed('model.postStream.streamFilters.username_filters') - username_filters: { - set(value) { - const postStream = this.get('model.postStream'); - if (!postStream) { return; } - postStream.set('streamFilters.username_filters', value); - return postStream.get('streamFilters.username_filters'); - }, - get() { - return this.get('postStream.streamFilters.username_filters'); - } - }, - _clearSelected: function() { this.set('selectedPosts', []); this.set('selectedReplies', []); @@ -259,7 +228,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, toggleSummary() { - return this.get('model.postStream').toggleSummary(); + return this.get('model.postStream').toggleSummary().then(() => { + this.updateQueryParams(); + }); }, removeAllowedUser(user) { @@ -464,7 +435,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, toggleParticipant(user) { - this.get('model.postStream').toggleParticipant(Em.get(user, 'username')); + const postStream = this.get('model.postStream'); + postStream.toggleParticipant(Ember.get(user, 'username')).then(() => { + this.updateQueryParams(); + }); }, editTopic() { diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6 index f7d7da11ad..985d977216 100644 --- a/app/assets/javascripts/discourse/controllers/user-card.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6 @@ -130,8 +130,8 @@ export default Ember.Controller.extend({ actions: { togglePosts(user) { - const postStream = this.get('postStream'); - postStream.toggleParticipant(user.get('username')); + const topicController = this.get('topic'); + topicController.send('toggleParticipant', user); this.close(); }, diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 2473b6660b..2ce7e1076d 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -80,11 +80,10 @@ export default RestModel.extend({ Returns a JS Object of current stream filter options. It should match the query params for the stream. **/ - @computed('summary', 'show_deleted', 'userFilters.[]') - streamFilters(summary, showDeleted) { + @computed('summary', 'userFilters.[]') + streamFilters(summary) { const result = {}; if (summary) { result.filter = "summary"; } - if (showDeleted) { result.show_deleted = true; } const userFilters = this.get('userFilters'); if (!Ember.isEmpty(userFilters)) { @@ -141,7 +140,6 @@ export default RestModel.extend({ cancelFilter() { this.set('summary', false); - this.set('show_deleted', false); this.get('userFilters').clear(); }, @@ -156,11 +154,6 @@ export default RestModel.extend({ }); }, - toggleDeleted() { - this.toggleProperty('show_deleted'); - return this.refresh(); - }, - jumpToSecondVisible() { const posts = this.get('posts'); if (posts.length > 1) { @@ -173,7 +166,6 @@ export default RestModel.extend({ toggleParticipant(username) { const userFilters = this.get('userFilters'); this.set('summary', false); - this.set('show_deleted', true); let jump = false; if (userFilters.contains(username)) { diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index e59c60029d..139b2ddcf7 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -556,7 +556,6 @@ Topic.reopenClass({ opts.userFilters.forEach(function(username) { data.username_filters.push(username); }); - data.show_deleted = true; } // Add the summary of filter if we have it diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 0ee442dde5..989d100432 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -14,7 +14,6 @@ const TopicRoute = Discourse.Route.extend({ queryParams: { filter: { replace: true }, username_filters: { replace: true }, - show_deleted: { replace: true } }, titleToken() { @@ -140,7 +139,6 @@ const TopicRoute = Discourse.Route.extend({ setupParams(topic, params) { const postStream = topic.get('postStream'); postStream.set('summary', Em.get(params, 'filter') === 'summary'); - postStream.set('show_deleted', !!Em.get(params, 'show_deleted')); const usernames = Em.get(params, 'username_filters'), userFilters = postStream.get('userFilters'); diff --git a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs deleted file mode 100644 index 5475461580..0000000000 --- a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#if postStream.show_deleted}} -

{{i18n 'deleted_filter.disabled_description'}}

- -{{else}} -

{{i18n 'deleted_filter.enabled_description'}}

- -{{/if}} diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6 index 7fa49fea3c..5f825d9fbc 100644 --- a/test/javascripts/models/post-stream-test.js.es6 +++ b/test/javascripts/models/post-stream-test.js.es6 @@ -190,20 +190,7 @@ test("streamFilters", function() { postStream.toggleParticipant(participant.username); deepEqual(postStream.get('streamFilters'), { username_filters: 'eviltrout', - show_deleted: true - }, "streamFilters contains the username we filtered and show_deleted"); - - postStream.toggleDeleted(); - deepEqual(postStream.get('streamFilters'), { - username_filters: 'eviltrout' - }, "streamFilters contains the username we filtered without show_deleted"); - - postStream.cancelFilter(); - postStream.toggleDeleted(); - deepEqual(postStream.get('streamFilters'), { - show_deleted: true - }, "streamFilters show_deleted only"); - + }, "streamFilters contains the username we filtered"); }); test("loading", function() { From a655e4b09259fa5a908416b0add303d7c710ac1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 3 Nov 2016 22:48:32 +0100 Subject: [PATCH 012/266] ensure we allow self oneboxing of login required sites --- lib/cooked_post_processor.rb | 4 +- lib/onebox/engine/discourse_local_onebox.rb | 128 +++++++----------- .../templates/discourse_topic_onebox.hbs | 6 +- lib/oneboxer.rb | 4 +- .../engine/discourse_local_onebox_spec.rb | 80 ++++------- 5 files changed, 76 insertions(+), 146 deletions(-) diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 5f06261c1b..cd563f12ed 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -300,10 +300,10 @@ class CookedPostProcessor } # apply oneboxes - Oneboxer.apply(@doc, topic_id: @post.topic_id) { |url| + Oneboxer.apply(@doc, topic_id: @post.topic_id) do |url| @has_oneboxes = true Oneboxer.onebox(url, args) - } + end # make sure we grab dimensions for oneboxed images oneboxed_images.each { |img| limit_size!(img) } diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb index 3e022e0526..37f7a487d7 100644 --- a/lib/onebox/engine/discourse_local_onebox.rb +++ b/lib/onebox/engine/discourse_local_onebox.rb @@ -3,118 +3,84 @@ module Onebox class DiscourseLocalOnebox include Engine - # we need to allow for multisite here - def self.is_on_site?(url) - Regexp.new("^#{Discourse.base_url.gsub(".","\\.")}.*$", true) === url.to_s - end - # Use this onebox before others def self.priority 1 end def self.===(other) - if other.kind_of?(URI) - uri = other - begin - route = Rails.application.routes.recognize_path(uri.path.sub(Discourse.base_uri, "")) - case route[:controller] - when 'uploads' - is_on_site?(other) - when 'topics' - # super will use matches_regexp to match the domain name - is_on_site?(other) - else - false - end - rescue ActionController::RoutingError - false - end - else - is_on_site?(other) - end + url = other.to_s + return false unless url[Discourse.base_url] + + path = url.sub(Discourse.base_url, "") + route = Rails.application.routes.recognize_path(path) + + !!(route[:controller] =~ /topics|uploads/) + rescue ActionController::RoutingError + false end def to_html - uri = URI::parse(@url) - route = Rails.application.routes.recognize_path(uri.path.sub(Discourse.base_uri, "")) - url = @url.sub(/[&?]source_topic_id=(\d+)/, "") - source_topic_id = $1.to_i + path = @url.sub(Discourse.base_url, "") + route = Rails.application.routes.recognize_path(path) - # Figure out what kind of onebox to show based on the URL case route[:controller] - when 'uploads' + when "uploads" then upload_html(path) + when "topics" then topic_html(path, route) + end + end - url.gsub!("http:", "https:") if SiteSetting.force_https - if File.extname(uri.path) =~ /^.(mov|mp4|webm|ogv)$/ - return "" - elsif File.extname(uri.path) =~ /^.(mp3|ogg|wav)$/ - return "" - else - return false + private + + def upload_html(path) + case File.extname(path) + when /^\.(mov|mp4|webm|ogv)$/ + "" + when /^\.(mp3|ogg|wav)$/ + "" end - when 'topics' + end + + def topic_html(path, route) + link = "#{@url}" + source_topic_id = @url[/[&?]source_topic_id=(\d+)/, 1].to_i - linked = "#{url}" if route[:post_number].present? && route[:post_number].to_i > 1 - # Post Link - post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number].to_i) - return linked unless post - return linked if post.hidden - return linked unless Guardian.new.can_see?(post) + post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number]) + return link if post.nil? || post.hidden || !Guardian.new.can_see?(post) topic = post.topic slug = Slug.for(topic.title) - excerpt = post.excerpt(SiteSetting.post_onebox_maxlength) - excerpt.gsub!("\n"," ") - # hack to make it render for now - excerpt.gsub!("[/quote]", "[quote]") + excerpt.gsub!(/[\r\n]+/, " ") + excerpt.gsub!("[/quote]", "[quote]") # don't break my quote + quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]#{excerpt}[/quote]" args = {} args[:topic_id] = source_topic_id if source_topic_id > 0 - cooked = PrettyText.cook(quote, args) - return cooked + PrettyText.cook(quote, args) else - # Topic Link - topic = Topic.where(id: route[:topic_id].to_i).includes(:user).first - return linked unless topic - return linked unless Guardian.new.can_see?(topic) + topic = Topic.find_by(id: route[:topic_id]) + return link if topic.nil? || !Guardian.new.can_see?(topic) - post = topic.posts.first + first_post = topic.ordered_posts.first - posters = topic.posters_summary.map do |p| - { - username: p[:user].username, - avatar: PrettyText.avatar_img(p[:user].avatar_template, 'tiny'), - description: p[:description], - extras: p[:extras] - } - end + args = { + topic: topic.id, + avatar: PrettyText.avatar_img(topic.user.avatar_template, "tiny"), + original_url: @url, + title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)), + category_html: CategoryBadge.html_for(topic.category), + quote: first_post.excerpt(SiteSetting.post_onebox_maxlength), + } - quote = post.excerpt(SiteSetting.post_onebox_maxlength) - args = { original_url: url, - title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)), - avatar: PrettyText.avatar_img(topic.user.avatar_template, 'tiny'), - posts_count: topic.posts_count, - last_post: FreedomPatches::Rails4.time_ago_in_words(topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose'), - age: FreedomPatches::Rails4.time_ago_in_words(topic.created_at, false, scope: :'datetime.distance_in_words_verbose'), - views: topic.views, - posters: posters, - quote: quote, - category_html: CategoryBadge.html_for(topic.category), - topic: topic.id } - - return Mustache.render(File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs"), args) + template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs") + Mustache.render(template, args) end end - rescue ActionController::RoutingError - nil - end - end end end diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs index b9ca0aff51..41a075db7f 100644 --- a/lib/onebox/templates/discourse_topic_onebox.hbs +++ b/lib/onebox/templates/discourse_topic_onebox.hbs @@ -1,11 +1,9 @@ diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index db6f184901..13d8152202 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -62,9 +62,7 @@ module Oneboxer onebox_links = doc.search("a.onebox") if onebox_links.present? onebox_links.each do |link| - if link['href'].present? - yield link['href'], link - end + yield(link['href'], link) if link['href'].present? end end diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb index 9cb7e84c0d..90f9bf4534 100644 --- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb +++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb @@ -1,17 +1,8 @@ require 'rails_helper' describe Onebox::Engine::DiscourseLocalOnebox do - it "matches for a topic url" do - url = "#{Discourse.base_url}/t/hot-topic" - expect(Onebox.has_matcher?(url)).to eq(true) - expect(Onebox::Matcher.new(url).oneboxed).to eq(described_class) - end - it "matches for a post url" do - url = "#{Discourse.base_url}/t/hot-topic/23/2" - expect(Onebox.has_matcher?(url)).to eq(true) - expect(Onebox::Matcher.new(url).oneboxed).to eq(described_class) - end + before { SiteSetting.external_system_avatars_enabled = false } context "for a link to a post" do let(:post) { Fabricate(:post) } @@ -36,13 +27,11 @@ describe Onebox::Engine::DiscourseLocalOnebox do it "returns some onebox goodness if post exists and can be seen" do url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}" - Guardian.any_instance.stubs(:can_see?).returns(true) html = Onebox.preview(url).to_s expect(html).to include(post2.excerpt) expect(html).to include(post2.topic.title) - url = "#{Discourse.base_url}#{post2.url}" - html = Onebox.preview(url).to_s + html = Onebox.preview("#{Discourse.base_url}#{post2.url}").to_s expect(html).to include(post2.user.username) expect(html).to include(post2.excerpt) end @@ -52,8 +41,6 @@ describe Onebox::Engine::DiscourseLocalOnebox do let(:post) { Fabricate(:post) } let(:topic) { post.topic } - before { topic.last_posted_at = Time.zone.now; topic.save; } # otherwise errors - it "returns a link if topic isn't found" do url = "#{Discourse.base_url}/t/not-found/123" expect(Onebox.preview(url).to_s).to eq("#{url}") @@ -67,16 +54,14 @@ describe Onebox::Engine::DiscourseLocalOnebox do it "replaces emoji in the title" do topic.update_column(:title, "Who wants to eat a :hamburger:") - expect(Onebox.preview(topic.url).to_s).to match(/hamburger.png/) + expect(Onebox.preview(topic.url).to_s).to match(/hamburger\.png/) end it "returns some onebox goodness if post exists and can be seen" do - SiteSetting.external_system_avatars_enabled = false - url = "#{topic.url}" Guardian.any_instance.stubs(:can_see?).returns(true) - html = Onebox.preview(url).to_s - expect(html).to include(topic.posts.first.user.username) - expect(html).to include("topic-info") + html = Onebox.preview(topic.url).to_s + expect(html).to include(topic.ordered_posts.first.user.username) + expect(html).to include("
") end end @@ -102,59 +87,42 @@ describe Onebox::Engine::DiscourseLocalOnebox do end context "When deployed to a subfolder" do - let(:base_url) { "http://test.localhost/subfolder" } let(:base_uri) { "/subfolder" } + let(:base_url) { "http://test.localhost#{base_uri}" } before do Discourse.stubs(:base_url).returns(base_url) Discourse.stubs(:base_uri).returns(base_uri) end - it "matches for a topic url" do - url = "#{Discourse.base_url}/t/hot-topic" - expect(Onebox.has_matcher?(url)).to eq(true) - expect(Onebox::Matcher.new(url).oneboxed).to eq(described_class) - end - - it "matches for a post url" do - url = "#{Discourse.base_url}/t/hot-topic/23/2" - expect(Onebox.has_matcher?(url)).to eq(true) - expect(Onebox::Matcher.new(url).oneboxed).to eq(described_class) - end - context "for a link to a post" do let(:post) { Fabricate(:post) } let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) } - it "returns a link if post isn't found" do - url = "#{Discourse.base_url}/t/not-exist/3/2" - expect(Onebox.preview(url).to_s).to eq("#{url}") - end - - it "returns a link if not allowed to see the post" do - url = "#{Discourse.base_url}#{post2.url}" - Guardian.any_instance.stubs(:can_see?).returns(false) - expect(Onebox.preview(url).to_s).to eq("#{url}") - end - - it "returns a link if post is hidden" do - hidden_post = Fabricate(:post, topic: post.topic, post_number: 2, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) - url = "#{Discourse.base_url}#{hidden_post.url}" - expect(Onebox.preview(url).to_s).to eq("#{url}") - end - it "returns some onebox goodness if post exists and can be seen" do url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}" Guardian.any_instance.stubs(:can_see?).returns(true) html = Onebox.preview(url).to_s expect(html).to include(post2.excerpt) expect(html).to include(post2.topic.title) - - url = "#{Discourse.base_url}#{post2.url}" - html = Onebox.preview(url).to_s - expect(html).to include(post2.user.username) - expect(html).to include(post2.excerpt) end end end + + context "When login_required is enabled" do + before { SiteSetting.login_required = true } + + context "for a link to a topic" do + let(:post) { Fabricate(:post) } + let(:topic) { post.topic } + + it "returns some onebox goodness if post exists and can be seen" do + html = Onebox.preview(topic.url).to_s + expect(html).to include(topic.ordered_posts.first.user.username) + expect(html).to include("
") + end + end + + end + end From 3277fb1c785eadd3f506448ea368cf4275e1515c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 4 Nov 2016 08:30:49 +0800 Subject: [PATCH 013/266] Remove unused gem. --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index 023ad9f5de..766c948480 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,6 @@ group :development do gem 'bullet', require: !!ENV['BULLET'] gem 'better_errors' gem 'binding_of_caller' - gem 'librarian', '>= 0.0.25', require: false gem 'annotate' gem 'foreman', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 9361ef7f4e..a61cc01697 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,9 +144,6 @@ GEM json (1.8.3) jwt (1.5.2) kgio (2.10.0) - librarian (0.1.2) - highline - thor (~> 0.15) libv8 (5.3.332.38.1) listen (0.7.3) logster (1.2.5) @@ -431,7 +428,6 @@ DEPENDENCIES htmlentities http_accept_language (~> 2.0.5) image_optim (= 0.20.2) - librarian (>= 0.0.25) listen (= 0.7.3) logster lru_redux From 83de81930f914cbe53cd478707cd4ca785cc5b52 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 4 Nov 2016 09:02:09 +0800 Subject: [PATCH 014/266] Update gems. --- Gemfile.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a61cc01697..fe14e6040b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - oj (2.14.3) + oj (2.17.5) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) @@ -221,7 +221,7 @@ GEM openid-redis-store (0.0.2) redis ruby-openid - pg (0.18.4) + pg (0.19.0) progress (3.1.1) pry (0.10.4) coderay (~> 1.1.0) @@ -270,7 +270,7 @@ GEM activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.16.0) + raindrops (0.17.0) rake (11.2.2) rake-compiler (0.9.9) rake @@ -281,7 +281,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) trollop (>= 1.16.2) - redis (3.3.0) + redis (3.3.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) rest-client (1.8.0) @@ -342,9 +342,10 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.2) + sidekiq (4.2.4) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) sidekiq-statistic (1.2.0) sidekiq (>= 3.3.4, < 5) @@ -388,7 +389,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.1) - unicorn (5.1.0) + unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.10.0) From 5f98cc8c3e96375e6aee3da13d4b7790e9ff0fc0 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 4 Nov 2016 10:08:01 +0800 Subject: [PATCH 015/266] Fix typo. --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d40510aea4..c726595eb3 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3270,7 +3270,7 @@ en: contact_url: label: "Web Page" placeholder: "http://www.example.com/contact-us" - description: "General contact web page for you or your oganization. Will be displayed on your about page." + description: "General contact web page for you or your organization. Will be displayed on your about page." site_contact: label: "Automated Messages" description: "All automated Discourse personal messages will be sent from this user. Most importantly, this user will be the designated sender of every welcome message automatically sent to new users." From b26368709e89efaf53329d4e1c30414bc4e8cc72 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 4 Nov 2016 16:53:13 +0800 Subject: [PATCH 016/266] FIX: Unescape emojis in composer topic title. --- app/assets/javascripts/discourse/models/composer.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 3bfdcc904a..a3d8f84364 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -5,6 +5,7 @@ import Quote from 'discourse/lib/quote'; import Draft from 'discourse/models/draft'; import computed from 'ember-addons/ember-computed-decorators'; import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities'; +import { emojiUnescape } from 'discourse/lib/text'; const CLOSED = 'closed', SAVING = 'saving', @@ -174,7 +175,7 @@ const Composer = RestModel.extend({ case REPLY: case EDIT: if (postDescription) return postDescription; - if (topic) return I18n.t('post.reply_topic', { link: topicLink }); + if (topic) return emojiUnescape(I18n.t('post.reply_topic', { link: topicLink })); } }.property('action', 'post', 'topic', 'topic.title'), From 9fd317306cee7ea877298db808d730272a349580 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 4 Nov 2016 17:06:53 +0800 Subject: [PATCH 017/266] FIX: Do not show educational message for PMs. --- lib/composer_messages_finder.rb | 4 +++- .../composer_messages_finder_spec.rb | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb index 86f03680d9..551222b131 100644 --- a/lib/composer_messages_finder.rb +++ b/lib/composer_messages_finder.rb @@ -17,6 +17,8 @@ class ComposerMessagesFinder # Determines whether to show the user education text def check_education_message + return '' if @topic && @topic.archetype == Archetype.private_message + if creating_topic? count = @user.created_topic_count education_key = 'education.new-topic' @@ -35,7 +37,7 @@ class ComposerMessagesFinder } end - nil + '' end # New users have a limited number of replies in a topic diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb index d4e0aaedc6..706c8f7f0c 100644 --- a/spec/components/composer_messages_finder_spec.rb +++ b/spec/components/composer_messages_finder_spec.rb @@ -41,6 +41,26 @@ describe ComposerMessagesFinder do end end + context 'private message' do + let(:topic) { Fabricate(:private_message_topic) } + + context 'starting a new private message' do + let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'createTopic', topic_id: topic.id) } + + it 'should return an empty string' do + expect(finder.check_education_message).to eq('') + end + end + + context 'replying to a private message' do + let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'reply', topic_id: topic.id) } + + it 'should return an empty string' do + expect(finder.check_education_message).to eq('') + end + end + end + context 'creating reply' do let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'reply') } From dd58c006990f99c81beace2dac3a8f9a3e3d29a0 Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Fri, 4 Nov 2016 15:18:18 +0100 Subject: [PATCH 018/266] FEATURE: Add instance id in the webhook payload --- app/jobs/regular/emit_web_hook_event.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb index 87e273376f..72e5f5923a 100644 --- a/app/jobs/regular/emit_web_hook_event.rb +++ b/app/jobs/regular/emit_web_hook_event.rb @@ -46,6 +46,7 @@ module Jobs 'Content-Type' => content_type, 'Host' => uri.host, 'User-Agent' => "Discourse/" + Discourse::VERSION::STRING, + 'X-Discourse-Instance' => Discourse.base_url, 'X-Discourse-Event-Id' => web_hook_event.id, 'X-Discourse-Event-Type' => @opts[:event_type] } From c8282e4ca1f106487d028e43355163d95a4e835b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 3 Nov 2016 13:51:16 -0400 Subject: [PATCH 019/266] FIX: We're running code outside of the runloop --- .../javascripts/discourse/components/d-editor.js.es6 | 8 +++++++- .../discourse/components/topic-navigation.js.es6 | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 322959422f..e6dd2804dd 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -278,7 +278,13 @@ export default Ember.Component.extend({ @observes('ready', 'value') _watchForChanges() { if (!this.get('ready')) { return; } - Ember.run.debounce(this, this._updatePreview, 30); + + // Debouncing in test mode is complicated + if (Ember.testing) { + this._updatePreview(); + } else { + Ember.run.debounce(this, this._updatePreview, 30); + } }, _applyCategoryHashtagAutocomplete(container) { diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6 index 1dd1e81216..579f9959f1 100644 --- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6 @@ -4,7 +4,7 @@ export default Ember.Component.extend({ composerOpen: null, info: Em.Object.create(), - _checkSize() { + _performCheckSize() { if (!this.element || this.isDestroying || this.isDestroyed) { return; } let info = this.get('info'); @@ -39,6 +39,10 @@ export default Ember.Component.extend({ } }, + _checkSize() { + Ember.run.scheduleOnce('afterRender', this, this._performCheckSize); + }, + // we need to store this so topic progress has something to init with _topicScrolled(event) { this.set('info.prevEvent', event); @@ -62,7 +66,7 @@ export default Ember.Component.extend({ composerOpened() { this.set('composerOpen', true); // we need to do the check after animation is done - setTimeout(()=>this._checkSize(), 500); + Ember.run.later(() => this._checkSize(), 500); }, composerClosed() { @@ -112,7 +116,7 @@ export default Ember.Component.extend({ $('#reply-control').on('div-resized.discourse-topic-navigation', () => this._checkSize()); } - Ember.run.scheduleOnce('afterRender', this, this._checkSize); + this._checkSize(); }, willDestroyElement() { From e18ae3449398cd2553fd2c81c033b7230481718f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 3 Nov 2016 14:15:26 -0400 Subject: [PATCH 020/266] Don't try injecting into the Resolver. Use options instead. --- .../javascripts/discourse-common/resolver.js.es6 | 11 +++++++++-- .../javascripts/discourse/initializers/mobile.js.es6 | 6 +++--- test/javascripts/ember/resolver-test.js.es6 | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6 index 15c099cc28..a3068b91b1 100644 --- a/app/assets/javascripts/discourse-common/resolver.js.es6 +++ b/app/assets/javascripts/discourse-common/resolver.js.es6 @@ -9,6 +9,13 @@ var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin var _dummyRoute; var _loadingView; + +const _options = {}; + +export function setResolverOption(name, value) { + _options[name] = value; +} + function loadingResolver(cb) { return function(parsedName) { var fullNameWithoutType = parsedName.fullNameWithoutType; @@ -158,14 +165,14 @@ export function buildResolver(baseName) { }, findPluginMobileTemplate(parsedName) { - if (this.mobileView) { + if (_options.mobileView) { var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/")); return this.findTemplate(pluginParsedName); } }, findMobileTemplate(parsedName) { - if (this.mobileView) { + if (_options.mobileView) { var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/")); return this.findTemplate(mobileParsedName); } diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6 index 2ac54497b2..8c057a425f 100644 --- a/app/assets/javascripts/discourse/initializers/mobile.js.es6 +++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6 @@ -1,18 +1,18 @@ import Mobile from 'discourse/lib/mobile'; +import { setResolverOption } from 'discourse-common/resolver'; // Initializes the `Mobile` helper object. export default { name: 'mobile', after: 'inject-objects', - initialize(container, app) { + initialize(container) { Mobile.init(); const site = container.lookup('site:main'); site.set('mobileView', Mobile.mobileView); site.set('isMobileDevice', Mobile.isMobileDevice); - // This is a bit weird but you can't seem to inject into the resolver? - app.registry.resolver.__resolver__.mobileView = Mobile.mobileView; + setResolverOption('mobileView', Mobile.mobileView); } }; diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6 index 1c81f96df5..648729d6bd 100644 --- a/test/javascripts/ember/resolver-test.js.es6 +++ b/test/javascripts/ember/resolver-test.js.es6 @@ -1,4 +1,4 @@ -import { buildResolver } from 'discourse-common/resolver'; +import { setResolverOption, buildResolver } from 'discourse-common/resolver'; let originalTemplates; let resolver; @@ -92,7 +92,7 @@ test("resolves mobile templates to 'mobile/' namespace", function() { "baz" ]); - resolver.mobileView = true; + setResolverOption('mobileView', true); lookupTemplate("template:foo", "mobile/foo", "finding mobile version even if normal one is not present"); lookupTemplate("template:bar", "mobile/bar", "preferring mobile version when both mobile and normal versions are present"); From 5febbd58cca02e7627b117d5f29c444996035786 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 3 Nov 2016 14:52:14 -0400 Subject: [PATCH 021/266] The initializer arguments changed in future Ember releases --- app/assets/javascripts/discourse.js.es6 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6 index cbbc0bf9cf..9012e8301b 100644 --- a/app/assets/javascripts/discourse.js.es6 +++ b/app/assets/javascripts/discourse.js.es6 @@ -104,7 +104,14 @@ const Discourse = Ember.Application.extend({ if (/\/pre\-initializers\//.test(key)) { const module = require(key, null, null, true); if (!module) { throw new Error(key + ' must export an initializer.'); } - Discourse.initializer(module.default); + + const init = module.default; + const oldInitialize = init.initialize; + init.initialize = function() { + oldInitialize.call(this, Discourse.__container__, Discourse); + }; + + Discourse.initializer(init); } }); @@ -115,8 +122,8 @@ const Discourse = Ember.Application.extend({ const init = module.default; const oldInitialize = init.initialize; - init.initialize = function(app) { - oldInitialize.call(this, app.container, Discourse); + init.initialize = function() { + oldInitialize.call(this, Discourse.__container__, Discourse); }; Discourse.instanceInitializer(init); From fe07200dbf78965595df01374987285c1fd8f018 Mon Sep 17 00:00:00 2001 From: Mohamad Abras Date: Fri, 4 Nov 2016 23:12:03 +0200 Subject: [PATCH 022/266] refinement Arabic translation of NGINX plugin --- .../config/locales/server.ar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml index 0c401c64f6..65b70e00fb 100644 --- a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml +++ b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml @@ -1,3 +1,3 @@ ar: site_settings: - daily_performance_report: "تحليل سجلات NGINX يومي ونشر موضوع \"قاقم فقط\" مع التفاصيل" + daily_performance_report: "تحليل سجلّات الخادم NGINX يوميًا ونشر موضوع مفصّل مع طاقم الموقع" From 36127b6ecad4ab3cd1be7dedaf690702057abc43 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sun, 6 Nov 2016 15:23:18 +0530 Subject: [PATCH 023/266] update onebox gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe14e6040b..10a495336a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.60) + onebox (1.5.61) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From 3aa22715af388bc6ed76305a4799566f6980c057 Mon Sep 17 00:00:00 2001 From: Kiffin Gish Date: Sun, 6 Nov 2016 20:14:09 +0100 Subject: [PATCH 024/266] A new guard for changing post timestamps called can_change_post_timestamps? --- app/controllers/topics_controller.rb | 2 +- lib/guardian/post_guardian.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 1a15adc5b5..404495c06f 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -492,7 +492,7 @@ class TopicsController < ApplicationController params.require(:topic_id) params.require(:timestamp) - guardian.ensure_can_change_post_owner! + guardian.ensure_can_change_post_timestamps! begin PostTimestampChanger.new( topic_id: params[:topic_id].to_i, diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 6dc74106d9..c928290efe 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -185,6 +185,10 @@ module PostGuardian is_admin? end + def can_change_post_timestamps? + is_admin? + end + def can_wiki?(post) return false unless authenticated? return true if is_staff? || @user.has_trust_level?(TrustLevel[4]) From 2ddabc3928e377ee0757c603c66c4ca767350c40 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 7 Nov 2016 12:48:00 +1100 Subject: [PATCH 025/266] FIX: protect against future regressions of google omniauth --- lib/auth/google_oauth2_authenticator.rb | 7 +++-- .../auth/google_oauth2_authenticator_spec.rb | 31 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb index c51e5a01d0..ec1f386ea7 100644 --- a/lib/auth/google_oauth2_authenticator.rb +++ b/lib/auth/google_oauth2_authenticator.rb @@ -18,8 +18,11 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator user_info = GoogleUserInfo.find_by(google_user_id: google_hash[:google_user_id]) result.user = user_info.try(:user) - if !result.user && !result.email.blank? && result.user = User.find_by_email(result.email) - GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash)) + if !result.user && !result.email.blank? && result.email_valid + result.user = User.find_by_email(result.email) + if result.user + GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash)) + end end result diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb index ecf5230d50..db28abfd22 100644 --- a/spec/components/auth/google_oauth2_authenticator_spec.rb +++ b/spec/components/auth/google_oauth2_authenticator_spec.rb @@ -6,9 +6,36 @@ load 'auth/google_oauth2_authenticator.rb' describe Auth::GoogleOAuth2Authenticator do + it 'does not look up user unless email is verified' do + # note, emails that come back from google via omniauth are always valid + # this protects against future regressions + + authenticator = Auth::GoogleOAuth2Authenticator.new + user = Fabricate(:user) + + hash = { + :uid => "123456789", + :info => { + :name => "John Doe", + :email => user.email + }, + :extra => { + :raw_info => { + :email => user.email, + :email_verified => false, + :name => "John Doe" + } + } + } + + result = authenticator.after_authenticate(hash) + + expect(result.user).to eq(nil) + end + context 'after_authenticate' do it 'can authenticate and create a user record for already existing users' do - authenticator = described_class.new + authenticator = Auth::GoogleOAuth2Authenticator.new user = Fabricate(:user) hash = { @@ -19,7 +46,7 @@ describe Auth::GoogleOAuth2Authenticator do }, :extra => { :raw_info => { - :email => "user@domain.example.com", + :email => user.email, :email_verified => true, :name => "John Doe" } From 9375dcb6fe8ac5576f3a865496aadc5065a24641 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 7 Nov 2016 14:54:39 +0800 Subject: [PATCH 026/266] PERF: Spawn a seperate timer task to check if Redis master is up. --- lib/discourse_redis.rb | 50 +++++++++++-------------- spec/components/discourse_redis_spec.rb | 41 +++++++++----------- 2 files changed, 38 insertions(+), 53 deletions(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index f3f4993c81..b90aa0c079 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -14,18 +14,20 @@ class DiscourseRedis @running = false @mutex = Mutex.new @slave_config = DiscourseRedis.slave_config + @timer_task = init_timer_task end def verify_master synchronize do - return if @running || recently_checked? - @running = true + return if @timer_task.running? end - Thread.new { initiate_fallback_to_master } + @timer_task.execute end def initiate_fallback_to_master + success = false + begin slave_client = ::Redis::Client.new(@slave_config) logger.info "#{log_prefix}: Checking connection to master server..." @@ -39,13 +41,14 @@ class DiscourseRedis Discourse.clear_readonly! Discourse.request_refresh! - @master = true + self.master = true + success = true end ensure - @running = false - @last_checked = Time.zone.now slave_client.disconnect end + + success end def master @@ -56,23 +59,18 @@ class DiscourseRedis synchronize { @master = args } end - def recently_checked? - if @last_checked - Time.zone.now <= (@last_checked + 5.seconds) - else - false - end - end - - # Used for testing - def reset! - @master = true - @last_checked = nil - @running = false + def running? + synchronize { @timer_task.running? } end private + def init_timer_task + Concurrent::TimerTask.new(execution_interval: 10) do |task| + task.shutdown if initiate_fallback_to_master + end + end + def synchronize @mutex.synchronize { yield } end @@ -87,9 +85,6 @@ class DiscourseRedis end class Connector < Redis::Client::Connector - MASTER = 'master'.freeze - SLAVE = 'slave'.freeze - def initialize(options) super(options) @slave_options = DiscourseRedis.slave_config(options) @@ -97,21 +92,18 @@ class DiscourseRedis end def resolve - - return @options unless @slave_options[:host] + return @slave_options if !@fallback_handler.master begin options = @options.dup options.delete(:connector) - client = ::Redis::Client.new(options) - client.call([:role])[0] + client = Redis::Client.new(options) + client.call([:role]) @options rescue Redis::ConnectionError, Redis::CannotConnectError, RuntimeError => ex - # A consul service name may be deregistered for a redis container setup raise ex if ex.class == RuntimeError && ex.message != "Name or service not known" - - return @slave_options if !@fallback_handler.master @fallback_handler.master = false + @fallback_handler.verify_master unless @fallback_handler.running? raise ex ensure client.disconnect diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb index 0535d8fc37..730db985b5 100644 --- a/spec/components/discourse_redis_spec.rb +++ b/spec/components/discourse_redis_spec.rb @@ -42,7 +42,7 @@ describe DiscourseRedis do it 'should return the slave config when master is down' do begin - Redis::Client.any_instance.expects(:call).raises(Redis::CannotConnectError).twice + Redis::Client.any_instance.expects(:call).raises(Redis::CannotConnectError).once expect { connector.resolve }.to raise_error(Redis::CannotConnectError) config = connector.resolve @@ -58,7 +58,7 @@ describe DiscourseRedis do begin error = RuntimeError.new('Name or service not known') - Redis::Client.any_instance.expects(:call).raises(error).twice + Redis::Client.any_instance.expects(:call).raises(error).once expect { connector.resolve }.to raise_error(error) config = connector.resolve @@ -79,34 +79,27 @@ describe DiscourseRedis do describe DiscourseRedis::FallbackHandler do after do - fallback_handler.reset! + fallback_handler.master = true end describe '#initiate_fallback_to_master' do - it 'should fallback to the master server once it is up' do - begin - fallback_handler.master = false - Redis::Client.any_instance.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS) - - DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type| - Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', connection_type]]) - end - - fallback_handler.initiate_fallback_to_master - - expect(fallback_handler.master).to eq(true) - expect(Discourse.recently_readonly?).to eq(false) - ensure - fallback_handler.master = true - end + it 'should return the right value if the master server is still down' do + fallback_handler.master = false + Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff") + expect(fallback_handler.initiate_fallback_to_master).to eq(false) end - it "should restrict the number of checks" do - expect { fallback_handler.verify_master }.to change { Thread.list.count }.by(1) - expect(fallback_handler.master).to eq(true) - + it 'should fallback to the master server once it is up' do fallback_handler.master = false - expect { fallback_handler.verify_master }.to_not change { Thread.list.count } + Redis::Client.any_instance.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS) + + DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type| + Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', connection_type]]) + end + + expect(fallback_handler.initiate_fallback_to_master).to eq(true) + expect(fallback_handler.master).to eq(true) + expect(Discourse.recently_readonly?).to eq(false) end end end From fbbcde1230f220c0e359598187ca66630e462bf2 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 7 Nov 2016 15:28:10 +0800 Subject: [PATCH 027/266] FIX: Don't treat master as up if it is still loading data. --- lib/discourse_redis.rb | 4 ++-- spec/components/discourse_redis_spec.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index b90aa0c079..9ed43c4e3a 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -98,8 +98,8 @@ class DiscourseRedis options = @options.dup options.delete(:connector) client = Redis::Client.new(options) - client.call([:role]) - @options + loading = client.call([:info]).split("\r\n").include?("loading:1") + loading ? @slave_options : @options rescue Redis::ConnectionError, Redis::CannotConnectError, RuntimeError => ex raise ex if ex.class == RuntimeError && ex.message != "Name or service not known" @fallback_handler.master = false diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb index 730db985b5..8cc8c76d47 100644 --- a/spec/components/discourse_redis_spec.rb +++ b/spec/components/discourse_redis_spec.rb @@ -70,6 +70,18 @@ describe DiscourseRedis do end end + it "should return the slave config when master is still loading data" do + begin + Redis::Client.any_instance.expects(:call).with([:info]).returns("someconfig:haha\r\nloading:1") + config = connector.resolve + + expect(config[:host]).to eq(slave_host) + expect(config[:port]).to eq(slave_port) + ensure + fallback_handler.master = true + end + end + it "should raise the right error" do error = RuntimeError.new('test error') Redis::Client.any_instance.expects(:call).raises(error).twice From aa80c8cbdd0bc4b68a35a3c0b01857c7669c3dbd Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 7 Nov 2016 11:06:32 -0500 Subject: [PATCH 028/266] FIX: Support optional logos when previewing the wizard --- app/assets/javascripts/wizard/lib/preview.js.es6 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6 index a5e8371eb2..17cfe560ff 100644 --- a/app/assets/javascripts/wizard/lib/preview.js.es6 +++ b/app/assets/javascripts/wizard/lib/preview.js.es6 @@ -126,8 +126,11 @@ export function createPreviewComponent(width, height, obj) { // Logo const headerMargin = headerHeight * 0.2; const logoHeight = headerHeight - (headerMargin * 2); - const logoWidth = (logoHeight / this.logo.height) * this.logo.width; - this.scaleImage(this.logo, headerMargin, headerMargin, logoWidth, logoHeight); + + if (this.logo) { + const logoWidth = (logoHeight / this.logo.height) * this.logo.width; + this.scaleImage(this.logo, headerMargin, headerMargin, logoWidth, logoHeight); + } // Top right menu this.scaleImage(this.avatar, width - avatarSize - headerMargin, headerMargin, avatarSize, avatarSize); From bc2c6b0918c10467d40aa690919917d9090c7b84 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 7 Nov 2016 12:11:52 -0500 Subject: [PATCH 029/266] FIX: Allow arrays of links for decorators --- .../javascripts/discourse/widgets/hamburger-menu.js.es6 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index c944c40203..f0e5319eb6 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -3,6 +3,8 @@ import { h } from 'virtual-dom'; import DiscourseURL from 'discourse/lib/url'; import { ajax } from 'discourse/lib/ajax'; +const flatten = array => [].concat.apply([], array); + createWidget('priority-faq-link', { tagName: 'a.faq-priority.widget-link', @@ -105,8 +107,7 @@ export default createWidget('hamburger-menu', { links.push({ route: 'tags', label: 'tagging.tags' }); } - const extraLinks = applyDecorators(this, 'generalLinks', this.attrs, this.state); - + const extraLinks = flatten(applyDecorators(this, 'generalLinks', this.attrs, this.state)); return links.concat(extraLinks).map(l => this.attach('link', l)); }, @@ -165,7 +166,7 @@ export default createWidget('hamburger-menu', { if (currentUser && currentUser.staff) { results.push(this.attach('menu-links', { contents: () => { - const extraLinks = applyDecorators(this, 'admin-links', this.attrs, this.state) || []; + const extraLinks = flatten(applyDecorators(this, 'admin-links', this.attrs, this.state)); return this.adminLinks().concat(extraLinks); }})); } From 9ef724a065e81e9b22c76642b221dac33d6cdeea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 7 Nov 2016 18:14:28 +0100 Subject: [PATCH 030/266] FIX: self-onebox in read protected categories --- lib/onebox/engine/discourse_local_onebox.rb | 23 +++++++++++++++---- .../engine/discourse_local_onebox_spec.rb | 10 ++++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb index 37f7a487d7..34bc278961 100644 --- a/lib/onebox/engine/discourse_local_onebox.rb +++ b/lib/onebox/engine/discourse_local_onebox.rb @@ -26,7 +26,7 @@ module Onebox case route[:controller] when "uploads" then upload_html(path) - when "topics" then topic_html(path, route) + when "topics" then topic_html(route) end end @@ -41,13 +41,14 @@ module Onebox end end - def topic_html(path, route) + def topic_html(route) link = "#{@url}" source_topic_id = @url[/[&?]source_topic_id=(\d+)/, 1].to_i + source_topic = Topic.find_by(id: source_topic_id) if source_topic_id > 0 if route[:post_number].present? && route[:post_number].to_i > 1 post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number]) - return link if post.nil? || post.hidden || !Guardian.new.can_see?(post) + return link unless can_see_post?(post, source_topic) topic = post.topic slug = Slug.for(topic.title) @@ -63,7 +64,7 @@ module Onebox PrettyText.cook(quote, args) else topic = Topic.find_by(id: route[:topic_id]) - return link if topic.nil? || !Guardian.new.can_see?(topic) + return link unless can_see_topic?(topic, source_topic) first_post = topic.ordered_posts.first @@ -81,6 +82,20 @@ module Onebox end end + def can_see_post?(post, source_topic) + return false if post.nil? || post.hidden || post.trashed? || post.topic.nil? + Guardian.new.can_see_post?(post) || same_category?(post.topic.category, source_topic) + end + + def can_see_topic?(topic, source_topic) + return false if topic.nil? || topic.trashed? || topic.private_message? + Guardian.new.can_see_topic?(topic) || same_category?(topic.category, source_topic) + end + + def same_category?(category, source_topic) + source_topic.try(:category_id) == category.try(:id) + end + end end end diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb index 90f9bf4534..c3b015befc 100644 --- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb +++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb @@ -15,7 +15,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do it "returns a link if not allowed to see the post" do url = "#{Discourse.base_url}#{post2.url}" - Guardian.any_instance.stubs(:can_see?).returns(false) + Guardian.any_instance.expects(:can_see_post?).returns(false) expect(Onebox.preview(url).to_s).to eq("#{url}") end @@ -46,9 +46,9 @@ describe Onebox::Engine::DiscourseLocalOnebox do expect(Onebox.preview(url).to_s).to eq("#{url}") end - it "returns a link if not allowed to see the post" do + it "returns a link if not allowed to see the topic" do url = topic.url - Guardian.any_instance.stubs(:can_see?).returns(false) + Guardian.any_instance.expects(:can_see_topic?).returns(false) expect(Onebox.preview(url).to_s).to eq("#{url}") end @@ -57,8 +57,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do expect(Onebox.preview(topic.url).to_s).to match(/hamburger\.png/) end - it "returns some onebox goodness if post exists and can be seen" do - Guardian.any_instance.stubs(:can_see?).returns(true) + it "returns some onebox goodness if topic exists and can be seen" do html = Onebox.preview(topic.url).to_s expect(html).to include(topic.ordered_posts.first.user.username) expect(html).to include("
") @@ -101,7 +100,6 @@ describe Onebox::Engine::DiscourseLocalOnebox do it "returns some onebox goodness if post exists and can be seen" do url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}" - Guardian.any_instance.stubs(:can_see?).returns(true) html = Onebox.preview(url).to_s expect(html).to include(post2.excerpt) expect(html).to include(post2.topic.title) From 24ad68e7653b722c92785b6e0e44fb22c07bc0c3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 7 Nov 2016 15:11:56 -0500 Subject: [PATCH 031/266] Use `this.registry` in `component-test` --- .../javascripts/helpers/component-test.js.es6 | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index f671adb8e4..69b6b67ab0 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -10,30 +10,30 @@ export default function(name, opts) { const appEvents = AppEvents.create(); this.site = Discourse.Site.current(); - this.container.register('site-settings:main', Discourse.SiteSettings, { instantiate: false }); - this.container.register('app-events:main', appEvents, { instantiate: false }); - this.container.register('capabilities:main', Ember.Object); - this.container.register('site:main', this.site, { instantiate: false }); - this.container.injection('component', 'siteSettings', 'site-settings:main'); - this.container.injection('component', 'appEvents', 'app-events:main'); - this.container.injection('component', 'capabilities', 'capabilities:main'); - this.container.injection('component', 'site', 'site:main'); + this.registry.register('site-settings:main', Discourse.SiteSettings, { instantiate: false }); + this.registry.register('app-events:main', appEvents, { instantiate: false }); + this.registry.register('capabilities:main', Ember.Object); + this.registry.register('site:main', this.site, { instantiate: false }); + this.registry.injection('component', 'siteSettings', 'site-settings:main'); + this.registry.injection('component', 'appEvents', 'app-events:main'); + this.registry.injection('component', 'capabilities', 'capabilities:main'); + this.registry.injection('component', 'site', 'site:main'); this.siteSettings = Discourse.SiteSettings; - autoLoadModules(this.container, this.registry); + autoLoadModules(this.registry, this.registry); const store = createStore(); if (!opts.anonymous) { const currentUser = Discourse.User.create({ username: 'eviltrout' }); this.currentUser = currentUser; - this.container.register('current-user:main', this.currentUser, { instantiate: false }); - this.container.register('topic-tracking-state:main', + this.registry.register('current-user:main', this.currentUser, { instantiate: false }); + this.registry.register('topic-tracking-state:main', TopicTrackingState.create({ currentUser }), { instantiate: false }); } - this.container.register('store:main', store, { instantiate: false }); + this.registry.register('store:main', store, { instantiate: false }); if (opts.setup) { opts.setup.call(this, store); From 70fb2431a1b82b20f1a0b6e09db30f98331fb8cf Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 4 Nov 2016 11:32:12 -0400 Subject: [PATCH 032/266] Migrate `this.container` to `getOwner(this)` --- .../admin/components/customize-link.js.es6 | 4 ++- .../discourse-common/lib/deprecated.js.es6 | 3 ++ .../discourse-common/lib/get-owner.js.es6 | 32 +++++++++++++++++++ .../components/badge-selector.js.es6 | 3 +- .../components/category-selector.js.es6 | 3 +- .../components/composer-editor.js.es6 | 4 +-- .../components/composer-message.js.es6 | 3 +- .../discourse/components/d-editor.js.es6 | 30 ++++++++++------- .../components/group-selector.js.es6 | 3 +- .../components/header-extra-info.js.es6 | 4 ++- .../discourse/components/mount-widget.js.es6 | 9 ++++-- .../discourse/components/nav-item.js.es6 | 3 +- .../components/topic-list-item.js.es6 | 5 +-- .../discourse/components/user-selector.js.es6 | 3 +- .../discourse/controllers/composer.js.es6 | 7 ++-- .../discourse/controllers/header.js.es6 | 3 +- .../discourse/lib/emoji/toolbar.js.es6 | 2 +- .../javascripts/discourse/lib/mobile.js.es6 | 7 ++-- .../discourse/lib/page-tracker.js.es6 | 4 ++- .../javascripts/discourse/lib/url.js.es6 | 3 +- .../javascripts/discourse/models/store.js.es6 | 18 +++++++---- .../pre-initializers/map-routes.js.es6 | 5 ++- .../discourse/routes/application.js.es6 | 7 ++-- .../discourse/routes/full-page-search.js.es6 | 3 +- .../discourse/routes/topic-from-params.js.es6 | 6 ++-- .../discourse/templates/composer.hbs | 2 +- .../discourse/widgets/connector.js.es6 | 2 +- .../discourse/widgets/decorator-helper.js.es6 | 3 +- .../discourse/widgets/hamburger-menu.js.es6 | 2 +- .../discourse/widgets/header.js.es6 | 8 ++--- .../javascripts/discourse/widgets/link.js.es6 | 2 +- .../widgets/search-menu-controls.js.es6 | 2 +- .../discourse/widgets/search-menu.js.es6 | 2 +- .../discourse/widgets/widget.js.es6 | 28 ++++++++-------- .../components/wizard-field-image.js.es6 | 3 +- 35 files changed, 154 insertions(+), 74 deletions(-) create mode 100644 app/assets/javascripts/discourse-common/lib/deprecated.js.es6 create mode 100644 app/assets/javascripts/discourse-common/lib/get-owner.js.es6 diff --git a/app/assets/javascripts/admin/components/customize-link.js.es6 b/app/assets/javascripts/admin/components/customize-link.js.es6 index 79d8cc26f4..0600f6b5cd 100644 --- a/app/assets/javascripts/admin/components/customize-link.js.es6 +++ b/app/assets/javascripts/admin/components/customize-link.js.es6 @@ -1,6 +1,8 @@ +import { getOwner } from 'discourse-common/lib/get-owner'; + export default Ember.Component.extend({ router: function() { - return this.container.lookup('router:main'); + return getOwner(this).lookup('router:main'); }.property(), active: function() { diff --git a/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 b/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 new file mode 100644 index 0000000000..02daf6ebda --- /dev/null +++ b/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 @@ -0,0 +1,3 @@ +export default function deprecated(msg) { + console.warn(`DEPRECATION: ${msg}`); +} diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 b/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 new file mode 100644 index 0000000000..ada334f075 --- /dev/null +++ b/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 @@ -0,0 +1,32 @@ +import deprecated from 'discourse-common/lib/deprecated'; + +export function getOwner(obj) { + if (Ember.getOwner) { + return Ember.getOwner(obj) || Discourse.__container__; + } + + return obj.container; +} + +// `this.container` is deprecated, but we can still build a container-like +// object for components to use +export function getRegister(obj) { + const owner = getOwner(obj); + const register = { + lookup: (...args) => owner.lookup(...args), + lookupFactory: (...args) => { + return owner.lookupFactory ? owner.lookupFactory(...args) : owner._lookupFactory(...args); + }, + + deprecateContainer(target) { + Object.defineProperty(target, 'container', { + get() { + deprecated("Use `this.register` or `getOwner` instead of `this.container`"); + return register; + } + }); + } + }; + + return register; +} diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js.es6 index 14b1e5349e..315f7398a7 100644 --- a/app/assets/javascripts/discourse/components/badge-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/badge-selector.js.es6 @@ -1,4 +1,5 @@ import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ @computed('placeholderKey') @@ -17,7 +18,7 @@ export default Ember.Component.extend({ var self = this; var selectedBadges; - var template = this.container.lookup('template:badge-selector-autocomplete.raw'); + var template = getOwner(this).lookup('template:badge-selector-autocomplete.raw'); self.$('input').autocomplete({ allowAny: false, items: _.isArray(this.get('badgeNames')) ? this.get('badgeNames') : [this.get('badgeNames')], diff --git a/app/assets/javascripts/discourse/components/category-selector.js.es6 b/app/assets/javascripts/discourse/components/category-selector.js.es6 index 10a7c454eb..460a1dfdd6 100644 --- a/app/assets/javascripts/discourse/components/category-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/category-selector.js.es6 @@ -1,6 +1,7 @@ import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import Category from 'discourse/models/category'; import { on, observes } from 'ember-addons/ember-computed-decorators'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ @observes('categories') @@ -12,7 +13,7 @@ export default Ember.Component.extend({ @on('didInsertElement') _initializeAutocomplete(opts) { const self = this, - template = this.container.lookup('template:category-selector-autocomplete.raw'), + template = getOwner(this).lookup('template:category-selector-autocomplete.raw'), regexp = new RegExp(`href=['\"]${Discourse.getURL('/c/')}([^'\"]+)`); this.$('input').autocomplete({ diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 6503e051c2..4ba0c20057 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -6,7 +6,7 @@ import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link- import { load } from 'pretty-text/oneboxer'; import { ajax } from 'discourse/lib/ajax'; import InputValidation from 'discourse/models/input-validation'; - +import { getOwner } from 'discourse-common/lib/get-owner'; import { tinyAvatar, displayErrorForUpload, getUploadMarkdown, @@ -62,7 +62,7 @@ export default Ember.Component.extend({ @on('didInsertElement') _composerEditorInit() { const topicId = this.get('topic.id'); - const template = this.container.lookup('template:user-selector-autocomplete.raw'); + const template = getOwner(this).lookup('template:user-selector-autocomplete.raw'); const $input = this.$('.d-editor-input'); $input.autocomplete({ template, diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js.es6 index 39307dfccc..715afce98b 100644 --- a/app/assets/javascripts/discourse/components/composer-message.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-message.js.es6 @@ -1,11 +1,12 @@ import computed from 'ember-addons/ember-computed-decorators'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ classNameBindings: [':composer-popup', ':hidden', 'message.extraClass'], @computed('message.templateName') defaultLayout(templateName) { - return this.container.lookup(`template:composer/${templateName}`); + return getOwner(this).lookup(`template:composer/${templateName}`); }, didInsertElement() { diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index e6dd2804dd..11feda8e3f 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -10,6 +10,8 @@ import { cook } from 'discourse/lib/text'; import { translations } from 'pretty-text/emoji/data'; import { emojiSearch } from 'pretty-text/emoji'; import { emojiUrlFor } from 'discourse/lib/text'; +import { getRegister } from 'discourse-common/lib/get-owner'; +import deprecated from 'discourse-common/lib/deprecated'; // Our head can be a static string or a function that returns a string // based on input (like for numbered lists). @@ -182,7 +184,7 @@ export function addToolbarCallback(func) { } export function onToolbarCreate(func) { - console.warn('`onToolbarCreate` is deprecated, use the plugin api instead.'); + deprecated('`onToolbarCreate` is deprecated, use the plugin api instead.'); addToolbarCallback(func); }; @@ -205,15 +207,18 @@ export default Ember.Component.extend({ this.set('ready', true); }, + init() { + this._super(); + this.register = getRegister(this); + }, + didInsertElement() { this._super(); - const container = this.get('container'), - $editorInput = this.$('.d-editor-input'); - - this._applyEmojiAutocomplete(container, $editorInput); - this._applyCategoryHashtagAutocomplete(container, $editorInput); + const $editorInput = this.$('.d-editor-input'); + this._applyEmojiAutocomplete($editorInput); + this._applyCategoryHashtagAutocomplete($editorInput); Ember.run.scheduleOnce('afterRender', this, this._readyNow); @@ -287,8 +292,8 @@ export default Ember.Component.extend({ } }, - _applyCategoryHashtagAutocomplete(container) { - const template = container.lookup('template:category-tag-autocomplete.raw'); + _applyCategoryHashtagAutocomplete() { + const template = this.register.lookup('template:category-tag-autocomplete.raw'); const siteSettings = this.siteSettings; this.$('.d-editor-input').autocomplete({ @@ -310,10 +315,11 @@ export default Ember.Component.extend({ }); }, - _applyEmojiAutocomplete(container, $editorInput) { + _applyEmojiAutocomplete($editorInput) { if (!this.siteSettings.enable_emoji) { return; } - const template = container.lookup('template:emoji-selector-autocomplete.raw'); + const register = this.register; + const template = this.register.lookup('template:emoji-selector-autocomplete.raw'); const self = this; $editorInput.autocomplete({ @@ -329,7 +335,7 @@ export default Ember.Component.extend({ } else { showSelector({ appendTo: self.$(), - container, + register, onSelect: title => { // Remove the previously type characters when a new emoji is selected from the selector. let selected = self._getSelected(); @@ -614,7 +620,7 @@ export default Ember.Component.extend({ emoji() { showSelector({ appendTo: this.$(), - container: this.container, + register: this.register, onSelect: title => this._addText(this._getSelected(), `:${title}:`) }); } diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6 index a2080ecda2..4f4fa0f6a5 100644 --- a/app/assets/javascripts/discourse/components/group-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/group-selector.js.es6 @@ -1,4 +1,5 @@ import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ @computed('placeholderKey') @@ -18,7 +19,7 @@ export default Ember.Component.extend({ var selectedGroups; var groupNames = this.get('groupNames'); - var template = this.container.lookup('template:group-selector-autocomplete.raw'); + var template = getOwner(this).lookup('template:group-selector-autocomplete.raw'); self.$('input').autocomplete({ allowAny: false, items: _.isArray(groupNames) ? groupNames : (Ember.isEmpty(groupNames)) ? [] : [groupNames], diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 index 66aaf82cb9..1d769faa09 100644 --- a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 +++ b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 @@ -1,3 +1,5 @@ +import deprecated from 'discourse-common/lib/deprecated'; + export function needsSecondRowIf() { - Ember.warn("DEPRECATION: `needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`"); + deprecated("`needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`"); } diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index e62390e694..3a4fb8bce5 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -2,6 +2,7 @@ import { keyDirty } from 'discourse/widgets/widget'; import { diff, patch } from 'virtual-dom'; import { WidgetClickHook } from 'discourse/widgets/hooks'; import { renderedKey, queryRegistry } from 'discourse/widgets/widget'; +import { getRegister } from 'discourse-common/lib/get-owner'; const _cleanCallbacks = {}; export function addWidgetCleanCallback(widgetName, fn) { @@ -24,12 +25,15 @@ export default Ember.Component.extend({ (this.get('delegated') || []).forEach(m => this.set(m, m)); - this._widgetClass = queryRegistry(name) || this.container.lookupFactory(`widget:${name}`); + this.register = getRegister(this); + + this._widgetClass = queryRegistry(name) || this.register.lookupFactory(`widget:${name}`); if (!this._widgetClass) { console.error(`Error: Could not find widget: ${name}`); } + this._childEvents = []; this._connected = []; this._dispatched = []; @@ -97,13 +101,14 @@ export default Ember.Component.extend({ rerenderWidget() { Ember.run.cancel(this._timeout); + if (this._rootNode) { if (!this._widgetClass) { return; } const t0 = new Date().getTime(); const args = this.get('args') || this.buildArgs(); const opts = { model: this.get('model') }; - const newTree = new this._widgetClass(args, this.container, opts); + const newTree = new this._widgetClass(args, this.register, opts); newTree._emberView = this; const patches = diff(this._tree || this._rootNode, newTree); diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6 index 69c797bd30..3a4b40dddf 100644 --- a/app/assets/javascripts/discourse/components/nav-item.js.es6 +++ b/app/assets/javascripts/discourse/components/nav-item.js.es6 @@ -1,6 +1,7 @@ /* You might be looking for navigation-item. */ import computed from "ember-addons/ember-computed-decorators"; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ tagName: 'li', @@ -8,7 +9,7 @@ export default Ember.Component.extend({ @computed() router() { - return this.container.lookup('router:main'); + return getOwner(this).lookup('router:main'); }, @computed("path") diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6 index 1fc7cf53a6..d9b8569bb8 100644 --- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6 @@ -1,5 +1,6 @@ import computed from 'ember-addons/ember-computed-decorators'; import { bufferedRender } from 'discourse-common/lib/buffered-render'; +import { getOwner } from 'discourse-common/lib/get-owner'; export function showEntrance(e) { let target = $(e.target); @@ -11,7 +12,7 @@ export function showEntrance(e) { target = target.end(); } } - this.container.lookup('controller:application').send("showTopicEntrance", {topic: this.get('topic'), position: target.offset()}); + getOwner(this).lookup('controller:application').send("showTopicEntrance", {topic: this.get('topic'), position: target.offset()}); return false; } } @@ -30,7 +31,7 @@ export default Ember.Component.extend(bufferedRender({ }, buildBuffer(buffer) { - const template = Discourse.__container__.lookup('template:list/topic-list-item.raw'); + const template = getOwner(this).lookup('template:list/topic-list-item.raw'); if (template) { buffer.push(template(this)); } diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6 index e124b43fb2..94d6db9bfe 100644 --- a/app/assets/javascripts/discourse/components/user-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/user-selector.js.es6 @@ -1,6 +1,7 @@ import { observes } from 'ember-addons/ember-computed-decorators'; import TextField from 'discourse/components/text-field'; import userSearch from 'discourse/lib/user-search'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default TextField.extend({ @observes('usernames') @@ -30,7 +31,7 @@ export default TextField.extend({ } this.$().val(this.get('usernames')).autocomplete({ - template: this.container.lookup('template:user-selector-autocomplete.raw'), + template: getOwner(this).lookup('template:user-selector-autocomplete.raw'), disabled: this.get('disabled'), single: this.get('single'), allowAny: this.get('allowAny'), diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 30a5c7af93..f5b506a902 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -6,6 +6,7 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor import { relativeAge } from 'discourse/lib/formatter'; import { escapeExpression } from 'discourse/lib/utilities'; import InputValidation from 'discourse/models/input-validation'; +import { getOwner } from 'discourse-common/lib/get-owner'; function loadDraft(store, opts) { opts = opts || {}; @@ -85,8 +86,8 @@ export default Ember.Controller.extend({ }, showToolbar: Em.computed({ - get(){ - const keyValueStore = this.container.lookup('key-value-store:main'); + get() { + const keyValueStore = getOwner(this).lookup('key-value-store:main'); const storedVal = keyValueStore.get("toolbar-enabled"); if (this._toolbarEnabled === undefined && storedVal === undefined) { // iPhone 6 is 375, anything narrower and toolbar should @@ -97,7 +98,7 @@ export default Ember.Controller.extend({ return this._toolbarEnabled || storedVal === "true"; }, set(key, val){ - const keyValueStore = this.container.lookup('key-value-store:main'); + const keyValueStore = getOwner(this).lookup('key-value-store:main'); this._toolbarEnabled = val; keyValueStore.set({key: "toolbar-enabled", value: val ? "true" : "false"}); return val; diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 2665f2afbd..f5979bb36a 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -1,6 +1,7 @@ import { addFlagProperty as realAddFlagProperty } from 'discourse/components/site-header'; +import deprecated from 'discourse-common/lib/deprecated'; export function addFlagProperty(prop) { - Ember.warn("importing `addFlagProperty` is deprecated. Use the PluginAPI instead"); + deprecated("importing `addFlagProperty` is deprecated. Use the PluginAPI instead"); realAddFlagProperty(prop); } diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 index 68e9528184..d3b6e12f12 100644 --- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 @@ -151,7 +151,7 @@ function render(page, offset, options) { }; $('.emoji-modal', options.appendTo).remove(); - const template = options.container.lookup('template:emoji-toolbar.raw'); + const template = options.register.lookup('template:emoji-toolbar.raw'); options.appendTo.append(template(model)); bindEvents(page, offset, options); diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js.es6 index 940e18c44b..2ceb13ba51 100644 --- a/app/assets/javascripts/discourse/lib/mobile.js.es6 +++ b/app/assets/javascripts/discourse/lib/mobile.js.es6 @@ -1,3 +1,5 @@ +import deprecated from 'discourse-common/lib/deprecated'; + let mobileForced = false; // An object that is responsible for logic related to mobile devices. @@ -67,10 +69,9 @@ export function resetMobile() { mobileForced = false; } -// Backwards compatibiltity, deprecated Object.defineProperty(Discourse, 'Mobile', { - get: function() { - Ember.warn("DEPRECATION: `Discourse.Mobile` is deprecated, use `this.site.mobileView` instead"); + get() { + deprecated("`Discourse.Mobile` is deprecated, use `this.site.mobileView` instead"); return Mobile; } }); diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6 index 89deaafe03..ddef479268 100644 --- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 +++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6 @@ -1,3 +1,5 @@ +import deprecated from 'discourse-common/lib/deprecated'; + const PageTracker = Ember.Object.extend(Ember.Evented); let _pageTracker = PageTracker.create(); @@ -42,7 +44,7 @@ export function onPageChange(fn) { // backwards compatibility const BackwardsCompat = { current() { - console.warn(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`); + deprecated(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`); return _pageTracker; } }; diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 7621ae4ce9..6aca579c13 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -332,7 +332,8 @@ const DiscourseURL = Ember.Object.extend({ const transition = router.handleURL(path); transition._discourse_intercepted = true; - transition.promise.then(() => jumpToElement(elementId)); + const promise = transition.promise || transition; + promise.then(() => jumpToElement(elementId)); } }).create(); diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 87a589a5a3..b2f0225409 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -1,6 +1,7 @@ import { ajax } from 'discourse/lib/ajax'; import RestModel from 'discourse/models/rest'; import ResultSet from 'discourse/models/result-set'; +import { getRegister } from 'discourse-common/lib/get-owner'; let _identityMap; @@ -41,6 +42,11 @@ export default Ember.Object.extend({ _plurals: {'post-reply': 'post-replies', 'post-reply-history': 'post_reply_histories'}, + init() { + this._super(); + this.register = getRegister(this); + }, + pluralize(thing) { return this._plurals[thing] || thing + "s"; }, @@ -196,11 +202,11 @@ export default Ember.Object.extend({ obj.__state = obj.id ? "created" : "new"; // TODO: Have injections be automatic - obj.topicTrackingState = this.container.lookup('topic-tracking-state:main'); - obj.keyValueStore = this.container.lookup('key-value-store:main'); - obj.siteSettings = this.container.lookup('site-settings:main'); + obj.topicTrackingState = this.register.lookup('topic-tracking-state:main'); + obj.keyValueStore = this.register.lookup('key-value-store:main'); + obj.siteSettings = this.register.lookup('site-settings:main'); - const klass = this.container.lookupFactory('model:' + type) || RestModel; + const klass = this.register.lookupFactory('model:' + type) || RestModel; const model = klass.create(obj); storeMap(type, obj.id, model); @@ -208,7 +214,7 @@ export default Ember.Object.extend({ }, adapterFor(type) { - return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); + return this.register.lookup('adapter:' + type) || this.register.lookup('adapter:rest'); }, _lookupSubType(subType, type, id, root) { @@ -287,7 +293,7 @@ export default Ember.Object.extend({ if (existing) { delete obj.id; - const klass = this.container.lookupFactory('model:' + type) || RestModel; + const klass = this.register.lookupFactory('model:' + type) || RestModel; existing.setProperties(klass.munge(obj)); obj.id = id; return existing; diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 index 94629c17ba..0a593c11bd 100644 --- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 +++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 @@ -10,7 +10,10 @@ export default { // HACK to fix: https://github.com/emberjs/ember.js/issues/10310 const originalBuildInstance = originalBuildInstance || Ember.Application.prototype.buildInstance; Ember.Application.prototype.buildInstance = function() { - this.registry = this.buildRegistry(); + const registry = this.buildRegistry(); + if (Ember.VERSION[0] === "1") { + this.registry = registry; + } return originalBuildInstance.apply(this); }; } diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index d506852e36..fab8595cd3 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -6,6 +6,7 @@ import OpenComposer from "discourse/mixins/open-composer"; import Category from 'discourse/models/category'; import mobile from 'discourse/lib/mobile'; import { findAll } from 'discourse/models/login-method'; +import { getOwner } from 'discourse-common/lib/get-owner'; function unlessReadOnly(method, message) { return function() { @@ -40,7 +41,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { // Ember doesn't provider a router `willTransition` event so let's make one willTransition() { - var router = this.container.lookup('router:main'); + var router = getOwner(this).lookup('router:main'); Ember.run.once(router, router.trigger, 'willTransition'); return this._super(); }, @@ -150,7 +151,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { changeBulkTemplate(w) { const controllerName = w.replace('modal/', ''), - factory = this.container.lookupFactory('controller:' + controllerName); + factory = getOwner(this).lookupFactory('controller:' + controllerName); this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'}); }, @@ -200,7 +201,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { _autoLogin(modal, modalClass, notAuto) { const methods = findAll(this.siteSettings, - this.container.lookup('capabilities:main'), + getOwner(this).lookup('capabilities:main'), this.site.isMobileDevice); if (!this.siteSettings.enable_local_logins && methods.length === 1) { diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 index 805f1e1b91..eb0cc01092 100644 --- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 @@ -3,6 +3,7 @@ import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib import Composer from 'discourse/models/composer'; import PreloadStore from 'preload-store'; import { getTransient, setTransient } from 'discourse/lib/page-tracker'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Discourse.Route.extend({ queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} }, @@ -52,7 +53,7 @@ export default Discourse.Route.extend({ category = match[1]; } } - this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC, topicCategory: category}); + getOwner(this).lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC, topicCategory: category}); } } diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 index 7c96c1a264..2212da06b9 100644 --- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 @@ -56,8 +56,10 @@ export default Discourse.Route.extend({ ignoreIfChanged: true }); } - }).catch(function(e) { - Ember.warn('Could not view topic', e); + }).catch(e => { + if (!Ember.testing) { + console.log('Could not view topic', e); + } }); } diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 2551444d59..2c47fc8fcd 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -17,7 +17,7 @@
{{#if site.mobileView}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6 index c132666a41..d197914af2 100644 --- a/app/assets/javascripts/discourse/widgets/connector.js.es6 +++ b/app/assets/javascripts/discourse/widgets/connector.js.es6 @@ -21,7 +21,7 @@ export default class Connector { } const view = Ember.View.create({ - container: widget.container, + container: widget.register, templateName: opts.templateName, context }); diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 index a949d0a628..2ee8df8723 100644 --- a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 +++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 @@ -8,7 +8,8 @@ class DecoratorHelper { this.widget = widget; this.attrs = attrs; this.state = state; - this.container = widget.container; + this.register = widget.register; + this.register.deprecateContainer(this); } /** diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index f0e5319eb6..5fa48a8413 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -63,7 +63,7 @@ export default createWidget('hamburger-menu', { }, lookupCount(type) { - const tts = this.container.lookup('topic-tracking-state:main'); + const tts = this.register.lookup('topic-tracking-state:main'); return tts ? tts.lookupCount(type) : 0; }, diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 80dc5b0f92..5f1f1e2133 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -190,7 +190,7 @@ export default createWidget('header', { updateHighlight() { if (!this.state.searchVisible) { - const service = this.container.lookup('search-service:main'); + const service = this.register.lookup('search-service:main'); service.set('highlightTerm', ''); } }, @@ -208,7 +208,7 @@ export default createWidget('header', { toggleSearchMenu() { if (this.site.mobileView) { - const searchService = this.container.lookup('search-service:main'); + const searchService = this.register.lookup('search-service:main'); const context = searchService.get('searchContext'); var params = ""; @@ -240,7 +240,7 @@ export default createWidget('header', { state.contextEnabled = false; - const currentPath = this.container.lookup('controller:application').get('currentPath'); + const currentPath = this.register.lookup('controller:application').get('currentPath'); const blacklist = [ /^discovery\.categories/ ]; const whitelist = [ /^topic\./ ]; const check = function(regex) { return !!currentPath.match(regex); }; @@ -249,7 +249,7 @@ export default createWidget('header', { // If we're viewing a topic, only intercept search if there are cloaked posts if (showSearch && currentPath.match(/^topic\./)) { showSearch = ($('.topic-post .cooked, .small-action:not(.time-gap)').length < - this.container.lookup('controller:topic').get('model.postStream.stream.length')); + this.register.lookup('controller:topic').get('model.postStream.stream.length')); } if (state.searchVisible) { diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6 index 7eabce3975..9ba519fff4 100644 --- a/app/assets/javascripts/discourse/widgets/link.js.es6 +++ b/app/assets/javascripts/discourse/widgets/link.js.es6 @@ -10,7 +10,7 @@ export default createWidget('link', { href(attrs) { const route = attrs.route; if (route) { - const router = this.container.lookup('router:main'); + const router = this.register.lookup('router:main'); if (router && router.router) { const params = [route]; if (attrs.model) { diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 index 5be3ce3543..70d046f7d5 100644 --- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 +++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 @@ -30,7 +30,7 @@ createWidget('search-context', { tagName: 'div.search-context', html(attrs) { - const service = this.container.lookup('search-service:main'); + const service = this.register.lookup('search-service:main'); const ctx = service.get('searchContext'); const result = []; diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 index 9ed3b8c7d4..f8d626f456 100644 --- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 @@ -134,7 +134,7 @@ export default createWidget('search-menu', { searchService() { if (!this._searchService) { - this._searchService = this.container.lookup('search-service:main'); + this._searchService = this.register.lookup('search-service:main'); } return this._searchService; }, diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index 851ad09bd9..76f8c60fba 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -127,12 +127,14 @@ export function createWidget(name, opts) { } export default class Widget { - constructor(attrs, container, opts) { + constructor(attrs, register, opts) { opts = opts || {}; this.attrs = attrs || {}; this.mergeState = opts.state; - this.container = container; this.model = opts.model; + this.register = register; + + register.deprecateContainer(this); this.key = this.buildKey ? this.buildKey(attrs) : null; @@ -146,13 +148,13 @@ export default class Widget { } } - this.site = container.lookup('site:main'); - this.siteSettings = container.lookup('site-settings:main'); - this.currentUser = container.lookup('current-user:main'); - this.capabilities = container.lookup('capabilities:main'); - this.store = container.lookup('store:main'); - this.appEvents = container.lookup('app-events:main'); - this.keyValueStore = container.lookup('key-value-store:main'); + this.site = register.lookup('site:main'); + this.siteSettings = register.lookup('site-settings:main'); + this.currentUser = register.lookup('current-user:main'); + this.capabilities = register.lookup('capabilities:main'); + this.store = register.lookup('store:main'); + this.appEvents = register.lookup('app-events:main'); + this.keyValueStore = register.lookup('key-value-store:main'); if (this.name) { const custom = _customSettings[this.name]; @@ -223,15 +225,15 @@ export default class Widget { let WidgetClass = _registry[widgetName]; if (!WidgetClass) { - if (!this.container) { - console.error("couldn't find container"); + if (!this.register) { + console.error("couldn't find register"); return; } - WidgetClass = this.container.lookupFactory(`widget:${widgetName}`); + WidgetClass = this.register.lookupFactory(`widget:${widgetName}`); } if (WidgetClass) { - const result = new WidgetClass(attrs, this.container, opts); + const result = new WidgetClass(attrs, this.register, opts); result.parentWidget = this; return result; } else { diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 index bb5f796ced..370cf12c75 100644 --- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 +++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 @@ -1,6 +1,7 @@ import getUrl from 'discourse-common/lib/get-url'; import computed from 'ember-addons/ember-computed-decorators'; import { getToken } from 'wizard/lib/ajax'; +import { getOwner } from 'discourse-common/lib/get-owner'; export default Ember.Component.extend({ classNames: ['wizard-image-row'], @@ -9,7 +10,7 @@ export default Ember.Component.extend({ @computed('field.id') previewComponent(id) { const componentName = `image-preview-${Ember.String.dasherize(id)}`; - const exists = this.container.lookup(`component:${componentName}`); + const exists = getOwner(this).lookup(`component:${componentName}`); return exists ? componentName : 'wizard-image-preview'; }, From 6b65c009e120c346f160048454202f0b8e4d4d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 7 Nov 2016 22:22:25 +0100 Subject: [PATCH 033/266] bump onebox --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10a495336a..d1dfeace9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.61) + onebox (1.5.62) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From c8ac8d02f25bed294e1251ee3d369b88ebdacd30 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 7 Nov 2016 17:02:33 -0800 Subject: [PATCH 034/266] better copy for entropy / gibberish / allcaps err --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c726595eb3..e693cdf043 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -94,7 +94,7 @@ en: has_already_been_used: "has already been used" inclusion: is not included in the list invalid: is invalid - is_invalid: "is invalid; try to be a little more descriptive" + is_invalid: "seems unclear, is it a complete sentence?" less_than: must be less than %{count} less_than_or_equal_to: must be less than or equal to %{count} not_a_number: is not a number @@ -196,7 +196,7 @@ en: just_posted_that: "is too similar to what you recently posted" invalid_characters: "contains invalid characters" - is_invalid: "is invalid; try to be a little more descriptive" + is_invalid: "seems unclear, is it a complete sentence?" next_page: "next page →" prev_page: "← previous page" page_num: "Page %{num}" From ac2c035856ad0cdb2ca7a3b5ccf7df18e15a2914 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 8 Nov 2016 14:43:54 +1100 Subject: [PATCH 035/266] FIX: stop raising exceptions when a post goes missing --- app/jobs/regular/emit_web_hook_event.rb | 72 ++++++++++++++----------- spec/jobs/emit_web_hook_event_spec.rb | 6 +++ 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb index 72e5f5923a..2186ca9baa 100644 --- a/app/jobs/regular/emit_web_hook_event.rb +++ b/app/jobs/regular/emit_web_hook_event.rb @@ -6,34 +6,48 @@ module Jobs raise Discourse::InvalidParameters.new(:web_hook_id) unless args[:web_hook_id].present? raise Discourse::InvalidParameters.new(:event_type) unless args[:event_type].present? - @web_hook = WebHook.find(args[:web_hook_id]) + args = args.dup - unless args[:event_type] == 'ping' - return unless @web_hook.active? - return if @web_hook.group_ids.present? && (args[:group_id].present? || - !@web_hook.group_ids.include?(args[:group_id])) - return if @web_hook.category_ids.present? && (!args[:category_id].present? || - !@web_hook.category_ids.include?(args[:category_id])) + if args[:topic_id] + args[:topic_view] = TopicView.new(args[:topic_id], Discourse.system_user) end - @opts = args + if args[:post_id] + # deleted post so skip + return unless args[:post] = Post.find_by(id: args[:post_id]) + end - web_hook_request + if args[:user_id] + return unless args[:user] = User.find_by(id: args[:user_id]) + end + + web_hook = WebHook.find(args[:web_hook_id]) + + unless args[:event_type] == 'ping' + return unless web_hook.active? + return if web_hook.group_ids.present? && (args[:group_id].present? || + !web_hook.group_ids.include?(args[:group_id])) + return if web_hook.category_ids.present? && (!args[:category_id].present? || + !web_hook.category_ids.include?(args[:category_id])) + end + + web_hook_request(args, web_hook) end private - def web_hook_request - uri = URI(@web_hook.payload_url) + def web_hook_request(args, web_hook) + + uri = URI(web_hook.payload_url) conn = Excon.new(uri.to_s, - ssl_verify_peer: @web_hook.verify_certificate, + ssl_verify_peer: web_hook.verify_certificate, retry_limit: 0) - body = build_web_hook_body - web_hook_event = WebHookEvent.create!(web_hook_id: @web_hook.id) + body = build_web_hook_body(args, web_hook) + web_hook_event = WebHookEvent.create!(web_hook_id: web_hook.id) begin - content_type = case @web_hook.content_type + content_type = case web_hook.content_type when WebHook.content_types['application/x-www-form-urlencoded'] 'application/x-www-form-urlencoded' else @@ -48,12 +62,12 @@ module Jobs 'User-Agent' => "Discourse/" + Discourse::VERSION::STRING, 'X-Discourse-Instance' => Discourse.base_url, 'X-Discourse-Event-Id' => web_hook_event.id, - 'X-Discourse-Event-Type' => @opts[:event_type] + 'X-Discourse-Event-Type' => args[:event_type] } - headers['X-Discourse-Event'] = @opts[:event_name].to_s if @opts[:event_name].present? + headers['X-Discourse-Event'] = args[:event_name].to_s if args[:event_name].present? - if @web_hook.secret.present? - headers['X-Discourse-Event-Signature'] = "sha256=" + OpenSSL::HMAC.hexdigest("sha256", @web_hook.secret, body) + if web_hook.secret.present? + headers['X-Discourse-Event-Signature'] = "sha256=" + OpenSSL::HMAC.hexdigest("sha256", web_hook.secret, body) end now = Time.zone.now @@ -68,33 +82,29 @@ module Jobs response_headers: MultiJson.dump(response.headers), response_body: response.body, duration: ((Time.zone.now - now) * 1000).to_i) - MessageBus.publish("/web_hook_events/#{@web_hook.id}", { + MessageBus.publish("/web_hook_events/#{web_hook.id}", { web_hook_event_id: web_hook_event.id, - event_type: @opts[:event_type] + event_type: args[:event_type] }, user_ids: User.staff.pluck(:id)) end - def build_web_hook_body + def build_web_hook_body(args, web_hook) body = {} - web_hook_user = Discourse.system_user - guardian = Guardian.new(web_hook_user) + guardian = Guardian.new(Discourse.system_user) - if @opts[:topic_id] - topic_view = TopicView.new(@opts[:topic_id], web_hook_user) + if topic_view = args[:topic_view] body[:topic] = TopicViewSerializer.new(topic_view, scope: guardian, root: false).as_json end - if @opts[:post_id] - post = Post.find(@opts[:post_id]) + if post = args[:post] body[:post] = PostSerializer.new(post, scope: guardian, root: false).as_json end - if @opts[:user_id] - user = User.find(@opts[:user_id]) + if user = args[:user] body[:user] = UserSerializer.new(user, scope: guardian, root: false).as_json end - body[:ping] = 'OK' if @opts[:event_type] == 'ping' + body[:ping] = 'OK' if args[:event_type] == 'ping' raise Discourse::InvalidParameters.new if body.empty? diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb index e7ba30fb02..c01ecb6569 100644 --- a/spec/jobs/emit_web_hook_event_spec.rb +++ b/spec/jobs/emit_web_hook_event_spec.rb @@ -69,6 +69,12 @@ describe Jobs::EmitWebHookEvent do end.to change(WebHookEvent, :count).by(1) end + it 'skips silently on missing post' do + expect do + subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: (Post.maximum(:id).to_i + 1)) + end.not_to raise_error + end + it 'sets up proper request headers' do Excon.stub({ url: "https://meta.discourse.org/webhook_listener" }, { headers: { test: 'string' }, body: 'OK', status: 200 }) From a8b7599d4a4647b24b375ab1c42f0885379cd731 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 8 Nov 2016 16:12:40 +0800 Subject: [PATCH 036/266] FEATURE: Add a radial ping when user's first notification has not been read. --- .../subscribe-user-notifications.js.es6 | 1 + .../discourse/widgets/header.js.es6 | 2 + .../stylesheets/common/base/discourse.scss | 37 +++++++++++++++++++ .../stylesheets/common/base/header.scss | 4 +- app/models/user.rb | 5 +++ app/serializers/current_user_serializer.rb | 1 + spec/models/user_spec.rb | 23 ++++++++++++ 7 files changed, 71 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 index 7583982d28..8061b579b9 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -41,6 +41,7 @@ export default { user.set('unread_notifications', data.unread_notifications); user.set('unread_private_messages', data.unread_private_messages); + user.set('read_first_notification', data.read_first_notification); if (oldUnread !== data.unread_notifications || oldPM !== data.unread_private_messages) { appEvents.trigger('notifications:changed'); diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 5f1f1e2133..1e01d0263d 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -42,6 +42,8 @@ createWidget('header-notifications', { const unreadPMs = currentUser.get('unread_private_messages'); if (!!unreadPMs) { + if (!currentUser.get('read_first_notification')) contents.push(h('span.ring')); + contents.push(this.attach('link', { action: attrs.action, className: 'badge-notification unread-private-messages', rawLabel: unreadPMs })); diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 0d68b07b9a..772ad99e89 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -166,6 +166,43 @@ body { &.badge-notification[href] {color: $secondary;} } +.ring { + top: -13.4px !important; + right: 22.4px !important; + border-radius: 15px; + width: 20px; + height: 20px; + border: solid #FF0000 1px; + -moz-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + -webkit-transform-origin: center; + -moz-animation-duration: 3s; + -webkit-animation-duration: 3s; + -moz-animation-name: ping; + -webkit-animation-name: ping; +} + +@-webkit-keyframes ping { + from { + $scale: 0.25; + transform: scale($scale); + -ms-transform: scale($scale); + -webkit-transform: scale($scale); + -o-transform: scale($scale); + -moz-transform: scale($scale); + opacity: 1; + } + to { + $scale: 2.5; + transform: scale($scale); + -ms-transform: scale($scale); + -webkit-transform: scale($scale); + -o-transform: scale($scale); + -moz-transform: scale($scale); + opacity: 0; + } +} + .fade { opacity: 0; transition: opacity 0.15s linear; diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index e1f2408f45..1991799767 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -123,7 +123,7 @@ .notifications { position: relative; } - .badge-notification { + .badge-notification, .ring { position: absolute; top: -9px; z-index: 1; @@ -133,7 +133,7 @@ right: 0; background-color: scale-color($tertiary, $lightness: 50%); } - .unread-private-messages { + .unread-private-messages, .ring { right: 25px; } .flagged-posts { diff --git a/app/models/user.rb b/app/models/user.rb index aacae0c970..062bc47363 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -343,6 +343,10 @@ class User < ActiveRecord::Base end end + def read_first_notification? + notifications.order(created_at: :asc).first.read + end + def publish_notifications_state # publish last notification json with the message so we # can apply an update @@ -384,6 +388,7 @@ class User < ActiveRecord::Base {unread_notifications: unread_notifications, unread_private_messages: unread_private_messages, total_unread_notifications: total_unread_notifications, + read_first_notification: read_first_notification?, last_notification: json, recent: recent, seen_notification_id: seen_notification_id diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 498632e4a7..f574ef3ccb 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -6,6 +6,7 @@ class CurrentUserSerializer < BasicUserSerializer :total_unread_notifications, :unread_notifications, :unread_private_messages, + :read_first_notification?, :admin?, :notification_channel_position, :site_flagged_posts_count, diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index f0bea747de..8e8218110c 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1314,4 +1314,27 @@ describe User do end end + describe '#read_first_notification?' do + let(:user) { Fabricate(:user) } + let(:notification) { Fabricate(:private_message_notification, user: user) } + let(:other_notification) { Fabricate(:private_message_notification, user: user) } + + describe 'when first notification has not been read' do + it 'should return the right value' do + notification.update_attributes!(read: false) + other_notification.update_attributes!(read: true) + + expect(user.read_first_notification?).to eq(false) + end + end + + describe 'when first notification has been read' do + it 'should return the right value' do + notification.update_attributes!(read: true) + other_notification.update_attributes!(read: false) + + expect(user.read_first_notification?).to eq(true) + end + end + end end From b18439a1e217ebd8172f2e3bde57e951983e3309 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 8 Nov 2016 17:00:44 +0800 Subject: [PATCH 037/266] Fix build. --- app/models/user.rb | 2 +- spec/models/user_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 062bc47363..3de3020d17 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -344,7 +344,7 @@ class User < ActiveRecord::Base end def read_first_notification? - notifications.order(created_at: :asc).first.read + notifications.order(created_at: :asc).first&.read || false end def publish_notifications_state diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 8e8218110c..cddc4b50a8 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1336,5 +1336,11 @@ describe User do expect(user.read_first_notification?).to eq(true) end end + + describe 'when user does not have any notifications' do + it 'should return the right value' do + expect(user.read_first_notification?).to eq(false) + end + end end end From b7532b5247ff2a97ce917539bfc07c49d826361d Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 8 Nov 2016 15:03:22 +0530 Subject: [PATCH 038/266] FIX: download archive confirm message was broken for non-staff users --- .../javascripts/discourse/controllers/user-activity.js.es6 | 2 +- config/locales/client.en.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6 index b899408f42..4e9a063060 100644 --- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6 @@ -23,7 +23,7 @@ export default Ember.Controller.extend({ actions: { exportUserArchive() { bootbox.confirm( - I18n.t("admin.export_csv.user_archive_confirm"), + I18n.t("user.download_archive_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(confirmed) { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d6a10c0d73..3a00814e54 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -488,6 +488,7 @@ en: mute: "Mute" edit: "Edit Preferences" download_archive: "Download My Posts" + download_archive_confirm: "Are you sure you want to download your posts?" new_private_message: "New Message" private_message: "Message" private_messages: "Messages" @@ -2621,7 +2622,6 @@ en: confirm: "Are you sure you want to rollback the database to the previous working state?" export_csv: - user_archive_confirm: "Are you sure you want to download your posts?" success: "Export initiated, you will be notified via message when the process is complete." failed: "Export failed. Please check the logs." rate_limit_error: "Posts can be downloaded once per day, please try again tomorrow." @@ -3302,5 +3302,3 @@ en: admin: "Admin" moderator: "Moderator" regular: "Regular User" - - From ba4ef3424fbacb035cdd71cffb0738adaa211f61 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 8 Nov 2016 03:57:32 -0800 Subject: [PATCH 039/266] minor tweak to ping effect --- app/assets/stylesheets/common/base/discourse.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 772ad99e89..987c304206 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -167,12 +167,12 @@ body { } .ring { - top: -13.4px !important; - right: 22.4px !important; - border-radius: 15px; + top: -13px !important; + right: 21px !important; + border-radius: 100%; width: 20px; height: 20px; - border: solid #FF0000 1px; + border: solid #090 3px; -moz-animation-iteration-count: infinite; -webkit-animation-iteration-count: infinite; -webkit-transform-origin: center; @@ -193,7 +193,7 @@ body { opacity: 1; } to { - $scale: 2.5; + $scale: 2; transform: scale($scale); -ms-transform: scale($scale); -webkit-transform: scale($scale); From 78cd42943ffea0c7d525209be8c510f9a38cca87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 8 Nov 2016 16:36:09 +0100 Subject: [PATCH 040/266] FEATURE: add 'emoji-custom' class to custom emojis --- app/assets/javascripts/pretty-text/emoji.js.es6 | 7 ++++++- .../pretty-text/engines/discourse-markdown/emoji.js.es6 | 8 +++++--- lib/pretty_text.rb | 5 ++++- lib/pretty_text/shims.js | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6 index 786c31d031..fe68c16422 100644 --- a/app/assets/javascripts/pretty-text/emoji.js.es6 +++ b/app/assets/javascripts/pretty-text/emoji.js.es6 @@ -35,15 +35,20 @@ export function performEmojiUnescape(string, opts) { const emojiVal = isEmoticon ? translations[m] : m.slice(1, m.length - 1); const hasEndingColon = m.lastIndexOf(":") === m.length - 1; const url = buildEmojiUrl(emojiVal, opts); + const classes = isCustomEmoji(emojiVal) ? "emoji emoji-custom" : "emoji"; return url && (isEmoticon || hasEndingColon) ? - `${emojiVal}` : m; + `${emojiVal}` : m; }); } return string; } +export function isCustomEmoji(code) { + return extendedEmoji.hasOwnProperty(code.toLowerCase()); +} + export function buildEmojiUrl(code, opts) { let url; code = code.toLowerCase(); diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 index 167209cd47..37d518928b 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 @@ -1,5 +1,5 @@ import { registerOption } from 'pretty-text/pretty-text'; -import { buildEmojiUrl } from 'pretty-text/emoji'; +import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji'; import { translations } from 'pretty-text/emoji/data'; let _unicodeReplacements; @@ -38,10 +38,12 @@ export function setup(helper) { function imageFor(code) { code = code.toLowerCase(); - const url = buildEmojiUrl(code, helper.getOptions()); + const options = helper.getOptions(); + const url = buildEmojiUrl(code, options); if (url) { const title = `:${code}:`; - return ['img', { href: url, title, 'class': 'emoji', alt: title }]; + const classes = isCustomEmoji(code) ? "emoji emoji-custom" : "emoji"; + return ['img', { href: url, title, 'class': classes, alt: title }]; } } diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 691ff158b5..d3d6d4ed42 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -154,7 +154,10 @@ module PrettyText context.eval("__optInput.mentionLookup = __mentionLookup;") custom_emoji = {} - Emoji.custom.map {|e| custom_emoji[e.name] = e.url} + Emoji.custom.map do |e| + context.eval("__registerEmoji('#{e.name}', '#{e.url}')") + custom_emoji[e.name] = e.url + end context.eval("__optInput.customEmoji = #{custom_emoji.to_json};") context.eval('__textOptions = __buildOptions(__optInput);') diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js index c156fdb0cd..ae4803534c 100644 --- a/lib/pretty_text/shims.js +++ b/lib/pretty_text/shims.js @@ -1,6 +1,7 @@ __PrettyText = require('pretty-text/pretty-text').default; __buildOptions = require('pretty-text/pretty-text').buildOptions; __performEmojiUnescape = require('pretty-text/emoji').performEmojiUnescape; +__registerEmoji = require('pretty-text/emoji').registerEmoji; __utils = require('discourse/lib/utilities'); __setUnicode = require('pretty-text/engines/discourse-markdown/emoji').setUnicodeReplacements; From 151597bf0fbcdca82b129b6a59cdb8529c34d7ba Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 8 Nov 2016 13:40:35 -0500 Subject: [PATCH 041/266] Update code so Ember 2.3 can have more tests passing --- .../javascripts/discourse/models/store.js.es6 | 2 +- .../discourse/widgets/post-menu.js.es6 | 16 ++++++---- .../components/text-field-test.js.es6 | 29 ++++++++++++------- .../javascripts/helpers/component-test.js.es6 | 16 +++++++++- test/javascripts/helpers/create-store.js.es6 | 3 +- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index b2f0225409..753f2dd5ab 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -44,7 +44,7 @@ export default Ember.Object.extend({ init() { this._super(); - this.register = getRegister(this); + this.register = this.register || getRegister(this); }, pluralize(thing) { diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 index bbffb5be37..4c39f4a542 100644 --- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 @@ -318,14 +318,18 @@ export default createWidget('post-menu', { const $heart = $(`[data-post-id=${attrs.id}] .fa-heart`); $heart.closest('button').addClass('has-like'); - const scale = [1.0, 1.5]; - return new Ember.RSVP.Promise(resolve => { - animateHeart($heart, scale[0], scale[1], () => { - animateHeart($heart, scale[1], scale[0], () => { - this.sendWidgetAction('toggleLike').then(() => resolve()); + if (!Ember.testing) { + const scale = [1.0, 1.5]; + return new Ember.RSVP.Promise(resolve => { + animateHeart($heart, scale[0], scale[1], () => { + animateHeart($heart, scale[1], scale[0], () => { + this.sendWidgetAction('toggleLike').then(() => resolve()); + }); }); }); - }); + } else { + this.sendWidgetAction('toggleLike'); + } }, refreshLikes() { diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6 index 3b93991342..81b0660052 100644 --- a/test/javascripts/components/text-field-test.js.es6 +++ b/test/javascripts/components/text-field-test.js.es6 @@ -1,17 +1,24 @@ -moduleForComponent("text-field", {needs: []}); +import componentTest from 'helpers/component-test'; -test("renders correctly with no properties set", function() { - var component = this.subject(); - equal(component.get('type'), "text"); +moduleForComponent("text-field", { integration: true }); + +componentTest("renders correctly with no properties set", { + template: `{{text-field}}`, + + test(assert) { + assert.ok(this.$('input[type=text]').length); + } }); -test("support a placeholder", function() { - sandbox.stub(I18n, "t").returnsArg(0); +componentTest("support a placeholder", { + template: `{{text-field placeholderKey="placeholder.i18n.key"}}`, - var component = this.subject({ - placeholderKey: "placeholder.i18n.key" - }); + setup() { + sandbox.stub(I18n, "t").returnsArg(0); + }, - equal(component.get('type'), "text"); - equal(component.get('placeholder'), "placeholder.i18n.key"); + test(assert) { + assert.ok(this.$('input[type=text]').length); + assert.equal(this.$('input').prop('placeholder'), 'placeholder.i18n.key'); + } }); diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index 69b6b67ab0..be0be14a73 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -36,10 +36,24 @@ export default function(name, opts) { this.registry.register('store:main', store, { instantiate: false }); if (opts.setup) { + if (Ember.VERSION[0] === "2") { + // use closure actions instead + this.on = (actionName, fn) => this.set(actionName, fn); + } + opts.setup.call(this, store); } - andThen(() => this.render(opts.template)); + andThen(() => { + // TODO: This shouldn't be necessary + this.owner = { + hasRegistration: (...args) => this.registry.has(...args), + lookup: (...args) => this.container.lookup(...args), + _lookupFactory: (...args) => this.container.lookupFactory(...args) + }; + + return this.render(opts.template); + }); andThen(() => opts.test.call(this, assert)); }); } diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6 index 37df69372f..9ad8d169c5 100644 --- a/test/javascripts/helpers/create-store.js.es6 +++ b/test/javascripts/helpers/create-store.js.es6 @@ -6,8 +6,9 @@ import { buildResolver } from 'discourse-common/resolver'; export default function() { const resolver = buildResolver('discourse').create(); + return Store.create({ - container: { + register: { lookup(type) { if (type === "adapter:rest") { this._restAdapter = this._restAdapter || RestAdapter.create({ container: this }); From 6a1c05a2680082f2895b4813a2083cfbe8943633 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 8 Nov 2016 14:29:50 -0500 Subject: [PATCH 042/266] Upgrade ember-qunit --- .../controllers/poll-ui-builder-test.js.es6 | 5 + .../controllers/admin-user-badges-test.js.es6 | 4 + .../admin/models/admin-user-test.js.es6 | 15 +- .../components/ace-editor-test.js.es6 | 2 + .../controllers/avatar-selector-test.js.es6 | 5 + .../controllers/create-account-test.js.es6 | 5 + test/javascripts/controllers/flag-test.js.es6 | 6 +- .../javascripts/controllers/topic-test.js.es6 | 6 +- vendor/assets/javascripts/ember-qunit.js | 368 ++++++++++++++---- 9 files changed, 341 insertions(+), 75 deletions(-) diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 index 59e8d9266d..1e9446d90e 100644 --- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 +++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 @@ -1,4 +1,9 @@ +import { mapRoutes } from 'discourse/mapping-router'; + moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", { + setup() { + this.registry.register('router:main', mapRoutes()); + }, needs: ['controller:modal'] }); diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 index 3d46614fad..e4a7aaceb4 100644 --- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 +++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 @@ -1,6 +1,10 @@ import Badge from 'discourse/models/badge'; +import { mapRoutes } from 'discourse/mapping-router'; moduleFor('controller:admin-user-badges', { + setup() { + this.registry.register('router:main', mapRoutes()); + }, needs: ['controller:adminUser'] }); diff --git a/test/javascripts/admin/models/admin-user-test.js.es6 b/test/javascripts/admin/models/admin-user-test.js.es6 index eb3a4ed7cb..e735ec9456 100644 --- a/test/javascripts/admin/models/admin-user-test.js.es6 +++ b/test/javascripts/admin/models/admin-user-test.js.es6 @@ -4,21 +4,24 @@ import ApiKey from 'admin/models/api-key'; module("model:admin-user"); -test('generate key', function() { +test('generate key', function(assert) { + assert.expect(2); + var adminUser = AdminUser.create({id: 333}); - blank(adminUser.get('api_key'), 'it has no api key by default'); - adminUser.generateApiKey().then(function() { + assert.ok(!adminUser.get('api_key'), 'it has no api key by default'); + return adminUser.generateApiKey().then(function() { present(adminUser.get('api_key'), 'it has an api_key now'); }); }); -test('revoke key', function() { +test('revoke key', function(assert) { + assert.expect(2); var apiKey = ApiKey.create({id: 1234, key: 'asdfasdf'}), adminUser = AdminUser.create({id: 333, api_key: apiKey}); - equal(adminUser.get('api_key'), apiKey, 'it has the api key in the beginning'); - adminUser.revokeApiKey().then(function() { + assert.equal(adminUser.get('api_key'), apiKey, 'it has the api key in the beginning'); + return adminUser.revokeApiKey().then(function() { blank(adminUser.get('api_key'), 'it cleared the api_key'); }); }); diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js.es6 index 6fa9a533d4..76aa436ff3 100644 --- a/test/javascripts/components/ace-editor-test.js.es6 +++ b/test/javascripts/components/ace-editor-test.js.es6 @@ -5,6 +5,7 @@ moduleForComponent('ace-editor', {integration: true}); componentTest('css editor', { template: '{{ace-editor mode="css"}}', test(assert) { + expect(1); assert.ok(this.$('.ace_editor').length, 'it renders the ace editor'); } }); @@ -12,6 +13,7 @@ componentTest('css editor', { componentTest('html editor', { template: '{{ace-editor mode="html" content="wat"}}', test(assert) { + expect(1); assert.ok(this.$('.ace_editor').length, 'it renders the ace editor'); } }); diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js.es6 index 3f2f0af811..00514303f4 100644 --- a/test/javascripts/controllers/avatar-selector-test.js.es6 +++ b/test/javascripts/controllers/avatar-selector-test.js.es6 @@ -1,4 +1,9 @@ +import { mapRoutes } from 'discourse/mapping-router'; + moduleFor("controller:avatar-selector", "controller:avatar-selector", { + setup() { + this.registry.register('router:main', mapRoutes()); + }, needs: ['controller:modal'] }); diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6 index 0f7284be6f..91156d4e52 100644 --- a/test/javascripts/controllers/create-account-test.js.es6 +++ b/test/javascripts/controllers/create-account-test.js.es6 @@ -1,4 +1,9 @@ +import { mapRoutes } from 'discourse/mapping-router'; + moduleFor("controller:create-account", "controller:create-account", { + setup() { + this.registry.register('router:main', mapRoutes()); + }, needs: ['controller:modal', 'controller:login'] }); diff --git a/test/javascripts/controllers/flag-test.js.es6 b/test/javascripts/controllers/flag-test.js.es6 index 4d4775065d..9036808245 100644 --- a/test/javascripts/controllers/flag-test.js.es6 +++ b/test/javascripts/controllers/flag-test.js.es6 @@ -1,5 +1,6 @@ import createStore from 'helpers/create-store'; import AdminUser from 'admin/models/admin-user'; +import { mapRoutes } from 'discourse/mapping-router'; var buildPost = function(args) { return Discourse.Post.create(_.merge({ @@ -17,6 +18,9 @@ var buildAdminUser = function(args) { }; moduleFor("controller:flag", "controller:flag", { + setup() { + this.registry.register('router:main', mapRoutes()); + }, needs: ['controller:modal'] }); @@ -97,4 +101,4 @@ test("canSendWarning notify_user selected", function(){ sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true); var flagController = this.subject({ model: buildPost() }); canSendWarning(flagController, 'notify_user', true, 'true if current user is staff, selected is notify_user'); -}); \ No newline at end of file +}); diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6 index 342553f230..74bb33dabc 100644 --- a/test/javascripts/controllers/topic-test.js.es6 +++ b/test/javascripts/controllers/topic-test.js.es6 @@ -1,8 +1,12 @@ import { blank, present } from 'helpers/qunit-helpers'; +import { mapRoutes } from 'discourse/mapping-router'; moduleFor('controller:topic', 'controller:topic', { needs: ['controller:modal', 'controller:composer', 'controller:quote-button', - 'controller:application'] + 'controller:application'], + setup() { + this.registry.register('router:main', mapRoutes()); + }, }); import Topic from 'discourse/models/topic'; diff --git a/vendor/assets/javascripts/ember-qunit.js b/vendor/assets/javascripts/ember-qunit.js index ce4a591162..43957ae82c 100644 --- a/vendor/assets/javascripts/ember-qunit.js +++ b/vendor/assets/javascripts/ember-qunit.js @@ -111,7 +111,7 @@ var define, requireModule, require, requirejs; }; })(); -define('ember-qunit', ['exports', 'ember-qunit/module-for', 'ember-qunit/module-for-component', 'ember-qunit/module-for-model', 'ember-qunit/test', 'ember-test-helpers'], function (exports, moduleFor, moduleForComponent, moduleForModel, test, ember_test_helpers) { +define('ember-qunit', ['exports', 'ember-qunit/module-for', 'ember-qunit/module-for-component', 'ember-qunit/module-for-model', 'ember-qunit/test', 'ember-qunit/only', 'ember-test-helpers'], function (exports, moduleFor, moduleForComponent, moduleForModel, test, only, ember_test_helpers) { 'use strict'; @@ -121,6 +121,7 @@ define('ember-qunit', ['exports', 'ember-qunit/module-for', 'ember-qunit/module- exports.moduleForComponent = moduleForComponent['default']; exports.moduleForModel = moduleForModel['default']; exports.test = test['default']; + exports.only = only['default']; exports.setResolver = ember_test_helpers.setResolver; }); @@ -153,6 +154,16 @@ define('ember-qunit/module-for', ['exports', 'ember-qunit/qunit-module', 'ember- } exports['default'] = moduleFor; +}); +define('ember-qunit/only', ['exports', 'ember-qunit/test-wrapper', 'qunit'], function (exports, testWrapper, qunit) { + + 'use strict'; + + function only(testName, callback) { + testWrapper['default'](testName, callback, qunit.only); + } + exports['default'] = only; + }); define('ember-qunit/qunit-module', ['exports', 'qunit'], function (exports, qunit) { @@ -165,7 +176,7 @@ define('ember-qunit/qunit-module', ['exports', 'qunit'], function (exports, quni if (!callbacks) { return; } var beforeEach; - + if (callbacks.setup) { beforeEach = callbacks.setup; delete callbacks.setup; @@ -207,7 +218,7 @@ define('ember-qunit/qunit-module', ['exports', 'qunit'], function (exports, quni qunit.module(module.name, { setup: function(assert) { var done = assert.async(); - module.setup().then(function() { + return module.setup().then(function() { if (beforeEach) { beforeEach.call(module.context, assert); } @@ -219,26 +230,31 @@ define('ember-qunit/qunit-module', ['exports', 'qunit'], function (exports, quni afterEach.call(module.context, assert); } var done = assert.async(); - module.teardown()['finally'](done); + return module.teardown()['finally'](done); } }); } }); -define('ember-qunit/test', ['exports', 'ember', 'ember-test-helpers', 'qunit'], function (exports, Ember, ember_test_helpers, qunit) { +define('ember-qunit/test-wrapper', ['exports', 'ember', 'ember-test-helpers'], function (exports, Ember, ember_test_helpers) { 'use strict'; - function test(testName, callback) { - function wrapper(assert) { + function testWrapper(testName, callback, qunit) { + function wrapper() { var context = ember_test_helpers.getContext(); - var result = callback.call(context, assert); + var result = callback.apply(context, arguments); function failTestOnPromiseRejection(reason) { var message; if (reason instanceof Error) { message = reason.stack; + if (reason.message && message.indexOf(reason.message) < 0) { + // PhantomJS has a `stack` that does not contain the actual + // exception message. + message = Ember['default'].inspect(reason) + "\n" + message; + } } else { message = Ember['default'].inspect(reason); } @@ -251,7 +267,17 @@ define('ember-qunit/test', ['exports', 'ember', 'ember-test-helpers', 'qunit'], }); } - qunit.test(testName, wrapper); + qunit(testName, wrapper); + } + exports['default'] = testWrapper; + +}); +define('ember-qunit/test', ['exports', 'ember-qunit/test-wrapper', 'qunit'], function (exports, testWrapper, qunit) { + + 'use strict'; + + function test(testName, callback) { + testWrapper['default'](testName, callback, qunit.test); } exports['default'] = test; @@ -270,7 +296,7 @@ define('ember-test-helpers', ['exports', 'ember', 'ember-test-helpers/test-modul exports.setResolver = test_resolver.setResolver; }); -define('ember-test-helpers/build-registry', ['exports'], function (exports) { +define('ember-test-helpers/build-registry', ['exports', 'ember'], function (exports, Ember) { 'use strict'; @@ -290,9 +316,11 @@ define('ember-test-helpers/build-registry', ['exports'], function (exports) { ]; function exposeRegistryMethod(container, method) { - container[method] = function() { - return container._registry[method].apply(container._registry, arguments); - }; + if (method in container) { + container[method] = function() { + return container._registry[method].apply(container._registry, arguments); + }; + } } for (var i = 0, l = methods.length; i < l; i++) { @@ -300,9 +328,17 @@ define('ember-test-helpers/build-registry', ['exports'], function (exports) { } } + var Owner = (function() { + if (Ember['default']._RegistryProxyMixin && Ember['default']._ContainerProxyMixin) { + return Ember['default'].Object.extend(Ember['default']._RegistryProxyMixin, Ember['default']._ContainerProxyMixin); + } + + return Ember['default'].Object.extend(); + })(); + exports['default'] = function(resolver) { - var registry, container; - var namespace = Ember.Object.create({ + var fallbackRegistry, registry, container; + var namespace = Ember['default'].Object.create({ Resolver: { create: function() { return resolver; } } }); @@ -314,22 +350,50 @@ define('ember-test-helpers/build-registry', ['exports'], function (exports) { } } - if (Ember.Application.buildRegistry) { - registry = Ember.Application.buildRegistry(namespace); - registry.register('component-lookup:main', Ember.ComponentLookup); + if (Ember['default'].Application.buildRegistry) { + fallbackRegistry = Ember['default'].Application.buildRegistry(namespace); + fallbackRegistry.register('component-lookup:main', Ember['default'].ComponentLookup); + + registry = new Ember['default'].Registry({ + fallback: fallbackRegistry + }); + + // these properties are set on the fallback registry by `buildRegistry` + // and on the primary registry within the ApplicationInstance constructor + // but we need to manually recreate them since ApplicationInstance's are not + // exposed externally + registry.normalizeFullName = fallbackRegistry.normalizeFullName; + registry.makeToString = fallbackRegistry.makeToString; + registry.describe = fallbackRegistry.describe; + + var owner = Owner.create({ + __registry__: registry, + __container__: null + }); + + container = registry.container({ owner: owner }); + owner.__container__ = container; - registry = registry; - container = registry.container(); exposeRegistryMethodsWithoutDeprecations(container); } else { - container = Ember.Application.buildContainer(namespace); - container.register('component-lookup:main', Ember.ComponentLookup); + container = Ember['default'].Application.buildContainer(namespace); + container.register('component-lookup:main', Ember['default'].ComponentLookup); } // Ember 1.10.0 did not properly add `view:toplevel` or `view:default` // to the registry in Ember.Application.buildRegistry :( - register('view:toplevel', Ember.View.extend()); - register('view:default', Ember._MetamorphView); + // + // Ember 2.0.0 removed Ember.View as public API, so only do this when + // Ember.View is present + if (Ember['default'].View) { + register('view:toplevel', Ember['default'].View.extend()); + } + + // Ember 2.0.0 removed Ember._MetamorphView from the Ember global, so only + // do this when present + if (Ember['default']._MetamorphView) { + register('view:default', Ember['default']._MetamorphView); + } var globalContext = typeof global === 'object' && global || self; if (globalContext.DS) { @@ -354,9 +418,17 @@ define('ember-test-helpers/build-registry', ['exports'], function (exports) { } }); -define('ember-test-helpers/isolated-container', function () { +define('ember-test-helpers/has-ember-version', ['exports', 'ember'], function (exports, Ember) { - 'use strict'; + 'use strict'; + + function hasEmberVersion(major, minor) { + var numbers = Ember['default'].VERSION.split('-')[0].split('.'); + var actualMajor = parseInt(numbers[0], 10); + var actualMinor = parseInt(numbers[1], 10); + return actualMajor > major || (actualMajor === major && actualMinor >= minor); + } + exports['default'] = hasEmberVersion; }); define('ember-test-helpers/test-context', ['exports'], function (exports) { @@ -365,6 +437,7 @@ define('ember-test-helpers/test-context', ['exports'], function (exports) { exports.setContext = setContext; exports.getContext = getContext; + exports.unsetContext = unsetContext; var __test_context__; @@ -376,6 +449,10 @@ define('ember-test-helpers/test-context', ['exports'], function (exports) { return __test_context__; } + function unsetContext() { + __test_context__ = undefined; + } + }); define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-helpers/test-module', 'ember', 'ember-test-helpers/test-resolver'], function (exports, TestModule, Ember, test_resolver) { @@ -398,7 +475,14 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h } else if (callbacks.integration) { this.isUnitTest = false; } else { - Ember['default'].deprecate("the component:" + componentName + " test module is implicitly running in unit test mode, which will change to integration test mode by default in an upcoming version of ember-test-helpers. Add `unit: true` or a `needs:[]` list to explicitly opt in to unit test mode."); + Ember['default'].deprecate( + "the component:" + componentName + " test module is implicitly running in unit test mode, " + + "which will change to integration test mode by default in an upcoming version of " + + "ember-test-helpers. Add `unit: true` or a `needs:[]` list to explicitly opt in to unit " + + "test mode.", + false, + { id: 'ember-test-helpers.test-module-for-component.test-type', until: '0.6.0' } + ); this.isUnitTest = true; } @@ -419,45 +503,67 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h throw new Error("component integration tests do not support `subject()`."); }; this.setupSteps.push(this.setupComponentIntegrationTest); - this.teardownSteps.push(this.teardownComponent); + this.teardownSteps.unshift(this.teardownComponent); } + + if (Ember['default'].View && Ember['default'].View.views) { + this.setupSteps.push(this._aliasViewRegistry); + this.teardownSteps.unshift(this._resetViewRegistry); + } + }, + + _aliasViewRegistry: function() { + this._originalGlobalViewRegistry = Ember['default'].View.views; + var viewRegistry = this.container.lookup('-view-registry:main'); + + if (viewRegistry) { + Ember['default'].View.views = viewRegistry; + } + }, + + _resetViewRegistry: function() { + Ember['default'].View.views = this._originalGlobalViewRegistry; }, setupComponentUnitTest: function() { var _this = this; var resolver = test_resolver.getResolver(); - var container = this.container; var context = this.context; var layoutName = 'template:components/' + this.componentName; var layout = resolver.resolve(layoutName); + var thingToRegisterWith = this.registry || this.container; if (layout) { - container.register(layoutName, layout); - container.injection(this.subjectName, 'layout', layoutName); + thingToRegisterWith.register(layoutName, layout); + thingToRegisterWith.injection(this.subjectName, 'layout', layoutName); } - context.dispatcher = Ember['default'].EventDispatcher.create(); + context.dispatcher = this.container.lookup('event_dispatcher:main') || Ember['default'].EventDispatcher.create(); context.dispatcher.setup({}, '#ember-testing'); this.callbacks.render = function() { - var containerView = Ember['default'].ContainerView.create({container: container}); + var subject; + Ember['default'].run(function(){ - var subject = context.subject(); - containerView.pushObject(subject); - containerView.appendTo('#ember-testing'); + subject = context.subject(); + subject.appendTo('#ember-testing'); }); _this.teardownSteps.unshift(function() { Ember['default'].run(function() { - Ember['default'].tryInvoke(containerView, 'destroy'); + Ember['default'].tryInvoke(subject, 'destroy'); }); }); }; this.callbacks.append = function() { - Ember['default'].deprecate('this.append() is deprecated. Please use this.render() or this.$() instead.'); + Ember['default'].deprecate( + 'this.append() is deprecated. Please use this.render() or this.$() instead.', + false, + { id: 'ember-test-helpers.test-module-for-component.append', until: '0.6.0' } + ); return context.$(); }; @@ -472,10 +578,15 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h setupComponentIntegrationTest: function() { var module = this; var context = this.context; - context.dispatcher = Ember['default'].EventDispatcher.create(); - context.dispatcher.setup({}, '#ember-testing'); + this.actionHooks = {}; + context.dispatcher = this.container.lookup('event_dispatcher:main') || Ember['default'].EventDispatcher.create(); + context.dispatcher.setup({}, '#ember-testing'); + context.actions = module.actionHooks; + + (this.registry || this.container).register('component:-test-holder', Ember['default'].Component.extend()); + context.render = function(template) { if (!template) { throw new Error("in a component integration test you must pass a template to `render()`"); @@ -486,12 +597,12 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h if (typeof template === 'string') { template = Ember['default'].Handlebars.compile(template); } - module.component = Ember['default'].Component.create({ - layout: template, - container: module.container + module.component = module.container.lookupFactory('component:-test-holder').create({ + layout: template }); + module.component.set('context' ,context); - module.component.set('controller', module); + module.component.set('controller', context); Ember['default'].run(function() { module.component.appendTo('#ember-testing'); @@ -508,32 +619,47 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h }); }; + context.setProperties = function(hash) { + Ember['default'].run(function() { + Ember['default'].setProperties(context, hash); + }); + }; + context.get = function(key) { return Ember['default'].get(context, key); }; + context.getProperties = function() { + var args = Array.prototype.slice.call(arguments); + return Ember['default'].getProperties(context, args); + }; + context.on = function(actionName, handler) { module.actionHooks[actionName] = handler; }; - + context.send = function(actionName) { + var hook = module.actionHooks[actionName]; + if (!hook) { + throw new Error("integration testing template received unexpected action " + actionName); + } + hook.apply(module, Array.prototype.slice.call(arguments, 1)); + }; }, setupContext: function() { this._super.call(this); + + // only setup the injection if we are running against a version + // of Ember that has `-view-registry:main` (Ember >= 1.12) + if (this.container.lookupFactory('-view-registry:main')) { + (this.registry || this.container).injection('component', '_viewRegistry', '-view-registry:main'); + } + if (!this.isUnitTest) { this.context.factory = function() {}; } }, - - send: function(actionName) { - var hook = this.actionHooks[actionName]; - if (!hook) { - throw new Error("integration testing template received unexpected action " + actionName); - } - hook.apply(this, Array.prototype.slice.call(arguments, 1)); - }, - teardownComponent: function() { var component = this.component; if (component) { @@ -542,8 +668,6 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h }); } } - - }); }); @@ -568,7 +692,10 @@ define('ember-test-helpers/test-module-for-model', ['exports', 'ember-test-helpe var adapterFactory = container.lookupFactory('adapter:application'); if (!adapterFactory) { - container.register('adapter:application', DS.FixtureAdapter); + adapterFactory = DS.JSONAPIAdapter || DS.FixtureAdapter; + + var thingToRegisterWith = this.registry || this.container; + thingToRegisterWith.register('adapter:application', adapterFactory); } callbacks.store = function(){ @@ -591,7 +718,7 @@ define('ember-test-helpers/test-module-for-model', ['exports', 'ember-test-helpe }); }); -define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helpers/test-context', 'klassy', 'ember-test-helpers/test-resolver', 'ember-test-helpers/build-registry'], function (exports, Ember, test_context, klassy, test_resolver, buildRegistry) { +define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helpers/test-context', 'klassy', 'ember-test-helpers/test-resolver', 'ember-test-helpers/build-registry', 'ember-test-helpers/has-ember-version', 'ember-test-helpers/wait'], function (exports, Ember, test_context, klassy, test_resolver, buildRegistry, hasEmberVersion, wait) { 'use strict'; @@ -609,6 +736,10 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper this.name = description || subjectName; this.callbacks = callbacks || {}; + if (this.callbacks.integration && this.callbacks.needs) { + throw new Error("cannot declare 'integration: true' and 'needs' in the same module"); + } + if (this.callbacks.integration) { this.isIntegration = callbacks.integration; delete callbacks.integration; @@ -644,6 +775,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper this.setupSteps.push(this.setupContainer); this.setupSteps.push(this.setupContext); this.setupSteps.push(this.setupTestElements); + this.setupSteps.push(this.setupAJAXListeners); if (this.callbacks.setup) { this.contextualizedSetupSteps.push( this.callbacks.setup ); @@ -664,6 +796,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper this.teardownSteps.push(this.teardownContainer); this.teardownSteps.push(this.teardownContext); this.teardownSteps.push(this.teardownTestElements); + this.teardownSteps.push(this.teardownAJAXListeners); if (this.callbacks.afterTeardown) { this.teardownSteps.push( this.callbacks.afterTeardown ); @@ -729,10 +862,29 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper container: this.container, registry: this.registry, factory: factory, - dispatcher: null + dispatcher: null, + register: function() { + var target = this.registry || this.container; + return target.register.apply(target, arguments); + }, + inject: {} }); - this.context = test_context.getContext(); + var context = this.context = test_context.getContext(); + + if (Ember['default'].setOwner) { + Ember['default'].setOwner(context, this.container.owner); + } + + if (Ember['default'].inject) { + var keys = (Object.keys || Ember['default'].keys)(Ember['default'].inject); + keys.forEach(function(typeName) { + context.inject[typeName] = function(name, opts) { + var alias = (opts && opts.as) || name; + Ember['default'].set(context, alias, context.container.lookup(typeName + ':' + name)); + }; + }); + } }, setupTestElements: function() { @@ -741,6 +893,10 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper } }, + setupAJAXListeners: function() { + wait._setupAJAXHooks(); + }, + teardownSubject: function() { var subject = this.cache.subject; @@ -760,7 +916,10 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper teardownContext: function() { var context = this.context; - if (context.dispatcher) { + this.context = undefined; + test_context.unsetContext(); + + if (context.dispatcher && !context.dispatcher.isDestroyed) { Ember['default'].run(function() { context.dispatcher.destroy(); }); @@ -769,7 +928,16 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper teardownTestElements: function() { Ember['default'].$('#ember-testing').empty(); - Ember['default'].View.views = {}; + + // Ember 2.0.0 removed Ember.View as public API, so only do this when + // Ember.View is present + if (Ember['default'].View && Ember['default'].View.views) { + Ember['default'].View.views = {}; + } + }, + + teardownAJAXListeners: function() { + wait._teardownAJAXHooks(); }, defaultSubject: function(options, factory) { @@ -813,10 +981,12 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper this.container = items.container; this.registry = items.registry; - var thingToRegisterWith = this.registry || this.container; - var router = resolver.resolve('router:main'); - router = router || Ember['default'].Router.extend(); - thingToRegisterWith.register('router:main', router); + if (hasEmberVersion['default'](1, 13)) { + var thingToRegisterWith = this.registry || this.container; + var router = resolver.resolve('router:main'); + router = router || Ember['default'].Router.extend(); + thingToRegisterWith.register('router:main', router); + } }, _setupIsolatedContainer: function() { @@ -831,7 +1001,11 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper thingToRegisterWith.register(fullName, resolver.resolve(normalizedFullName)); } - thingToRegisterWith.resolver = function() { }; + if (this.registry) { + this.registry.fallback.resolver = function() {}; + } else { + this.container.resolver = function() {}; + } }, _setupIntegratedContainer: function() { @@ -859,6 +1033,64 @@ define('ember-test-helpers/test-resolver', ['exports'], function (exports) { return __resolver__; } +}); +define('ember-test-helpers/wait', ['exports', 'ember'], function (exports, Ember) { + + 'use strict'; + + exports._teardownAJAXHooks = _teardownAJAXHooks; + exports._setupAJAXHooks = _setupAJAXHooks; + + var requests; + function incrementAjaxPendingRequests(_, xhr) { + requests.push(xhr); + } + + function decrementAjaxPendingRequests(_, xhr) { + for (var i = 0;i < requests.length;i++) { + if (xhr === requests[i]) { + requests.splice(i, 1); + } + } + } + + function _teardownAJAXHooks() { + jQuery(document).off('ajaxSend', incrementAjaxPendingRequests); + jQuery(document).off('ajaxComplete', decrementAjaxPendingRequests); + } + + function _setupAJAXHooks() { + requests = []; + + jQuery(document).on('ajaxSend', incrementAjaxPendingRequests); + jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests); + } + + function wait(_options) { + var options = _options || {}; + var waitForTimers = options.hasOwnProperty('waitForTimers') ? options.waitForTimers : true; + var waitForAJAX = options.hasOwnProperty('waitForAJAX') ? options.waitForAJAX : true; + + return new Ember['default'].RSVP.Promise(function(resolve) { + var watcher = self.setInterval(function() { + if (waitForTimers && (Ember['default'].run.hasScheduledTimers() || Ember['default'].run.currentRunLoop)) { + return; + } + + if (waitForAJAX && requests && requests.length > 0) { + return; + } + + // Stop polling + self.clearInterval(watcher); + + // Synchronously resolve the promise + Ember['default'].run(null, resolve); + }, 10); + }); + } + exports['default'] = wait; + }); define('klassy', ['exports'], function (exports) { @@ -1022,12 +1254,14 @@ define('qunit', ['exports'], function (exports) { var module = QUnit.module; var test = QUnit.test; var skip = QUnit.skip; + var only = QUnit.only; exports['default'] = QUnit; exports.module = module; exports.test = test; exports.skip = skip; + exports.only = only; }); define("ember", ["exports"], function(__exports__) { From 7d560ea3d564d87198ea911ae92093041e467ab7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 8 Nov 2016 14:42:10 -0500 Subject: [PATCH 043/266] More ember-qunit fixes --- .../javascripts/helpers/component-test.js.es6 | 12 --- vendor/assets/javascripts/ember-qunit.js | 75 +++++++++++++------ 2 files changed, 54 insertions(+), 33 deletions(-) diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index be0be14a73..341c106b33 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -36,22 +36,10 @@ export default function(name, opts) { this.registry.register('store:main', store, { instantiate: false }); if (opts.setup) { - if (Ember.VERSION[0] === "2") { - // use closure actions instead - this.on = (actionName, fn) => this.set(actionName, fn); - } - opts.setup.call(this, store); } andThen(() => { - // TODO: This shouldn't be necessary - this.owner = { - hasRegistration: (...args) => this.registry.has(...args), - lookup: (...args) => this.container.lookup(...args), - _lookupFactory: (...args) => this.container.lookupFactory(...args) - }; - return this.render(opts.template); }); andThen(() => opts.test.call(this, assert)); diff --git a/vendor/assets/javascripts/ember-qunit.js b/vendor/assets/javascripts/ember-qunit.js index 43957ae82c..759edca9be 100644 --- a/vendor/assets/javascripts/ember-qunit.js +++ b/vendor/assets/javascripts/ember-qunit.js @@ -159,8 +159,12 @@ define('ember-qunit/only', ['exports', 'ember-qunit/test-wrapper', 'qunit'], fun 'use strict'; - function only(testName, callback) { - testWrapper['default'](testName, callback, qunit.only); + function only(/* testName, expected, callback, async */) { + for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; ++_key) { + args[_key] = arguments[_key]; + } + args.unshift(qunit.only); + testWrapper['default'].apply(null, args); } exports['default'] = only; @@ -240,7 +244,12 @@ define('ember-qunit/test-wrapper', ['exports', 'ember', 'ember-test-helpers'], f 'use strict'; - function testWrapper(testName, callback, qunit) { + function testWrapper(qunit /*, testName, expected, callback, async */) { + var callback; + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; ++_key) { + args[_key - 1] = arguments[_key]; + } + function wrapper() { var context = ember_test_helpers.getContext(); @@ -267,7 +276,13 @@ define('ember-qunit/test-wrapper', ['exports', 'ember', 'ember-test-helpers'], f }); } - qunit(testName, wrapper); + if (args.length === 2) { + callback = args.splice(1, 1, wrapper)[0]; + } else { + callback = args.splice(2, 1, wrapper)[0]; + } + + qunit.apply(null, args); } exports['default'] = testWrapper; @@ -276,8 +291,12 @@ define('ember-qunit/test', ['exports', 'ember-qunit/test-wrapper', 'qunit'], fun 'use strict'; - function test(testName, callback) { - testWrapper['default'](testName, callback, qunit.test); + function test(/* testName, expected, callback, async */) { + for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; ++_key) { + args[_key] = arguments[_key]; + } + args.unshift(qunit.test); + testWrapper['default'].apply(null, args); } exports['default'] = test; @@ -459,6 +478,8 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h 'use strict'; exports['default'] = TestModule['default'].extend({ + isComponentTestModule: true, + init: function(componentName, description, callbacks) { // Allow `description` to be omitted if (!callbacks && typeof description === 'object') { @@ -486,17 +507,17 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h this.isUnitTest = true; } - if (!this.isUnitTest) { - callbacks.integration = true; - } - if (description) { this._super.call(this, 'component:' + componentName, description, callbacks); } else { this._super.call(this, 'component:' + componentName, callbacks); } - if (this.isUnitTest) { + if (!this.isUnitTest && !this.isLegacy) { + callbacks.integration = true; + } + + if (this.isUnitTest || this.isLegacy) { this.setupSteps.push(this.setupComponentUnitTest); } else { this.callbacks.subject = function() { @@ -655,7 +676,7 @@ define('ember-test-helpers/test-module-for-component', ['exports', 'ember-test-h (this.registry || this.container).injection('component', '_viewRegistry', '-view-registry:main'); } - if (!this.isUnitTest) { + if (!this.isUnitTest && !this.isLegacy) { this.context.factory = function() {}; } }, @@ -741,7 +762,16 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper } if (this.callbacks.integration) { - this.isIntegration = callbacks.integration; + if (this.isComponentTestModule) { + this.isLegacy = (callbacks.integration === 'legacy'); + this.isIntegration = (callbacks.integration !== 'legacy'); + } else { + if (callbacks.integration === 'legacy') { + throw new Error('`integration: \'legacy\'` is only valid for component tests.'); + } + this.isIntegration = true; + } + delete callbacks.integration; } @@ -843,7 +873,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper }, setupContainer: function() { - if (this.isIntegration) { + if (this.isIntegration || this.isLegacy) { this._setupIntegratedContainer(); } else { this._setupIsolatedContainer(); @@ -974,9 +1004,14 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper } }, - _setupContainer: function() { + _setupContainer: function(isolated) { var resolver = test_resolver.getResolver(); - var items = buildRegistry['default'](resolver); + + var items = buildRegistry['default'](!isolated ? resolver : Object.create(resolver, { + resolve: { + value: function() {} + } + })); this.container = items.container; this.registry = items.registry; @@ -991,7 +1026,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper _setupIsolatedContainer: function() { var resolver = test_resolver.getResolver(); - this._setupContainer(); + this._setupContainer(true); var thingToRegisterWith = this.registry || this.container; @@ -1001,9 +1036,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', 'ember-test-helper thingToRegisterWith.register(fullName, resolver.resolve(normalizedFullName)); } - if (this.registry) { - this.registry.fallback.resolver = function() {}; - } else { + if (!this.registry) { this.container.resolver = function() {}; } }, @@ -1277,4 +1310,4 @@ window.test = emberQunit.test; window.setResolver = emberQunit.setResolver; })(); -//# sourceMappingURL=ember-qunit.map +//# sourceMappingURL=ember-qunit.map \ No newline at end of file From 86522a52b7d12eb2379535aac6041b2165403243 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 8 Nov 2016 16:36:34 -0500 Subject: [PATCH 044/266] FEATURE: add censored_pattern setting to censor posts using regex --- .../pretty-text/censored-words.js.es6 | 45 +++++++++++++------ .../discourse-markdown/censored.js.es6 | 4 +- config/locales/server.en.yml | 2 + config/site_settings.yml | 5 +++ lib/pretty_text.rb | 13 +++++- lib/site_setting_extension.rb | 6 ++- lib/validators/regex_setting_validator.rb | 25 +++++++++++ spec/components/pretty_text_spec.rb | 9 ++++ .../regex_setting_validator_spec.rb | 24 ++++++++++ test/javascripts/lib/pretty-text-test.js.es6 | 6 ++- 10 files changed, 121 insertions(+), 18 deletions(-) create mode 100644 lib/validators/regex_setting_validator.rb create mode 100644 spec/components/validators/regex_setting_validator_spec.rb diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6 index a715b757ec..e81032393f 100644 --- a/app/assets/javascripts/pretty-text/censored-words.js.es6 +++ b/app/assets/javascripts/pretty-text/censored-words.js.es6 @@ -1,19 +1,38 @@ -export function censor(text, censoredWords) { - if (censoredWords && censoredWords.length) { - const split = censoredWords.split("|"); - let censorRegexp; - if (split && split.length) { - censorRegexp = new RegExp("(\\b(?:" + split.map(function (t) { return "(" + t.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + ")"; }).join("|") + ")\\b)(?![^\\(]*\\))", "ig"); - } +export function censor(text, censoredWords, censoredPattern) { + let patterns = [], + originalText = text; - if (censorRegexp) { - let m = censorRegexp.exec(text); - while (m && m[0]) { - const replacement = new Array(m[0].length+1).join('■'); - text = text.replace(new RegExp("(\\b" + m[0] + "\\b)(?![^\\(]*\\))", "ig"), replacement); - m = censorRegexp.exec(text); + if (censoredWords && censoredWords.length) { + patterns = censoredWords.split("|").map(t => { return "(" + t.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + ")"; }); + } + + if (censoredPattern && censoredPattern.length > 0) { + try { + new RegExp(censoredPattern); // exception if invalid + patterns.push("(" + censoredPattern + ")"); + } catch(e) {} + } + + if (patterns.length) { + let censorRegexp; + + try { + censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig"); + + if (censorRegexp) { + let m = censorRegexp.exec(text); + + while (m && m[0]) { + if (m[0].length > originalText.length) { return originalText; } // regex is dangerous + const replacement = new Array(m[0].length+1).join('■'); + text = text.replace(new RegExp("(\\b" + m[0] + "\\b)(?![^\\(]*\\))", "ig"), replacement); + m = censorRegexp.exec(text); + } } + } catch(e) { + return originalText; } } + return text; } diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 index ecb463f8c3..b0ac2e5acc 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 @@ -4,10 +4,12 @@ import { registerOption } from 'pretty-text/pretty-text'; registerOption((siteSettings, opts) => { opts.features.censored = true; opts.censoredWords = siteSettings.censored_words; + opts.censoredPattern = siteSettings.censored_pattern; }); export function setup(helper) { helper.addPreProcessor(text => { - return censor(text, helper.getOptions().censoredWords); + const options = helper.getOptions(); + return censor(text, options.censoredWords, options.censoredPattern); }); } diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index e693cdf043..04b2e4d94e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -828,6 +828,7 @@ en: site_settings: censored_words: "Words that will be automatically replaced with ■■■■" + censored_pattern: "Regex pattern that will be automatically replaced with ■■■■" delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days." default_locale: "The default language of this Discourse instance (ISO 639-1 Code)" allow_user_locale: "Allow users to choose their own language interface preference" @@ -1442,6 +1443,7 @@ en: reply_by_email_address_is_empty: "You must set a 'reply by email address' before enabling reply by email." email_polling_disabled: "You must enable either manual or POP3 polling before enabling reply by email." user_locale_not_enabled: "You must first enable 'allow user locale' before enabling this setting." + invalid_regex: "Regex is invalid or not allowed." search: within_post: "#%{post_number} by %{username}" diff --git a/config/site_settings.yml b/config/site_settings.yml index f93bc56709..92776b8eea 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -536,6 +536,11 @@ posting: default: '' refresh: true type: list + censored_pattern: + client: true + default: '' + refresh: true + type: regex enable_emoji: default: true client: true diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index d3d6d4ed42..412ca02d3a 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -212,7 +212,18 @@ module PrettyText options[:topicId] = opts[:topic_id] working_text = text.dup - sanitized = markdown(working_text, options) + + begin + sanitized = markdown(working_text, options) + rescue MiniRacer::ScriptTerminatedError => e + if SiteSetting.censored_pattern.present? + Rails.logger.warn "Post cooking timed out. Clearing the censored_pattern setting and retrying." + SiteSetting.censored_pattern = nil + sanitized = markdown(working_text, options) + else + raise e + end + end doc = Nokogiri::HTML.fragment(sanitized) diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 3fb3b01550..70e576f08d 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -32,7 +32,8 @@ module SiteSettingExtension url_list: 9, host_list: 10, category_list: 11, - value_list: 12) + value_list: 12, + regex: 13) end def mutex @@ -443,7 +444,8 @@ module SiteSettingExtension types[:fixnum] => IntegerSettingValidator, types[:string] => StringSettingValidator, 'list' => StringSettingValidator, - 'enum' => StringSettingValidator + 'enum' => StringSettingValidator, + 'regex' => RegexSettingValidator } @validator_mapping[type_name] end diff --git a/lib/validators/regex_setting_validator.rb b/lib/validators/regex_setting_validator.rb new file mode 100644 index 0000000000..e1aa9900b6 --- /dev/null +++ b/lib/validators/regex_setting_validator.rb @@ -0,0 +1,25 @@ +class RegexSettingValidator + + LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'.freeze + + def initialize(opts={}) + @opts = opts + end + + def valid_value?(val) + !val.present? || valid_regex?(val) + end + + # Check that string is a valid regex, and that it doesn't match most of the lorem string. + def valid_regex?(val) + r = Regexp.new(val) + matches = r.match(LOREM) + matches.nil? || matches[0].length < (LOREM.length - 10) + rescue + false + end + + def error_message + I18n.t('site_settings.errors.invalid_regex') + end +end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 109181333f..63577b90e9 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -438,4 +438,13 @@ HTML end end + describe "censored_pattern site setting" do + it "can be cleared if it causes cooking to timeout" do + SiteSetting.censored_pattern = "evilregex" + described_class.stubs(:markdown).raises(MiniRacer::ScriptTerminatedError) + PrettyText.cook("Protect against it plz.") rescue nil + expect(SiteSetting.censored_pattern).to be_blank + end + end + end diff --git a/spec/components/validators/regex_setting_validator_spec.rb b/spec/components/validators/regex_setting_validator_spec.rb new file mode 100644 index 0000000000..b7bb82f24e --- /dev/null +++ b/spec/components/validators/regex_setting_validator_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +describe RegexSettingValidator do + describe '#valid_value?' do + subject(:validator) { described_class.new } + + it "returns true for blank values" do + expect(validator.valid_value?('')).to eq(true) + expect(validator.valid_value?(nil)).to eq(true) + end + + it "return false for invalid regex" do + expect(validator.valid_value?('(()')).to eq(false) + end + + it "returns false for regex with dangerous matches" do + expect(validator.valid_value?('(.)*')).to eq(false) + end + + it "returns true for safe regex" do + expect(validator.valid_value?('\d{3}-\d{4}')).to eq(true) + end + end +end diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6 index fb9c04f0ed..790967119a 100644 --- a/test/javascripts/lib/pretty-text-test.js.es6 +++ b/test/javascripts/lib/pretty-text-test.js.es6 @@ -11,7 +11,8 @@ const defaultOpts = buildOptions({ emoji_set: 'emoji_one', highlighted_languages: 'json|ruby|javascript', default_code_lang: 'auto', - censored_words: 'shucks|whiz|whizzer' + censored_words: 'shucks|whiz|whizzer', + censored_pattern: '\\d{3}-\\d{4}|tech\\w*' }, getURL: url => url }); @@ -532,6 +533,9 @@ test("censoring", function() { cooked("The link still works. [whiz](http://www.whiz.com)", "

The link still works. ■■■■

", "it won't break links by censoring them."); + cooked("Call techapj the computer whiz at 555-555-1234 for free help.", + "

Call ■■■■■■■ the computer ■■■■ at 555-■■■■■■■■ for free help.

", + "uses both censored words and patterns from site settings"); }); test("code blocks/spans hoisting", function() { From bd77f5cb7239fe21cb549ae45b88636d6995ec77 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Tue, 8 Nov 2016 19:56:13 -0200 Subject: [PATCH 045/266] FIX: Last Visit line shouldn't appear on /top --- .../javascripts/discourse/components/topic-list.js.es6 | 10 +++++++--- .../discourse/templates/discovery/topics.hbs | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6 index 522efc4346..260bddb756 100644 --- a/app/assets/javascripts/discourse/components/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-list.js.es6 @@ -40,12 +40,12 @@ export default Ember.Component.extend({ } }, - @observes('topics', 'order', 'ascending', 'category') + @observes('topics', 'order', 'ascending', 'category', 'top') lastVisitedTopicChanged() { this.refreshLastVisited(); }, - _updateLastVisitedTopic(topics, order, ascending) { + _updateLastVisitedTopic(topics, order, ascending, top) { this.set('lastVisitedTopic', null); @@ -57,6 +57,10 @@ export default Ember.Component.extend({ return; } + if (top) { + return; + } + if (!topics || topics.length === 1) { return; } @@ -103,7 +107,7 @@ export default Ember.Component.extend({ }, refreshLastVisited() { - this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending')); + this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending'), this.get('top')); }, click(e) { diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 2f9ec77044..8d0ab34d9e 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -34,6 +34,7 @@ {{#if hasTopics}} {{topic-list highlightLastVisited=true + top=top showTopicPostBadges=showTopicPostBadges showPosters=true currentUser=currentUser From f10520a5f2c6e72f3e032aa64aea62a60e6674d2 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 8 Nov 2016 17:59:51 -0500 Subject: [PATCH 046/266] fix broken js lint --- app/assets/javascripts/pretty-text/censored-words.js.es6 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6 index e81032393f..bc9aa59ee0 100644 --- a/app/assets/javascripts/pretty-text/censored-words.js.es6 +++ b/app/assets/javascripts/pretty-text/censored-words.js.es6 @@ -7,10 +7,7 @@ export function censor(text, censoredWords, censoredPattern) { } if (censoredPattern && censoredPattern.length > 0) { - try { - new RegExp(censoredPattern); // exception if invalid - patterns.push("(" + censoredPattern + ")"); - } catch(e) {} + patterns.push("(" + censoredPattern + ")"); } if (patterns.length) { From 263a43bcfdb998506751cf5ac1659653087f10c5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 09:56:36 +0800 Subject: [PATCH 047/266] UX: Use a gradient instead of a border. --- app/assets/stylesheets/common/base/discourse.scss | 11 ++++++++--- app/assets/stylesheets/mobile.scss | 1 + app/assets/stylesheets/mobile/ring.scss | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 app/assets/stylesheets/mobile/ring.scss diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 987c304206..4362f4779e 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -167,12 +167,17 @@ body { } .ring { - top: -13px !important; - right: 21px !important; + $gradient-start: transparent; + $gradient-end: #090; + background: -webkit-radial-gradient($gradient-start, $gradient-end); + background: -o-radial-gradient($gradient-start, $gradient-end); + background: -moz-radial-gradient($gradient-start, $gradient-end); + background: radial-gradient($gradient-start, $gradient-end); + top: -11px !important; + right: 24px !important; border-radius: 100%; width: 20px; height: 20px; - border: solid #090 3px; -moz-animation-iteration-count: infinite; -webkit-animation-iteration-count: infinite; -webkit-transform-origin: center; diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 47dbba7ef2..4152083286 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -21,6 +21,7 @@ @import "mobile/menu-panel"; @import "mobile/search"; @import "mobile/emoji"; +@import "mobile/ring"; /* These files doesn't actually exist, they are injected by DiscourseSassImporter. */ diff --git a/app/assets/stylesheets/mobile/ring.scss b/app/assets/stylesheets/mobile/ring.scss new file mode 100644 index 0000000000..2da82b54c9 --- /dev/null +++ b/app/assets/stylesheets/mobile/ring.scss @@ -0,0 +1,3 @@ +.ring { + top: -7px !important; +} From 857986e2c04919ae0bda98b7929a8afbd298ac28 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 11:13:34 +0800 Subject: [PATCH 048/266] FIX: Don't change return value to blank string. --- lib/composer_messages_finder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb index 551222b131..347ca208e8 100644 --- a/lib/composer_messages_finder.rb +++ b/lib/composer_messages_finder.rb @@ -17,7 +17,7 @@ class ComposerMessagesFinder # Determines whether to show the user education text def check_education_message - return '' if @topic && @topic.archetype == Archetype.private_message + return if @topic && @topic.archetype == Archetype.private_message if creating_topic? count = @user.created_topic_count @@ -37,7 +37,7 @@ class ComposerMessagesFinder } end - '' + nil end # New users have a limited number of replies in a topic From 2d2998f5e0b3ec343f0f4c469f03196bbbbe175d Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 11:31:53 +0800 Subject: [PATCH 049/266] Fix specs. --- spec/components/composer_messages_finder_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb index 706c8f7f0c..8bc709e58a 100644 --- a/spec/components/composer_messages_finder_spec.rb +++ b/spec/components/composer_messages_finder_spec.rb @@ -48,7 +48,7 @@ describe ComposerMessagesFinder do let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'createTopic', topic_id: topic.id) } it 'should return an empty string' do - expect(finder.check_education_message).to eq('') + expect(finder.check_education_message).to eq(nil) end end @@ -56,7 +56,7 @@ describe ComposerMessagesFinder do let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'reply', topic_id: topic.id) } it 'should return an empty string' do - expect(finder.check_education_message).to eq('') + expect(finder.check_education_message).to eq(nil) end end end From 74e188992483e8d55376a98b33a440c022c098de Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 13:37:13 +0800 Subject: [PATCH 050/266] FEATURE: Scroll to new posts when user is near bottom of PM. --- .../discourse/controllers/topic.js.es6 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index b64e00a3c1..1f182103a7 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -9,6 +9,7 @@ import Composer from 'discourse/models/composer'; import DiscourseURL from 'discourse/lib/url'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import Post from 'discourse/models/post'; +import debounce from 'discourse/lib/debounce'; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { composer: Ember.inject.controller(), @@ -668,6 +669,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { const topic = this.get('model'); const postStream = topic.get('postStream'); const post = postStream.findLoadedPost(postId); + if (post) { DiscourseURL.routeTo(topic.urlForPostNumber(post.get('post_number'))); } else { @@ -838,10 +840,30 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { topic.reload().then(() => { this.send('postChangedRoute', topic.get('post_number') || 1); }); + } else { + const postNumber = data.post_number; + const notInPostStream = topic.get('highest_post_number') <= postNumber; + const postNumberDifference = postNumber - topic.get('currentPost'); + + if (notInPostStream && + topic.get('isPrivateMessage') && + postNumberDifference > 0 && + postNumberDifference < 7) { + + this._scrollToPost(data.post_number); + } } }); }, + _scrollToPost: debounce(function(postNumber) { + const $post = $(`.topic-post article#post_${postNumber}`); + + if ($post.length === 0) return; + + $('body').animate({ scrollTop: $post.offset().top }, 1000); + }, 500), + unsubscribe() { const topicId = this.get('content.id'); if (!topicId) return; From 7a1400cc4b819b02b7ccf13eba9d6a0d974cc079 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 3 Nov 2016 04:46:37 +0800 Subject: [PATCH 051/266] Remove undefined variable. --- lib/tasks/qunit.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake index 5aa1d79012..f3ec75b8db 100644 --- a/lib/tasks/qunit.rake +++ b/lib/tasks/qunit.rake @@ -60,7 +60,7 @@ task "qunit:test" => :environment do # A bit of a hack until we can figure this out on Travis tries = 0 - while tries < 3 && $?.exitstatus == 124 && !quit + while tries < 3 && $?.exitstatus == 124 tries += 1 puts "\nTimed Out. Trying again...\n" rake_system(cmd) From 4a2656192733ca84de8a702cbaf2c36651bf2368 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 21:34:32 +0800 Subject: [PATCH 052/266] Only scroll to posts that are not your own in PMs. --- .../discourse/controllers/topic.js.es6 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 1f182103a7..d32993ac75 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -841,16 +841,20 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { this.send('postChangedRoute', topic.get('post_number') || 1); }); } else { - const postNumber = data.post_number; - const notInPostStream = topic.get('highest_post_number') <= postNumber; - const postNumberDifference = postNumber - topic.get('currentPost'); + if (topic.get('isPrivateMessage') && + this.currentUser && + this.currentUser.get('id') !== data.user_id) { - if (notInPostStream && - topic.get('isPrivateMessage') && + const postNumber = data.post_number; + const notInPostStream = topic.get('highest_post_number') <= postNumber; + const postNumberDifference = postNumber - topic.get('currentPost'); + + if (notInPostStream && postNumberDifference > 0 && postNumberDifference < 7) { - this._scrollToPost(data.post_number); + this._scrollToPost(data.post_number); + } } } }); From 541c29ff4d7b1738c3c98911d9891e2fa00b2568 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 9 Nov 2016 20:16:29 +0530 Subject: [PATCH 053/266] Update Translations --- config/locales/client.ar.yml | 34 ++++++++++++++++++ config/locales/client.et.yml | 4 +++ config/locales/client.fi.yml | 1 + config/locales/client.fr.yml | 2 +- config/locales/client.ru.yml | 36 ++++++++++++++++++-- config/locales/client.zh_TW.yml | 1 + config/locales/server.fi.yml | 10 ++++++ config/locales/server.he.yml | 2 +- config/locales/server.nb_NO.yml | 10 ++++++ config/locales/server.sk.yml | 2 +- plugins/poll/config/locales/client.nb_NO.yml | 7 ++++ plugins/poll/config/locales/server.nb_NO.yml | 3 ++ 12 files changed, 107 insertions(+), 5 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index d0fae2ed46..5e8a83e146 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -1166,12 +1166,46 @@ ar: category: "ابحث في فئة #{{category}}" topic: "ابحث في هذا الموضوع" private_messages: "البحث في الرسائل الخاصة" + advanced: + title: البحث التفصيلي + posted_by: + label: المشارك + in_category: + label: في الفئة + in_group: + label: في المجموعة + with_badge: + label: مع الشعارات + filters: + label: استرجع فقط المواضيع/المشاركات التي... + likes: أعجبني + posted: شاركت في + watching: أنا اراقب + tracking: أنا اتابع + private: من ضمن رسائلي + bookmarks: أضفت للمفضلات + first: تلك المشاركة الاولى + statuses: + label: عندما المواضيع + open: مفتوحة + closed: مغلقة + archived: محفوظة + noreplies: لا تحتوي على رد + single_user: تحتوي على مستخدم واحد + post: + count: + label: عدد المشاركات الأدنى + time: + label: ا’رْسِلت + before: قبل + after: بعد hamburger_menu: "انتقل إلى قائمة مواضيع أو فئة أخرى" new_item: "جديد" go_back: 'الرجوع' not_logged_in_user: 'صفحة المستخدم مع ملخص عن نشاطه و إعداداته' current_user: 'الذهاب إلى صفحتك الشخصية' topics: + new_messages_marker: "آخر مشاهدة" bulk: unlist_topics: "ازالة المواضيع من القائمة" reset_read: "تصفير القراءات" diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index 3375bbe531..acf464a3d0 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -2831,6 +2831,7 @@ et: developer: 'Arendaja' embedding: "Manustamised" legal: "Õiguslik" + user_api: 'Kasutaja API' uncategorized: 'Muu' backups: "Varukoopiad" login: "Sisselogimine" @@ -2919,6 +2920,7 @@ et: sample: "Kasuta järgnevat HTML koodi oma saidil, et luua ja lisada/sängitada discourse teemad oma saidile. Asenda REPLACE_ME kanoonilise lehe URL-viitega, kuhu Sa seda lisad." title: "Sängitamine" host: "Lubatud hostid" + path_whitelist: "Lubatud aadressiosad" edit: "muuda" category: "Postita foorumisse" add_host: "Lisa host" @@ -2958,7 +2960,9 @@ et: done: "Tehtud" back: "Tagasi" next: "Järgmine" + step: "%{current} %{total}st" upload: "Lae üles" + uploading: "Laen üles..." quit: "Võib-olla hiljem" staff_count: one: "Sinu kommuunis on 1 tiimi liige." diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 97aeb320e3..d7a70bcbe8 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -475,6 +475,7 @@ fi: daily: "Lähetä päivittäin" individual: "Lähetä sähköpostia jokaisesta uudesta viestistä" + individual_no_echo: "Lähetä sähköposti jokaisesta uudesta viestistä lukuun ottamatta omiani" many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)" few_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin 2 päivässä)" tag_settings: "Tunnisteet" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 290aaf3284..6c1079dc3e 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -953,7 +953,7 @@ fr: create_pm: "Message privé" title: "ou appuyez sur Ctrl+Entrée" users_placeholder: "Ajouter un utilisateur" - title_placeholder: "Quel est votre sujet en une phrase descriptive ?" + title_placeholder: "Quel est le sujet en une courte phrase ?" edit_reason_placeholder: "pourquoi modifiez-vous le message ?" show_edit_reason: "(ajouter la raison de la modification)" reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme. Glissez ou collez des images." diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 6f336f57cb..567c982b0b 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -505,7 +505,7 @@ ru: dismiss_notifications: "Отложить все" dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными" disable_jump_reply: "Не переходить к вашему новому сообщению после ответа" - dynamic_favicon: "Показывать колличество новых / обновленных тем на иконке сообщений" + dynamic_favicon: "Показывать количество новых / обновленных тем на иконке сообщений" external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке" enable_quoting: "Позволить отвечать с цитированием выделенного текста" change: "изменить" @@ -684,7 +684,7 @@ ru: weekly: "еженедельно" every_two_weeks: "каждые 2 недели" include_tl0_in_digests: "Включить контент от новых пользователей в сводки, отправляемые по электронной почте" - email_in_reply_to: "Добавить отрывок \"ответил на сообщение\" в электронных писмах" + email_in_reply_to: "Добавить предыдущие ответы к концу электронных писем" email_direct: "Присылать почтовое уведомление, когда кто-то цитирует меня, отвечает на мой пост, упоминает мой @псевдоним или приглашает меня в тему" email_private_messages: "Присылать почтовое уведомление, когда кто-то оставляет мне сообщение" email_always: "Присылать почтовое уведомление, даже если я присутствую на сайте" @@ -1076,6 +1076,7 @@ ru: notifications: title: "уведомления об упоминании @псевдонима, ответах на ваши посты и темы, сообщения и т.д." none: "Уведомления не могут быть загружены." + empty: "Уведомления не найдены." more: "посмотреть более ранние уведомления" total_flagged: "всего сообщений с жалобами" mentioned: "

{{username}} {{description}}

" @@ -1196,6 +1197,7 @@ ru: not_logged_in_user: 'страница пользователя с историей его последней активности и настроек' current_user: 'перейти на вашу страницу пользователя' topics: + new_messages_marker: "последний визит" bulk: unlist_topics: "Исключить из списков" reset_read: "Сбросить прочтённые" @@ -1321,18 +1323,23 @@ ru: auto_close_remove: "Не закрывать тему автоматически" timeline: back: "Вернуться" + back_description: "Перейти к последнему непрочитанному сообщению" + replies_short: "%{current} / %{total}" progress: title: текущее местоположение в теме go_top: "перейти наверх" go_bottom: "перейти вниз" go: "=>" jump_bottom: "перейти к последнему сообщению" + jump_prompt: "перейти к сообщению" + jump_prompt_long: "К какому сообщению вы хотите перейти?" jump_bottom_with_number: "перейти к сообщению %{post_number}" total: всего сообщений current: текущее сообщение notifications: title: изменить частоту уведомлений об этой теме reasons: + '3_10': 'Вы будете получать уведомления, т.к. наблюдаете за тэгом этой темы.' '3_6': 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.' '3_5': 'Вы будете получать уведомления, т.к. наблюдение темы началось автоматически.' '3_2': 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.' @@ -1402,6 +1409,9 @@ ru: share: title: 'Поделиться' help: 'Поделиться ссылкой на тему' + print: + title: 'Печать' + help: 'Открыть версию для печати' flag_topic: title: 'Жалоба' help: 'пожаловаться на сообщение' @@ -1437,6 +1447,7 @@ ru: no_banner_exists: "Нет текущих тем-объявлений." banner_exists: "На данный момент уже есть тема-объявление." inviting: "Высылаю приглашение..." + automatically_add_to_groups: "Это приглашение предоставит доступ к следующим группам:" invite_private: title: 'Пригласить в беседу' email_or_username: "Адрес электронной почты или псевдоним того, кого вы хотите пригласить" @@ -1564,6 +1575,11 @@ ru: many: "Это сообщение понравилось {{count}} людям" other: "Это сообщение понравилось {{count}} людям" has_likes_title_only_you: "Вам понравилось это сообщение" + has_likes_title_you: + one: "Вам и еще 1 человеку понравилось это сообщение" + few: "Вам и еще {{count}} людям понравилось это сообщение" + many: "Вам и еще {{count}} людям понравилось это сообщение" + other: "Вам и еще {{count}} людям понравилось это сообщение" errors: create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте еще раз." edit: "К сожалению, не удалось изменить сообщение. Попробуйте еще раз." @@ -1628,6 +1644,7 @@ ru: inappropriate: "отмеченно как неуместное" notify_moderators: "уведомлёные модераторы" notify_user: "отправил сообщение" + bookmark: "добавить закладку" like: "понравилось это" vote: "проголосовал за это" by_you: @@ -1756,6 +1773,7 @@ ru: general: 'Общие' settings: 'Настройки' topic_template: "Шаблон темы" + tags: "Тэги" delete: 'Удалить раздел' create: 'Создать Раздел' create_long: 'Создать новый раздел' @@ -1789,6 +1807,7 @@ ru: email_in_allow_strangers: "Принимать письма от анонимных пользователей без учетных записей" email_in_disabled: "Создание новых тем через электронную почту отключено в настройках сайта. Чтобы разрешить создание новых тем через электронную почту," email_in_disabled_click: 'активируйте настройку "email in".' + sort_order: "Порядок сортировки:" allow_badges_label: "Разрешить вручение наград в этом разделе" edit_permissions: "Изменить права доступа" add_permission: "Добавить права" @@ -1809,6 +1828,18 @@ ru: muted: title: "Без уведомлений" description: "Не уведомлять о новых темах в этом разделе и скрыть их из последних." + sort_options: + default: "По умолчанию" + likes: "Количество симпатий" + op_likes: "Количество симпатий у первого сообщения" + views: "Количество просмотров" + posts: "Количество сообщений" + activity: "Последняя активность" + posters: "Количество участников" + category: "Раздел" + created: "Дата создания" + sort_ascending: 'По возрастанию' + sort_descending: 'По убыванию' flagging: title: 'Спасибо за вашу помощь в поддержании порядка!' action: 'Пожаловаться на сообщение' @@ -1853,6 +1884,7 @@ ru: title: "Сводка по теме" participants_title: "Частые авторы" links_title: "Популярные ссылки" + links_shown: "показать больше ссылок..." clicks: one: "1 клик" few: "%{count} клика" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 07adb33be1..d6132b8068 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -880,6 +880,7 @@ zh_TW: toggle_information: "切換討論話題詳情" read_more_in_category: "要閱讀更多文章嗎? 瀏覽 {{catLink}} 裡的討論話題或 {{latestLink}}。" read_more: "要閱讀更多文章嗎? 請按 {{catLink}} 或 {{latestLink}}。" + read_more_MF: "還有 { UNREAD, plural, =0 {} one { 1 個未讀的討論話題} other { # 個未讀的討論話題 } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} 1 個新的討論話題} other { {BOTH, select, true{和 } false {} other{}} # 個最近的討論話題} }可以閱讀，或者{CATEGORY, select, true {瀏覽{catLink}中的其他討論話題} false {{latestLink}} other {}}" browse_all_categories: 瀏覽所有分類 view_latest_topics: 檢視最近的文章 suggest_create_topic: 建立一個新討論話題吧？ diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index c5d94389ee..36c4b128da 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -574,6 +574,16 @@ fi: different_user_description: "Olet kirjautunut sisään eri käyttäjänä kuin jolle sähköposti lähetettiin. Ole hyvä ja kirjaudu ulos tai siirry anonyymitilaan, ja yritä sitten uudelleen." not_found_description: "Pahoittelut, tätä tilauksen perumista ei löytynyt. Kenties sinulle lähetetty linkki on vanhentunut?" log_out: "Kirjaudu ulos" + user_api_key: + title: "Anna sovellukselle käyttöoikeus" + authorize: "Anna käyttöoikeus" + read: "luku" + read_write: "luku/kirjoitus" + description: "\"%{application_name}\" pyytää seuraavaa käyttöoikeutta tunnukseesi:" + no_trust_level: "Pahoittelut, luottamustasosi ei ole riittävä käyttäjärajapinnan käyttämiseen" + generic_error: "Pahoittelut, API-salausavainta ei muodostettu; sivuston ylläpitäjä on saattanut ottaa ominaisuuden pois käytöstä" + scopes: + message_bus: "Reaaliaikaiset päivitykset" reports: visits: title: "Vierailut" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 19dffb38ba..5028bc4800 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -226,7 +226,7 @@ he: - ביקורת מבנה היא רצויה, אבל אנא בקרו *רעיונות*, לא אנשים. - למידע נוסף [ראו את הכללים המנחים שלנו]/guidelines). פאנל זה יופיע רק ב-%{education_posts_text} התגובות הראשונות שלך. + למידע נוסף [ראו את הכללים המנחים שלנו](/guidelines). פאנל זה יופיע רק ב-%{education_posts_text} התגובות הראשונות שלך. avatar: | ### מה דעתך להוסיף תמונה לחשבון שלך? diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index c97670c01d..2e905aee89 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -10,6 +10,14 @@ nb_NO: short_date_no_year: "D MMM" short_date: "D MMM, YYYY" long_date: "MMMM D, YYYY h:mma" + datetime_formats: &datetime_formats + formats: + short: "%m-%d-%Y" + short_no_year: "%B %-d" + long: "%B %-d, %Y, %l:%M%P" + time: + am: "am" + <<: *datetime_formats title: "Discourse" topics: "Emner" posts: "innlegg" @@ -745,6 +753,8 @@ nb_NO: csv_export: boolean_yes: "Ja" boolean_no: "Nei" + date: + <<: *datetime_formats activemodel: errors: <<: *errors diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml index 562687b5aa..55e2011e3a 100644 --- a/config/locales/server.sk.yml +++ b/config/locales/server.sk.yml @@ -862,7 +862,7 @@ sk: sso_overrides_name: "Nahrádzať lokálne plné mená pomocou plných mien z externej stránky pomocou dát z SSO dotazu pri každom logine a zamedziť lokálnym zmenám." sso_overrides_avatar: "Nahrádzať používateľský avatar pomocou avatara z externej stránky pomocou dát z SSO dotazu. V prípade zapnutia veľmi doporučujeme vypnúť allow_uploaded_avatars" sso_not_approved_url: "Presmeruj nepovolené SSO účty na URL" - enable_local_logins: "Povoliť pouťívanie lokálnych účtov a hesiel. (Poznámka: musí to byť zapnuté pre fungovanie pozvánok)" + enable_local_logins: "Povoliť používanie lokálnych účtov a hesiel. (Poznámka: musí to byť zapnuté pre fungovanie pozvánok)" allow_new_registrations: "Povoliť registráciu nových používateľov. Odznačte to ak chcete zabrániť vytváraniu nových účtov. " enable_signup_cta: "Zobraz oznámenie pre navrátilých anonymných používateľov s výzvou na registráciu účtu. " enable_yahoo_logins: "Povoliť autentifikáciu pomocou Yahoo." diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml index f987ea6693..b0793b45be 100644 --- a/plugins/poll/config/locales/client.nb_NO.yml +++ b/plugins/poll/config/locales/client.nb_NO.yml @@ -15,6 +15,13 @@ nb_NO: one: "antall stemmer" other: "antall stemmer" average_rating: "Gjennomsnitt: %{average}." + public: + title: "Stemmer er offentlig." + multiple: + help: + at_least_min_options: + one: "Velg minst 1 alternativ" + other: "Velg minst %{count} alternativ" cast-votes: title: "Stem nå" label: "Stem!" diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml index d5aee2590c..044f6060a6 100644 --- a/plugins/poll/config/locales/server.nb_NO.yml +++ b/plugins/poll/config/locales/server.nb_NO.yml @@ -14,6 +14,9 @@ nb_NO: multiple_polls_with_same_name: "Det er flere spørreundersøkelser med samme navn: %{name}. Bruk 'name' attributten til å identifisere spørreundersøkelsene dine." default_poll_must_have_at_least_2_options: "Spørrsundersøkelser må inneholde minst 2 alternativer." named_poll_must_have_at_least_2_options: "Spørresundersøkelsen %{name} må ha minst 2 svaralternativer." + default_poll_must_have_less_options: + one: "Spørreundersøkelsen må ha mindre enn 1 svaralternativ" + other: "Spørreundersøkelsen må ha mindre enn %{max} svaralternativer." default_poll_must_have_different_options: "Spørreundersøkelsen må ha ulike alternativer." named_poll_must_have_different_options: "Spørresundersøkelsen %{name} må ha ulike svaralternativer." default_poll_with_multiple_choices_has_invalid_parameters: "Spørreundersøkelsen med flere svaralternativer har ugyldige parametere." From 875703a750f11e1006d1966e443926987b68ab95 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Nov 2016 11:46:11 -0500 Subject: [PATCH 054/266] A couple of small but important fixes for later Ember releases --- app/assets/javascripts/admin/templates/plugins-index.hbs | 2 +- .../discourse-common/lib/buffered-render.js.es6 | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index 34bf63c756..b7d64f2a34 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -1,4 +1,4 @@ -{{#if length}} +{{#if model.length}} {{#if currentUser.admin}} {{d-button label="admin.plugins.change_settings" diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 index 4873bfc778..c1eebb7768 100644 --- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 +++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 @@ -25,13 +25,18 @@ export function bufferedRender(obj) { return obj; } - const caller = {}; + const caller = { + _didRender: false + }; // True in 1.13 or greater if (Ember.Helper) { caller.didRender = function() { this._super(); - this._customRender(); + if (!this._didRender) { + this._customRender(); + } + this._didRender = true; }; } else { caller.didInsertElement = function() { From b117a9994b86d225c545cff02eda823c2921dc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 9 Nov 2016 18:06:19 +0100 Subject: [PATCH 055/266] FIX: escape emojis in topic selection modal --- app/assets/javascripts/discourse/controllers/composer.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index f5b506a902..dfc59be1bd 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -407,7 +407,7 @@ export default Ember.Controller.extend({ if (currentTopic) { buttons.push({ - "label": I18n.t("composer.reply_here") + "
" + escapeExpression(currentTopic.get('title')) + "
", + "label": I18n.t("composer.reply_here") + "
" + currentTopic.get('fancyTitle') + "
", "class": "btn btn-reply-here", "callback": function() { composer.set('topic', currentTopic); @@ -418,7 +418,7 @@ export default Ember.Controller.extend({ } buttons.push({ - "label": I18n.t("composer.reply_original") + "
" + escapeExpression(this.get('model.topic.title')) + "
", + "label": I18n.t("composer.reply_original") + "
" + this.get('model.topic.fancyTitle') + "
", "class": "btn-primary btn-reply-on-original", "callback": function() { self.save(true); From b0c6cd8afdb800508387a160c046779880c8f024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 9 Nov 2016 18:09:26 +0100 Subject: [PATCH 056/266] make jslint happy --- app/assets/javascripts/discourse/controllers/composer.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index dfc59be1bd..da85c4a66d 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -4,7 +4,6 @@ import Draft from 'discourse/models/draft'; import Composer from 'discourse/models/composer'; import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; import { relativeAge } from 'discourse/lib/formatter'; -import { escapeExpression } from 'discourse/lib/utilities'; import InputValidation from 'discourse/models/input-validation'; import { getOwner } from 'discourse-common/lib/get-owner'; From 150cb6659fc0de89238c52710420c092b489275e Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Wed, 9 Nov 2016 16:38:07 -0200 Subject: [PATCH 057/266] FEATURE: Clinking on stats in user summary take you to the respective activity page --- .../discourse/templates/user/summary.hbs | 36 +++++++++++++++---- app/assets/stylesheets/common/base/user.scss | 11 ++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs index 065455510b..0042f4ba92 100644 --- a/app/assets/javascripts/discourse/templates/user/summary.hbs +++ b/app/assets/javascripts/discourse/templates/user/summary.hbs @@ -1,19 +1,41 @@

{{i18n "user.summary.stats"}}

    -
  • {{user-stat value=model.days_visited label="user.summary.days_visited"}}
    • +
  • + {{user-stat value=model.days_visited label="user.summary.days_visited"}} +
  • {{model.time_read}} {{{i18n "user.summary.time_read"}}}
    • -
  • {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
    • -
  • {{user-stat value=model.likes_given label="user.summary.likes_given"}}
    • +
  • + {{user-stat value=model.posts_read_count label="user.summary.posts_read"}} +
    • +
  • + {{#link-to 'userActivity.likesGiven'}} + {{user-stat value=model.likes_given label="user.summary.likes_given"}} + {{/link-to}} +
    • {{#if model.bookmark_count}} -
  • {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
    • +
  • + {{#link-to 'userActivity.bookmarks'}} + {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}} + {{/link-to}} +
    • {{/if}} -
  • {{user-stat value=model.topic_count label="user.summary.topic_count"}}
    • -
  • {{user-stat value=model.post_count label="user.summary.post_count"}}
    • -
  • {{user-stat value=model.likes_received label="user.summary.likes_received"}}
    • +
  • + {{#link-to 'userActivity.topics'}} + {{user-stat value=model.topic_count label="user.summary.topic_count"}} + {{/link-to}} +
    • +
  • + {{#link-to 'userActivity.replies'}} + {{user-stat value=model.post_count label="user.summary.post_count"}} + {{/link-to}} +
    • +
  • + {{user-stat value=model.likes_received label="user.summary.likes_received"}} +
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index 91316490ca..0cdad17992 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -213,6 +213,17 @@ padding: 10px 14px; margin: 0 5px 10px 0; background: dark-light-diff($primary, $secondary, 90%, -65%); + + &.linked-stat { // This makes the entire "box" (the li) clickable instead of a narrow area. + padding: 0; + a { + padding: 10px 14px; + width: 100%; + height: 100%; + display: block; + color: black; + } + } } li:last-of-type { From 9e69798285078e017501973872f1bf1c2beddd9b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 10 Nov 2016 00:07:54 +0530 Subject: [PATCH 058/266] FEATURE: watch first post default site setting --- app/models/site_setting.rb | 1 + app/models/user.rb | 2 +- config/locales/server.en.yml | 1 + config/site_settings.yml | 3 +++ lib/site_setting_validations.rb | 13 +++++++++++++ spec/models/user_spec.rb | 3 +++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index fbe1b782d5..70b62602ee 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -94,6 +94,7 @@ class SiteSetting < ActiveRecord::Base SiteSetting.default_categories_watching.split("|"), SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_muted.split("|"), + SiteSetting.default_categories_watching_first_post.split("|") ].flatten.to_set end diff --git a/app/models/user.rb b/app/models/user.rb index 3de3020d17..2d623817cc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -988,7 +988,7 @@ class User < ActiveRecord::Base values = [] - %w{watching tracking muted}.each do |s| + %w{watching watching_first_post tracking muted}.each do |s| category_ids = SiteSetting.send("default_categories_#{s}").split("|") category_ids.each do |category_id| values << "(#{self.id}, #{category_id}, #{CategoryUser.notification_levels[s.to_sym]})" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 04b2e4d94e..fb314c4dd0 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1393,6 +1393,7 @@ en: default_categories_watching: "List of categories that are watched by default." default_categories_tracking: "List of categories that are tracked by default." default_categories_muted: "List of categories that are muted by default." + default_categories_watching_first_post: "List of first post in each new topic in these categories that are watched by default." max_user_api_reqs_per_day: "Maximum number of user API requests per key per day" max_user_api_reqs_per_minute: "Maximum number of user API requests per key per minute" diff --git a/config/site_settings.yml b/config/site_settings.yml index 92776b8eea..57661444a8 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1293,6 +1293,9 @@ user_preferences: default_categories_muted: type: category_list default: '' + default_categories_watching_first_post: + type: category_list + default: '' user_api: max_user_api_reqs_per_day: diff --git a/lib/site_setting_validations.rb b/lib/site_setting_validations.rb index e69bfc2f95..0380c457a0 100644 --- a/lib/site_setting_validations.rb +++ b/lib/site_setting_validations.rb @@ -21,6 +21,7 @@ module SiteSettingValidations def validate_default_categories_watching(new_val) default_categories_selected = [ + SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_muted.split("|"), ].flatten.to_set @@ -31,6 +32,7 @@ module SiteSettingValidations def validate_default_categories_tracking(new_val) default_categories_selected = [ SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_muted.split("|"), ].flatten.to_set @@ -40,12 +42,23 @@ module SiteSettingValidations def validate_default_categories_muted(new_val) default_categories_selected = [ SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_tracking.split("|"), ].flatten.to_set validate_default_categories(new_val, default_categories_selected) end + def validate_default_categories_watching_first_post(new_val) + default_categories_selected = [ + SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_tracking.split("|"), + SiteSetting.default_categories_muted.split("|"), + ].flatten.to_set + + validate_default_categories(new_val, default_categories_selected) + end + def validate_enable_s3_uploads(new_val) validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank? end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index cddc4b50a8..3a32c5e485 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1257,6 +1257,7 @@ describe User do SiteSetting.default_categories_watching = "1" SiteSetting.default_categories_tracking = "2" SiteSetting.default_categories_muted = "3" + SiteSetting.default_categories_watching_first_post = "4" end it "has overriden preferences" do @@ -1279,6 +1280,7 @@ describe User do expect(CategoryUser.lookup(user, :watching).pluck(:category_id)).to eq([1]) expect(CategoryUser.lookup(user, :tracking).pluck(:category_id)).to eq([2]) expect(CategoryUser.lookup(user, :muted).pluck(:category_id)).to eq([3]) + expect(CategoryUser.lookup(user, :watching_first_post).pluck(:category_id)).to eq([4]) end it "does not set category preferences for staged users" do @@ -1286,6 +1288,7 @@ describe User do expect(CategoryUser.lookup(user, :watching).pluck(:category_id)).to eq([]) expect(CategoryUser.lookup(user, :tracking).pluck(:category_id)).to eq([]) expect(CategoryUser.lookup(user, :muted).pluck(:category_id)).to eq([]) + expect(CategoryUser.lookup(user, :watching_first_post).pluck(:category_id)).to eq([]) end end From 96f50790069d74255349d6caa2e943754119a35e Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 10 Nov 2016 00:15:14 +0530 Subject: [PATCH 059/266] improve default_categories_watching_first_post copy --- config/locales/server.en.yml | 2 +- lib/site_setting_validations.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index fb314c4dd0..0cbdeec8fe 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1393,7 +1393,7 @@ en: default_categories_watching: "List of categories that are watched by default." default_categories_tracking: "List of categories that are tracked by default." default_categories_muted: "List of categories that are muted by default." - default_categories_watching_first_post: "List of first post in each new topic in these categories that are watched by default." + default_categories_watching_first_post: "List of categories in which first post in each new topic will be watched by default." max_user_api_reqs_per_day: "Maximum number of user API requests per key per day" max_user_api_reqs_per_minute: "Maximum number of user API requests per key per minute" diff --git a/lib/site_setting_validations.rb b/lib/site_setting_validations.rb index 0380c457a0..7858c68f0e 100644 --- a/lib/site_setting_validations.rb +++ b/lib/site_setting_validations.rb @@ -21,9 +21,9 @@ module SiteSettingValidations def validate_default_categories_watching(new_val) default_categories_selected = [ - SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_muted.split("|"), + SiteSetting.default_categories_watching_first_post.split("|") ].flatten.to_set validate_default_categories(new_val, default_categories_selected) @@ -32,8 +32,8 @@ module SiteSettingValidations def validate_default_categories_tracking(new_val) default_categories_selected = [ SiteSetting.default_categories_watching.split("|"), - SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_muted.split("|"), + SiteSetting.default_categories_watching_first_post.split("|") ].flatten.to_set validate_default_categories(new_val, default_categories_selected) @@ -42,8 +42,8 @@ module SiteSettingValidations def validate_default_categories_muted(new_val) default_categories_selected = [ SiteSetting.default_categories_watching.split("|"), - SiteSetting.default_categories_watching_first_post.split("|"), SiteSetting.default_categories_tracking.split("|"), + SiteSetting.default_categories_watching_first_post.split("|") ].flatten.to_set validate_default_categories(new_val, default_categories_selected) @@ -53,7 +53,7 @@ module SiteSettingValidations default_categories_selected = [ SiteSetting.default_categories_watching.split("|"), SiteSetting.default_categories_tracking.split("|"), - SiteSetting.default_categories_muted.split("|"), + SiteSetting.default_categories_muted.split("|") ].flatten.to_set validate_default_categories(new_val, default_categories_selected) From 1d784f5758c355b67b79460b09fa3c8d5f0ef614 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Nov 2016 13:57:43 -0500 Subject: [PATCH 060/266] Allow Ember 2.4 to connect views to widgets --- app/assets/javascripts/discourse/widgets/connector.js.es6 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6 index d197914af2..cc133942d3 100644 --- a/app/assets/javascripts/discourse/widgets/connector.js.es6 +++ b/app/assets/javascripts/discourse/widgets/connector.js.es6 @@ -25,6 +25,9 @@ export default class Connector { templateName: opts.templateName, context }); + if (Ember.setOwner) { + Ember.setOwner(view, Ember.getOwner(mounted)); + } mounted._connected.push(view); view.renderer.replaceIn(view, $elem[0]); From 985b855a5b584fb6f3944d901d887bce3ccf330e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Nov 2016 14:47:58 -0500 Subject: [PATCH 061/266] FIX: Later versions of ember require dashes in template names --- .../javascripts/admin/components/permalinks-list.js.es6 | 2 +- .../admin/components/screened-emails-list.js.es6 | 2 +- .../admin/components/screened-ip-addresses-list.js.es6 | 2 +- .../javascripts/admin/components/screened-urls-list.js.es6 | 2 +- .../admin/components/staff-action-logs-list.js.es6 | 2 +- .../javascripts/admin/routes/admin-email-index.js.es6 | 4 ---- .../admin/routes/admin-logs-screened-emails.js.es6 | 2 +- .../admin/routes/admin-logs-screened-ip-addresses.js.es6 | 2 +- .../admin/routes/admin-logs-screened-urls.js.es6 | 2 +- .../admin/routes/admin-logs-staff-action-logs.js.es6 | 2 +- .../templates/{backups_index.hbs => backups-index.hbs} | 0 .../{customize_colors.hbs => customize-colors.hbs} | 0 .../admin/templates/{email_index.hbs => email-index.hbs} | 0 .../{email_preview_digest.hbs => email-preview-digest.hbs} | 0 .../admin/templates/{groups_type.hbs => groups-type.hbs} | 0 .../templates/logs/{details_modal.hbs => details-modal.hbs} | 0 ...d_emails_list_item.hbs => screened-emails-list-item.hbs} | 0 .../logs/{screened_emails.hbs => screened-emails.hbs} | 0 ...es_list_item.hbs => screened-ip-addresses-list-item.hbs} | 0 ...{screened_ip_addresses.hbs => screened-ip-addresses.hbs} | 0 ...eened_urls_list_item.hbs => screened-urls-list-item.hbs} | 0 .../templates/logs/{screened_urls.hbs => screened-urls.hbs} | 0 ...ge_details.hbs => site-customization-change-details.hbs} | 0 ...change_modal.hbs => site-customization-change-modal.hbs} | 4 ++-- ...n_logs_list_item.hbs => staff-action-logs-list-item.hbs} | 0 .../logs/{staff_action_logs.hbs => staff-action-logs.hbs} | 0 .../modal/{admin_agree_flag.hbs => admin-agree-flag.hbs} | 0 .../{admin_badge_preview.hbs => admin-badge-preview.hbs} | 0 .../modal/{admin_delete_flag.hbs => admin-delete-flag.hbs} | 0 ...t_badge_groupings.hbs => admin-edit-badge-groupings.hbs} | 0 .../{admin_incoming_email.hbs => admin-incoming-email.hbs} | 0 .../{admin_start_backup.hbs => admin-start-backup.hbs} | 0 .../{admin_suspend_user.hbs => admin-suspend-user.hbs} | 0 .../{permalinks_list_item.hbs => permalinks-list-item.hbs} | 0 .../admin/templates/{user_badges.hbs => user-badges.hbs} | 0 .../admin/templates/{users_list.hbs => users-list.hbs} | 0 .../discourse/controllers/topic-bulk-actions.js.es6 | 6 +++--- .../{topic_list_item.raw.hbs => topic-list-item.raw.hbs} | 0 .../modal/{avatar_selector.hbs => avatar-selector.hbs} | 0 .../{bulk_actions_buttons.hbs => bulk-actions-buttons.hbs} | 0 .../{bulk_change_category.hbs => bulk-change-category.hbs} | 0 ...k_notification_level.hbs => bulk-notification-level.hbs} | 0 .../modal/{option_boolean.hbs => option-boolean.hbs} | 0 .../templates/modal/{raw_email.hbs => raw-email.hbs} | 0 .../templates/modal/{search_help.hbs => search-help.hbs} | 0 app/assets/javascripts/discourse/views/raw-email.es6 | 2 +- 46 files changed, 15 insertions(+), 19 deletions(-) rename app/assets/javascripts/admin/templates/{backups_index.hbs => backups-index.hbs} (100%) rename app/assets/javascripts/admin/templates/{customize_colors.hbs => customize-colors.hbs} (100%) rename app/assets/javascripts/admin/templates/{email_index.hbs => email-index.hbs} (100%) rename app/assets/javascripts/admin/templates/{email_preview_digest.hbs => email-preview-digest.hbs} (100%) rename app/assets/javascripts/admin/templates/{groups_type.hbs => groups-type.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{details_modal.hbs => details-modal.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_emails_list_item.hbs => screened-emails-list-item.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_emails.hbs => screened-emails.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_ip_addresses_list_item.hbs => screened-ip-addresses-list-item.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_ip_addresses.hbs => screened-ip-addresses.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_urls_list_item.hbs => screened-urls-list-item.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{screened_urls.hbs => screened-urls.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{_site_customization_change_details.hbs => site-customization-change-details.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{site_customization_change_modal.hbs => site-customization-change-modal.hbs} (86%) rename app/assets/javascripts/admin/templates/logs/{staff_action_logs_list_item.hbs => staff-action-logs-list-item.hbs} (100%) rename app/assets/javascripts/admin/templates/logs/{staff_action_logs.hbs => staff-action-logs.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_agree_flag.hbs => admin-agree-flag.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_badge_preview.hbs => admin-badge-preview.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_delete_flag.hbs => admin-delete-flag.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_edit_badge_groupings.hbs => admin-edit-badge-groupings.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_incoming_email.hbs => admin-incoming-email.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_start_backup.hbs => admin-start-backup.hbs} (100%) rename app/assets/javascripts/admin/templates/modal/{admin_suspend_user.hbs => admin-suspend-user.hbs} (100%) rename app/assets/javascripts/admin/templates/{permalinks_list_item.hbs => permalinks-list-item.hbs} (100%) rename app/assets/javascripts/admin/templates/{user_badges.hbs => user-badges.hbs} (100%) rename app/assets/javascripts/admin/templates/{users_list.hbs => users-list.hbs} (100%) rename app/assets/javascripts/discourse/templates/mobile/list/{topic_list_item.raw.hbs => topic-list-item.raw.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{avatar_selector.hbs => avatar-selector.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{bulk_actions_buttons.hbs => bulk-actions-buttons.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{bulk_change_category.hbs => bulk-change-category.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{bulk_notification_level.hbs => bulk-notification-level.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{option_boolean.hbs => option-boolean.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{raw_email.hbs => raw-email.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{search_help.hbs => search-help.hbs} (100%) diff --git a/app/assets/javascripts/admin/components/permalinks-list.js.es6 b/app/assets/javascripts/admin/components/permalinks-list.js.es6 index c425437686..c5027fe8e7 100644 --- a/app/assets/javascripts/admin/components/permalinks-list.js.es6 +++ b/app/assets/javascripts/admin/components/permalinks-list.js.es6 @@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view'; export default ListView.extend({ height: 700, rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks_list_item"}) + itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks-list-item"}) }); diff --git a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 b/app/assets/javascripts/admin/components/screened-emails-list.js.es6 index 1b32fb36fe..aaf883a3c9 100644 --- a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 +++ b/app/assets/javascripts/admin/components/screened-emails-list.js.es6 @@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view'; export default ListView.extend({ height: 700, rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_emails_list_item"}) + itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-emails-list-item"}) }); diff --git a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 index 0d30fc6d48..83abab4b8c 100644 --- a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 +++ b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 @@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view'; export default ListView.extend({ height: 700, rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_ip_addresses_list_item"}) + itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-ip-addresses-list-item"}) }); diff --git a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 b/app/assets/javascripts/admin/components/screened-urls-list.js.es6 index b9d8b76667..b34bc3fc51 100644 --- a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 +++ b/app/assets/javascripts/admin/components/screened-urls-list.js.es6 @@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view'; export default ListView.extend({ height: 700, rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_urls_list_item"}) + itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-urls-list-item"}) }); diff --git a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 index cec82dba43..bf68175563 100644 --- a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 +++ b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 @@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view'; export default ListView.extend({ height: 700, rowHeight: 75, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff_action_logs_list_item"}) + itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff-action-logs-list-item"}) }); diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6 index 1b75e39f6f..ae1272c0b9 100644 --- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6 @@ -3,9 +3,5 @@ import EmailSettings from 'admin/models/email-settings'; export default Discourse.Route.extend({ model() { return EmailSettings.find(); - }, - - renderTemplate() { - this.render('admin/templates/email_index', { into: 'adminEmail' }); } }); diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 index 1008dc1c1d..d31e521924 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 @@ -1,6 +1,6 @@ export default Discourse.Route.extend({ renderTemplate: function() { - this.render('admin/templates/logs/screened_emails', {into: 'adminLogs'}); + this.render('admin/templates/logs/screened-emails', {into: 'adminLogs'}); }, setupController: function() { diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 index ca914fe1d2..c6518c244c 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 @@ -1,6 +1,6 @@ export default Discourse.Route.extend({ renderTemplate() { - this.render('admin/templates/logs/screened_ip_addresses', {into: 'adminLogs'}); + this.render('admin/templates/logs/screened-ip-addresses', {into: 'adminLogs'}); }, setupController() { diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 index 093dd26331..ee65fda090 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 @@ -1,6 +1,6 @@ export default Discourse.Route.extend({ renderTemplate: function() { - this.render('admin/templates/logs/screened_urls', {into: 'adminLogs'}); + this.render('admin/templates/logs/screened-urls', {into: 'adminLogs'}); }, setupController: function() { diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 index 6ef900e843..8aaa771881 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 @@ -3,7 +3,7 @@ import showModal from 'discourse/lib/show-modal'; export default Discourse.Route.extend({ // TODO: make this automatic using an `{{outlet}}` renderTemplate: function() { - this.render('admin/templates/logs/staff_action_logs', {into: 'adminLogs'}); + this.render('admin/templates/logs/staff-action-logs', {into: 'adminLogs'}); }, setupController: function(controller) { diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/backups_index.hbs rename to app/assets/javascripts/admin/templates/backups-index.hbs diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize_colors.hbs rename to app/assets/javascripts/admin/templates/customize-colors.hbs diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email_index.hbs rename to app/assets/javascripts/admin/templates/email-index.hbs diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email_preview_digest.hbs rename to app/assets/javascripts/admin/templates/email-preview-digest.hbs diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/groups_type.hbs rename to app/assets/javascripts/admin/templates/groups-type.hbs diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details-modal.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/details_modal.hbs rename to app/assets/javascripts/admin/templates/logs/details-modal.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs rename to app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_emails.hbs rename to app/assets/javascripts/admin/templates/logs/screened-emails.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs rename to app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs rename to app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs rename to app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened_urls.hbs rename to app/assets/javascripts/admin/templates/logs/screened-urls.hbs diff --git a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs b/app/assets/javascripts/admin/templates/logs/site-customization-change-details.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs rename to app/assets/javascripts/admin/templates/logs/site-customization-change-details.hbs diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs similarity index 86% rename from app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs rename to app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs index 8d36dd964c..24f1e18912 100644 --- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs +++ b/app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs @@ -11,7 +11,7 @@
{{#if model.new_value}} {{#with model.new_value}} - {{partial "admin/templates/logs/site_customization_change_details"}} + {{partial "admin/templates/logs/site-customization-change-details"}} {{/with}} {{else}} {{i18n 'admin.logs.staff_actions.deleted'}} @@ -20,7 +20,7 @@
{{#if model.previous_value}} {{#with model.previous_value}} - {{partial "admin/templates/logs/site_customization_change_details"}} + {{partial "admin/templates/logs/site-customization-change-details"}} {{/with}} {{else}} {{i18n 'admin.logs.staff_actions.no_previous'}} diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs rename to app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs rename to app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs rename to app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs rename to app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs rename to app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs rename to app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_incoming_email.hbs b/app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_incoming_email.hbs rename to app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs rename to app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs rename to app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/permalinks_list_item.hbs rename to app/assets/javascripts/admin/templates/permalinks-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user_badges.hbs rename to app/assets/javascripts/admin/templates/user-badges.hbs diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/users_list.hbs rename to app/assets/javascripts/admin/templates/users-list.hbs diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 index d378084e8a..e3a7a34f21 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 @@ -38,7 +38,7 @@ export default Ember.Controller.extend(ModalFunctionality, { if (row.length) { buttonRows.push(row); } this.set('buttonRows', buttonRows); - this.send('changeBulkTemplate', 'modal/bulk_actions_buttons'); + this.send('changeBulkTemplate', 'modal/bulk-actions-buttons'); }, perform(operation) { @@ -85,12 +85,12 @@ export default Ember.Controller.extend(ModalFunctionality, { }, showChangeCategory() { - this.send('changeBulkTemplate', 'modal/bulk_change_category'); + this.send('changeBulkTemplate', 'modal/bulk-change-category'); this.set('modal.modalClass', 'topic-bulk-actions-modal full'); }, showNotificationLevel() { - this.send('changeBulkTemplate', 'modal/bulk_notification_level'); + this.send('changeBulkTemplate', 'modal/bulk-notification-level'); }, deleteTopics() { diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs rename to app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs rename to app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs rename to app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs rename to app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs rename to app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/option_boolean.hbs b/app/assets/javascripts/discourse/templates/modal/option-boolean.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/option_boolean.hbs rename to app/assets/javascripts/discourse/templates/modal/option-boolean.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/raw_email.hbs rename to app/assets/javascripts/discourse/templates/modal/raw-email.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/search_help.hbs b/app/assets/javascripts/discourse/templates/modal/search-help.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/search_help.hbs rename to app/assets/javascripts/discourse/templates/modal/search-help.hbs diff --git a/app/assets/javascripts/discourse/views/raw-email.es6 b/app/assets/javascripts/discourse/views/raw-email.es6 index c14d201f31..6e96af1626 100644 --- a/app/assets/javascripts/discourse/views/raw-email.es6 +++ b/app/assets/javascripts/discourse/views/raw-email.es6 @@ -1,7 +1,7 @@ import ModalBodyView from "discourse/views/modal-body"; export default ModalBodyView.extend({ - templateName: 'modal/raw_email', + templateName: 'modal/raw-email', title: I18n.t('raw_email.title'), resizeModal: function(){ From eaf7746ec9c73ea41cbf94775a9a6f842076cad7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 10 Nov 2016 09:25:54 +0800 Subject: [PATCH 062/266] FIX: Only scroll PMs on new message. --- app/assets/javascripts/discourse/controllers/topic.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index d32993ac75..52233f23c6 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -843,7 +843,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } else { if (topic.get('isPrivateMessage') && this.currentUser && - this.currentUser.get('id') !== data.user_id) { + this.currentUser.get('id') !== data.user_id && + data.type === 'created') { const postNumber = data.post_number; const notInPostStream = topic.get('highest_post_number') <= postNumber; From 55865024c71e1931c6022bfa2ddfe4c8e4b88511 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 10 Nov 2016 09:38:35 +0800 Subject: [PATCH 063/266] UX: Only scroll if the element is not in viewport. --- app/assets/javascripts/discourse/controllers/topic.js.es6 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 52233f23c6..247d1a6755 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -10,6 +10,7 @@ import DiscourseURL from 'discourse/lib/url'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import Post from 'discourse/models/post'; import debounce from 'discourse/lib/debounce'; +import isElementInViewport from "discourse/lib/is-element-in-viewport"; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { composer: Ember.inject.controller(), @@ -864,9 +865,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { _scrollToPost: debounce(function(postNumber) { const $post = $(`.topic-post article#post_${postNumber}`); - if ($post.length === 0) return; + if ($post.length === 0 || isElementInViewport($post)) return; - $('body').animate({ scrollTop: $post.offset().top }, 1000); + $('body').animate({ scrollTop: $post.offset().top - $post.height() }, 1000); }, 500), unsubscribe() { From 531d649a75cac27977ca68f409d7f7ee027d5394 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 10 Nov 2016 11:02:11 +0800 Subject: [PATCH 064/266] FIX: Make sure we decrease post count if new post fails to save. --- app/assets/javascripts/discourse/models/composer.js.es6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index a3d8f84364..e782c4074a 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -686,6 +686,10 @@ const Composer = RestModel.extend({ }).catch(throwAjaxError(function() { if (postStream) { postStream.undoPost(createdPost); + + if (post) { + post.set('reply_count', post.get('reply_count') - 1); + } } Ember.run.next(() => composer.set('composeState', OPEN)); })); From ecb9574a324632406f968bbd34a389fa4e9624d0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Nov 2016 10:12:36 -0500 Subject: [PATCH 065/266] FIX: Touch issues in iOS --- .../discourse/views/quote-button.js.es6 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6 index e638a2cb43..9e86495e15 100644 --- a/app/assets/javascripts/discourse/views/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/views/quote-button.js.es6 @@ -11,7 +11,7 @@ export default Ember.View.extend({ classNames: ['quote-button'], classNameBindings: ['visible'], isMouseDown: false, - isTouchInProgress: false, + _isTouchInProgress: false, // The button is visible whenever there is something in the buffer // (ie. something has been selected) @@ -59,17 +59,23 @@ export default Ember.View.extend({ }).on('selectionchange', () => { // there is no need to handle this event when the mouse is down // or if there a touch in progress - if (this.get('isMouseDown') || this.get('isTouchInProgress')) { return; } + if (this.get('isMouseDown') || this._isTouchInProgress) { return; } // `selection.anchorNode` is used as a target onSelectionChanged(); }); // Android is dodgy, touchend often will not fire // https://code.google.com/p/android/issues/detail?id=19827 - if (!isAndroid) { - $(document) - .on('touchstart.quote-button', () => this.set('isTouchInProgress', true)) - .on('touchend.quote-button', () => this.set('isTouchInProgress', false)); + if (!this.isAndroid) { + $(document).on('touchstart.quote-button', () => { + this._isTouchInProgress = true; + return true; + }); + + $(document).on('touchend.quote-button', () => { + this._isTouchInProgress = false; + return true; + }); } }, From 0904ad55373b1615410a95ff0072aa6d7d142071 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Nov 2016 13:33:31 -0500 Subject: [PATCH 066/266] Migrate `createViewWithBodyClass` helper to components --- .../discourse/components/d-section.js.es6 | 45 +++ .../discourse/lib/create-view.js.es6 | 15 - .../javascripts/discourse/templates/about.hbs | 176 ++++----- .../discourse/templates/badges/index.hbs | 30 +- .../discourse/templates/full-page-search.hbs | 236 ++++++------ .../templates/navigation/default.hbs | 12 +- .../templates/{user => }/preferences.hbs | 4 +- .../javascripts/discourse/templates/tags.hbs | 14 +- .../discourse/templates/user-invited-show.hbs | 198 +++++----- .../discourse/templates/user/activity.hbs | 8 +- .../discourse/templates/user/badges.hbs | 4 +- .../discourse/templates/user/messages.hbs | 5 +- .../templates/user/notifications.hbs | 4 +- .../discourse/templates/user/summary.hbs | 348 +++++++++--------- .../javascripts/discourse/templates/users.hbs | 84 ++--- .../javascripts/discourse/views/about.js.es6 | 3 - .../discourse/views/badges-index.js.es6 | 4 - .../discourse/views/full-page-search.js.es6 | 5 - .../discourse/views/navigation-default.js.es6 | 3 - .../discourse/views/preferences.js.es6 | 6 - .../javascripts/discourse/views/tags.js.es6 | 3 - .../discourse/views/user-activity.js.es6 | 3 - .../discourse/views/user-badges.js.es6 | 4 - .../discourse/views/user-invited-show.js.es6 | 3 - .../discourse/views/user-messages.js.es6 | 3 - .../discourse/views/user-notifications.js.es6 | 3 - .../discourse/views/user-summary.js.es6 | 3 - .../javascripts/discourse/views/users.js.es6 | 3 - test/javascripts/acceptance/about-test.js.es6 | 1 + .../javascripts/acceptance/badges-test.js.es6 | 1 + ...es-test.js.es6 => preferences-test.js.es6} | 1 + .../acceptance/search-full-test.js.es6 | 2 + test/javascripts/acceptance/tags-test.js.es6 | 11 + .../acceptance/topic-discovery-test.js.es6 | 1 + .../acceptance/user-anonymous-test.js.es6 | 11 + test/javascripts/acceptance/user-test.js.es6 | 25 +- test/javascripts/acceptance/users-test.js.es6 | 1 + .../helpers/create-pretender.js.es6 | 21 ++ 38 files changed, 683 insertions(+), 621 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/d-section.js.es6 delete mode 100644 app/assets/javascripts/discourse/lib/create-view.js.es6 rename app/assets/javascripts/discourse/templates/{user => }/preferences.hbs (99%) delete mode 100644 app/assets/javascripts/discourse/views/about.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/badges-index.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/full-page-search.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/navigation-default.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/preferences.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/tags.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-activity.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-badges.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-invited-show.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-messages.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-notifications.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-summary.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/users.js.es6 rename test/javascripts/acceptance/{user-preferences-test.js.es6 => preferences-test.js.es6} (88%) create mode 100644 test/javascripts/acceptance/tags-test.js.es6 diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6 new file mode 100644 index 0000000000..1bb1942003 --- /dev/null +++ b/app/assets/javascripts/discourse/components/d-section.js.es6 @@ -0,0 +1,45 @@ +import DiscourseURL from 'discourse/lib/url'; + +// Can add a body class from within a component, also will scroll to the top automatically. +export default Ember.Component.extend({ + tagName: 'section', + + _scrollTop() { + if (Ember.testing) { return; } + $(document).scrollTop(0); + }, + + didInsertElement() { + this._super(); + + const pageClass = this.get('pageClass'); + if (pageClass) { + $('body').addClass(`${pageClass}-page`); + } + + const bodyClass = this.get('bodyClass'); + if (bodyClass) { + $('body').addClass(bodyClass); + } + + if (this.get('scrollTop') === "false") { + return; + } + + if (DiscourseURL.isJumpScheduled()) { return; } + Ember.run.scheduleOnce('afterRender', this, this._scrollTop); + }, + + willDestroyElement() { + this._super(); + const pageClass = this.get('pageClass'); + if (pageClass) { + $('body').removeClass(`${pageClass}-page`); + } + + const bodyClass = this.get('bodyClass'); + if (bodyClass) { + $('body').removeClass(bodyClass); + } + } +}); diff --git a/app/assets/javascripts/discourse/lib/create-view.js.es6 b/app/assets/javascripts/discourse/lib/create-view.js.es6 deleted file mode 100644 index 854fa42fbe..0000000000 --- a/app/assets/javascripts/discourse/lib/create-view.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -import { on } from 'ember-addons/ember-computed-decorators'; - -export function createViewWithBodyClass(body_class) { - return Ember.View.extend({ - @on("didInsertElement") - addBodyClass() { - $('body').addClass(body_class); - }, - - @on("willDestroyElement") - removeBodyClass() { - $('body').removeClass(body_class); - } - }); -} diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs index 3d8f993ba0..480b10c0fd 100644 --- a/app/assets/javascripts/discourse/templates/about.hbs +++ b/app/assets/javascripts/discourse/templates/about.hbs @@ -1,97 +1,99 @@ -
-
+{{#d-section pageClass="about"}} +
+
-
    -
  • {{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}
    • - {{#if faqOverriden}} -
  • {{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}
    • -
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • - {{else}} -
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • - {{/if}} -
  • {{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}
    • -
  • {{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}
    • -
- -
-

{{i18n 'about.title' title=model.title}}

-

{{model.description}}

-
- - {{#if model.admins}} -
-

{{i18n 'about.our_admins'}}

- - {{#each model.admins as |a|}} - {{user-info user=a}} - {{/each}} -
+
    +
  • {{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}
    • + {{#if faqOverriden}} +
  • {{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}
    • +
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • + {{else}} +
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • + {{/if}} +
  • {{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}
    • +
  • {{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}
    • +
+
+

{{i18n 'about.title' title=model.title}}

+

{{model.description}}

- {{/if}} - {{#if model.moderators}} -
-

{{i18n 'about.our_moderators'}}

+ {{#if model.admins}} +
+

{{i18n 'about.our_admins'}}

-
- {{#each model.moderators as |m|}} - {{user-info user=m}} + {{#each model.admins as |a|}} + {{user-info user=a}} {{/each}} -
-
+
+ +
+ {{/if}} + + {{#if model.moderators}} +
+

{{i18n 'about.our_moderators'}}

+ +
+ {{#each model.moderators as |m|}} + {{user-info user=m}} + {{/each}} +
+
+
+ {{/if}} + +
+

{{i18n 'about.stats'}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{i18n 'about.stat.all_time'}}{{i18n 'about.stat.last_7_days'}}{{i18n 'about.stat.last_30_days'}}
{{i18n 'about.topic_count'}}{{number model.stats.topic_count}}{{number model.stats.topics_7_days}}{{number model.stats.topics_30_days}}
{{i18n 'about.post_count'}}{{number model.stats.post_count}}{{number model.stats.posts_7_days}}{{number model.stats.posts_30_days}}
{{i18n 'about.user_count'}}{{number model.stats.user_count}}{{number model.stats.users_7_days}}{{number model.stats.users_30_days}}
{{i18n 'about.active_user_count'}}—{{number model.stats.active_users_7_days}}{{number model.stats.active_users_30_days}}
{{i18n 'about.like_count'}}{{number model.stats.like_count}}{{number model.stats.likes_7_days}}{{number model.stats.likes_30_days}}
- {{/if}} -
-

{{i18n 'about.stats'}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {{i18n 'about.stat.all_time'}}{{i18n 'about.stat.last_7_days'}}{{i18n 'about.stat.last_30_days'}}
{{i18n 'about.topic_count'}}{{number model.stats.topic_count}}{{number model.stats.topics_7_days}}{{number model.stats.topics_30_days}}
{{i18n 'about.post_count'}}{{number model.stats.post_count}}{{number model.stats.posts_7_days}}{{number model.stats.posts_30_days}}
{{i18n 'about.user_count'}}{{number model.stats.user_count}}{{number model.stats.users_7_days}}{{number model.stats.users_30_days}}
{{i18n 'about.active_user_count'}}—{{number model.stats.active_users_7_days}}{{number model.stats.active_users_30_days}}
{{i18n 'about.like_count'}}{{number model.stats.like_count}}{{number model.stats.likes_7_days}}{{number model.stats.likes_30_days}}
-
- - {{#if contactInfo}} -
-

{{i18n 'about.contact'}}

-

{{{contactInfo}}}

-
- {{/if}} + {{#if contactInfo}} +
+

{{i18n 'about.contact'}}

+

{{{contactInfo}}}

+
+ {{/if}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs index a5aac17b23..b30725693b 100644 --- a/app/assets/javascripts/discourse/templates/badges/index.hbs +++ b/app/assets/javascripts/discourse/templates/badges/index.hbs @@ -1,17 +1,19 @@ -
-

{{i18n 'badges.title'}}

+{{#d-section pageClass="badges"}} +
+

{{i18n 'badges.title'}}

-
- {{#each badgeGroups as |bg|}} -
-
-

{{bg.badgeGrouping.displayName}}

+
+ {{#each badgeGroups as |bg|}} +
+
+

{{bg.badgeGrouping.displayName}}

+
+ + {{#each bg.badges as |b|}} + {{badge-card badge=b navigateOnClick="true"}} + {{/each}}
- - {{#each bg.badges as |b|}} - {{badge-card badge=b navigateOnClick="true"}} - {{/each}} -
- {{/each}} + {{/each}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index dc5572f828..edaf9172db 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -1,132 +1,134 @@ -
- {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} - {{d-button action="search" icon="search" class="btn-primary" disabled=searching}} +{{#d-section pageClass="search" class="search-container"}} +
+ {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} + {{d-button action="search" icon="search" class="btn-primary" disabled=searching}} -
- +
+ - {{#if expanded}} - {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}} + {{#if expanded}} + {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}} + {{/if}} +
+ + {{#if canCreateTopic}} + {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}} + {{/if}} + + {{#if canBulkSelect}} + {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} + {{bulk-select-button selected=selected action="search"}} {{/if}}
- {{#if canCreateTopic}} - {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}} - {{/if}} - - {{#if canBulkSelect}} - {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} - {{bulk-select-button selected=selected action="search"}} - {{/if}} -
- -{{#if bulkSelectEnabled}} -
- {{i18n "search.select_all"}} - {{i18n "search.clear_all"}} -
-{{/if}} - -{{#if invalidSearch}} -
- {{i18n "search.too_short"}} -
-{{/if}} - -{{#if context}} -
- -
-{{/if}} - -{{#conditional-loading-spinner condition=loading}} - - {{#unless hasResults}} -

- {{#if searchActive}} - {{i18n "search.no_results"}} - {{/if}} -

- {{/unless}} - - {{#if hasResults}} -
-
- - {{{i18n "search.result_count" count=resultCount term=noSortQ}}} - -
-
- - {{i18n "search.sort_by"}} - - {{combo-box value=sortOrder content=sortOrders castInteger="true"}} -
+ {{#if bulkSelectEnabled}} +
+ {{i18n "search.select_all"}} + {{i18n "search.clear_all"}}
{{/if}} - {{#each model.posts as |result|}} -
-
- - {{avatar result imageSize="large"}} - -
+ {{#if invalidSearch}} +
+ {{i18n "search.too_short"}} +
+ {{/if}} -
-
- {{#if bulkSelectEnabled}} - {{track-selected selectedList=selected selectedId=result.topic}} - {{/if}} + {{#if context}} +
+ +
+ {{/if}} - - {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}} - + {{#conditional-loading-spinner condition=loading}} -
- {{category-link result.topic.category}} - {{#each result.topic.tags as |tag|}} - {{discourse-tag tag}} - {{/each}} - {{plugin-outlet "full-page-search-category"}} -
-
- -
- - {{format-age result.created_at}} - {{#if result.blurb}} - - - {{/if}} - - - {{#if result.blurb}} - {{#highlight-text highlight=q}} - {{{unbound result.blurb}}} - {{/highlight-text}} - {{/if}} -
- - {{#if showLikeCount}} - {{#if result.like_count}} - - {{/if}} + {{#unless hasResults}} +

+ {{#if searchActive}} + {{i18n "search.no_results"}} {{/if}} +

+ {{/unless}} + + {{#if hasResults}} +
+
+ + {{{i18n "search.result_count" count=resultCount term=noSortQ}}} + +
+
+ + {{i18n "search.sort_by"}} + + {{combo-box value=sortOrder content=sortOrders castInteger="true"}} +
-
- {{/each}} + {{/if}} - {{#if hasResults}} -

- {{i18n "search.no_more_results"}} -

- {{/if}} + {{#each model.posts as |result|}} +
+
+ + {{avatar result imageSize="large"}} + +
-{{/conditional-loading-spinner}} +
+
+ {{#if bulkSelectEnabled}} + {{track-selected selectedList=selected selectedId=result.topic}} + {{/if}} + + + {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}} + + +
+ {{category-link result.topic.category}} + {{#each result.topic.tags as |tag|}} + {{discourse-tag tag}} + {{/each}} + {{plugin-outlet "full-page-search-category"}} +
+
+ +
+ + {{format-age result.created_at}} + {{#if result.blurb}} + - + {{/if}} + + + {{#if result.blurb}} + {{#highlight-text highlight=q}} + {{{unbound result.blurb}}} + {{/highlight-text}} + {{/if}} +
+ + {{#if showLikeCount}} + {{#if result.like_count}} + + {{/if}} + {{/if}} +
+
+ {{/each}} + + {{#if hasResults}} +

+ {{i18n "search.no_more_results"}} +

+ {{/if}} + + {{/conditional-loading-spinner}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index b02c503fd8..c8cc96a9e7 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -1,7 +1,9 @@ -{{bread-crumbs categories=categories}} +{{#d-section bodyClass="navigation-topics" scrollTop="false"}} + {{bread-crumbs categories=categories}} -{{navigation-bar navItems=navItems filterMode=filterMode}} + {{navigation-bar navItems=navItems filterMode=filterMode}} -{{#if canCreateTopic}} - -{{/if}} + {{#if canCreateTopic}} + + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs similarity index 99% rename from app/assets/javascripts/discourse/templates/user/preferences.hbs rename to app/assets/javascripts/discourse/templates/preferences.hbs index 171da9306b..2afbb4d986 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/preferences.hbs @@ -1,4 +1,4 @@ -
+{{#d-section pageClass="user-preferences" class="user-content user-preferences"}}
@@ -367,4 +367,4 @@
{{/if}} - +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs index 3fd70a3f75..c355c1f3bd 100644 --- a/app/assets/javascripts/discourse/templates/tags.hbs +++ b/app/assets/javascripts/discourse/templates/tags.hbs @@ -1,9 +1,11 @@ -
-
-
-
- {{outlet}} +{{#d-section pageClass="tags"}} +
+
+
+
+ {{outlet}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index 098193b7e8..6588a53e01 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -1,109 +1,111 @@ -{{#if canInviteToForum}} - {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} -
-

{{i18n 'user.invited.title'}}

+{{#d-section pageClass="user-invites"}} + {{#if canInviteToForum}} + {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} +
+

{{i18n 'user.invited.title'}}

- {{#if model.can_see_invite_details}} -
-
-
    - {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} - {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} -
-
+ {{#if model.can_see_invite_details}} +
+
+
    + {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} + {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} +
+
-
- {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} - {{#if canBulkInvite}} - {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} - {{/if}} - {{#if showReinviteAllButton}} - {{#if reinvitedAll}} - {{i18n 'user.invited.reinvited_all'}} - {{else}} - {{d-button icon="refresh" action="reinviteAll" class="btn" label="user.invited.reinvite_all"}} +
+ {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} + {{#if canBulkInvite}} + {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{/if}} - {{/if}} -
-
- {{/if}} - - {{#if showSearch}} -
-
{{text-field value=searchTerm placeholderKey="user.invited.search"}}
-
- {{/if}} - - {{#if model.invites}} - - - {{#if inviteRedeemed}} - - - {{#if model.can_see_invite_details}} - - - - - + {{#if showReinviteAllButton}} + {{#if reinvitedAll}} + {{i18n 'user.invited.reinvited_all'}} + {{else}} + {{d-button icon="refresh" action="reinviteAll" class="btn" label="user.invited.reinvite_all"}} + {{/if}} {{/if}} - {{else}} - - - {{/if}} - - {{#each model.invites as |invite|}} + + + {{/if}} + + {{#if showSearch}} +
+
{{text-field value=searchTerm placeholderKey="user.invited.search"}} +
+ {{/if}} + + {{#if model.invites}} +
{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
- {{#if invite.user}} - - + {{#if inviteRedeemed}} + + {{#if model.can_see_invite_details}} - - - - - + + + + + {{/if}} {{else}} - - - + + {{/if}} - {{/each}} -
- {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} - {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} - {{format-date invite.redeemed_at}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} - / - {{{unbound invite.user.days_since_created}}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{unbound invite.email}}{{format-date invite.created_at}} - {{#if invite.expired}} - {{i18n 'user.invited.expired'}} -      - {{/if}} - {{#if invite.rescinded}} - {{i18n 'user.invited.rescinded'}} - {{else}} - {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} - {{/if}} -      - {{#if invite.reinvited}} - {{i18n 'user.invited.reinvited'}} - {{else}} - {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} - {{/if}} - {{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
- {{conditional-loading-spinner condition=invitesLoading}} + {{#each model.invites as |invite|}} + + {{#if invite.user}} + + {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} + + {{format-date invite.redeemed_at}} + {{#if model.can_see_invite_details}} + {{format-date invite.user.last_seen_at}} + {{number invite.user.topics_entered}} + {{number invite.user.posts_read_count}} + {{{unbound invite.user.time_read}}} + {{{unbound invite.user.days_visited}}} + / + {{{unbound invite.user.days_since_created}}} + {{/if}} + {{else}} + {{unbound invite.email}} + {{format-date invite.created_at}} + + {{#if invite.expired}} + {{i18n 'user.invited.expired'}} +      + {{/if}} + {{#if invite.rescinded}} + {{i18n 'user.invited.rescinded'}} + {{else}} + {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} + {{/if}} +      + {{#if invite.reinvited}} + {{i18n 'user.invited.reinvited'}} + {{else}} + {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} + {{/if}} + + {{/if}} + + {{/each}} + + {{conditional-loading-spinner condition=invitesLoading}} - {{else}} -
- {{#if canBulkInvite}} - {{{i18n 'user.invited.bulk_invite.none'}}} - {{else}} - {{i18n 'user.invited.none'}} - {{/if}} -
- {{/if}} -
- {{/load-more}} -{{/if}} + {{else}} +
+ {{#if canBulkInvite}} + {{{i18n 'user.invited.bulk_invite.none'}}} + {{else}} + {{i18n 'user.invited.none'}} + {{/if}} +
+ {{/if}} +
+ {{/load-more}} + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs index 3b07cd95ae..72805bb8fd 100644 --- a/app/assets/javascripts/discourse/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/templates/user/activity.hbs @@ -1,4 +1,4 @@ -
+{{#d-section pageClass="user-activity" class="user-nagivation" scrollTop="false"}} {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=currentPath}}
  • {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}} @@ -31,10 +31,8 @@ {{d-button action="exportUserArchive" label="user.download_archive" icon="download"}}
    • {{/if}} - - +{{/d-section}}
    -{{outlet}} + {{outlet}}
    - diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs index 01410767aa..860af54a92 100644 --- a/app/assets/javascripts/discourse/templates/user/badges.hbs +++ b/app/assets/javascripts/discourse/templates/user/badges.hbs @@ -1,5 +1,5 @@ -
    +{{#d-section pageClass="user-badges" class="user-content user-badges-list"}} {{#each sortedBadges as |ub|}} {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=username}} {{/each}} -
    +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs index 56f03b2e61..ec37e6098a 100644 --- a/app/assets/javascripts/discourse/templates/user/messages.hbs +++ b/app/assets/javascripts/discourse/templates/user/messages.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section class="user-navigation" pageClass="user-messages"}} {{#unless site.mobileView}} {{#if showNewPM}} {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} @@ -37,8 +37,7 @@ {{/if}} {{/each}} {{/mobile-nav}} - -
    +{{/d-section}}
    diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index 5682d2e855..6d2b1e989d 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section pageClass="user-notifications" class="user-notifications"}} {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
  • {{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}} @@ -26,7 +26,7 @@ icon='check' disabled=allNotificationsRead}} {{/if}} -
    • +{{/d-section}}
    {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}} diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs index 0042f4ba92..ffb578edcb 100644 --- a/app/assets/javascripts/discourse/templates/user/summary.hbs +++ b/app/assets/javascripts/discourse/templates/user/summary.hbs @@ -1,185 +1,187 @@ -
    -

    {{i18n "user.summary.stats"}}

    -
      -
    • - {{user-stat value=model.days_visited label="user.summary.days_visited"}} -
      • -
    • - {{model.time_read}} - {{{i18n "user.summary.time_read"}}} -
      • -
    • - {{user-stat value=model.posts_read_count label="user.summary.posts_read"}} -
      • -
    • - {{#link-to 'userActivity.likesGiven'}} - {{user-stat value=model.likes_given label="user.summary.likes_given"}} - {{/link-to}} -
      • - {{#if model.bookmark_count}} +{{#d-section pageClass="user-summary"}} +
      +

      {{i18n "user.summary.stats"}}

      +
        +
      • + {{user-stat value=model.days_visited label="user.summary.days_visited"}} +
        • +
      • + {{model.time_read}} + {{{i18n "user.summary.time_read"}}} +
        • +
      • + {{user-stat value=model.posts_read_count label="user.summary.posts_read"}} +
      • - {{#link-to 'userActivity.bookmarks'}} - {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}} + {{#link-to 'userActivity.likesGiven'}} + {{user-stat value=model.likes_given label="user.summary.likes_given"}} {{/link-to}}
        • - {{/if}} -
      • - {{#link-to 'userActivity.topics'}} - {{user-stat value=model.topic_count label="user.summary.topic_count"}} - {{/link-to}} -
        • -
      • - {{#link-to 'userActivity.replies'}} - {{user-stat value=model.post_count label="user.summary.post_count"}} - {{/link-to}} -
        • -
      • - {{user-stat value=model.likes_received label="user.summary.likes_received"}} -
        • -
      -
      - -
      -
      -

      {{i18n "user.summary.top_replies"}}

      - {{#if model.replies.length}} -
        - {{#each model.replies as |reply|}} -
      • - - {{format-date reply.createdAt format="tiny" noTitle="true"}} - {{#if reply.like_count}} - · - {{fa-icon 'heart'}}  - {{/if}} - -
        - {{{reply.topic.fancyTitle}}} -
        • - {{/each}} -
      - {{#if moreReplies}} -

      {{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}

      + {{#if model.bookmark_count}} +
    • + {{#link-to 'userActivity.bookmarks'}} + {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}} + {{/link-to}} +
      • {{/if}} - {{else}} -

      {{i18n "user.summary.no_replies"}}

      - {{/if}} +
    • + {{#link-to 'userActivity.topics'}} + {{user-stat value=model.topic_count label="user.summary.topic_count"}} + {{/link-to}} +
      • +
    • + {{#link-to 'userActivity.replies'}} + {{user-stat value=model.post_count label="user.summary.post_count"}} + {{/link-to}} +
      • +
    • + {{user-stat value=model.likes_received label="user.summary.likes_received"}} +
      • +
    -
    -

    {{i18n "user.summary.top_topics"}}

    - {{#if model.topics.length}} -
      - {{#each model.topics as |topic|}} -
    • - - {{format-date topic.createdAt format="tiny" noTitle="true"}} - {{#if topic.like_count}} - · - {{fa-icon 'heart'}}  - {{/if}} - -
      - {{{topic.fancyTitle}}} -
      • - {{/each}} -
    - {{#if moreTopics}} -

    {{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}

    + +
    +
    +

    {{i18n "user.summary.top_replies"}}

    + {{#if model.replies.length}} +
      + {{#each model.replies as |reply|}} +
    • + + {{format-date reply.createdAt format="tiny" noTitle="true"}} + {{#if reply.like_count}} + · + {{fa-icon 'heart'}}  + {{/if}} + +
      + {{{reply.topic.fancyTitle}}} +
      • + {{/each}} +
    + {{#if moreReplies}} +

    {{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}

    + {{/if}} + {{else}} +

    {{i18n "user.summary.no_replies"}}

    {{/if}} - {{else}} -

    {{i18n "user.summary.no_topics"}}

    - {{/if}} +
    +
    +

    {{i18n "user.summary.top_topics"}}

    + {{#if model.topics.length}} +
      + {{#each model.topics as |topic|}} +
    • + + {{format-date topic.createdAt format="tiny" noTitle="true"}} + {{#if topic.like_count}} + · + {{fa-icon 'heart'}}  + {{/if}} + +
      + {{{topic.fancyTitle}}} +
      • + {{/each}} +
    + {{#if moreTopics}} +

    {{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}

    + {{/if}} + {{else}} +

    {{i18n "user.summary.no_topics"}}

    + {{/if}} +
    -
    -
    -
    -

    {{i18n "user.summary.top_links"}}

    - {{#if model.links.length}} - - {{else}} -

    {{i18n "user.summary.no_links"}}

    - {{/if}} +
    +
    +

    {{i18n "user.summary.top_links"}}

    + {{#if model.links.length}} + + {{else}} +

    {{i18n "user.summary.no_links"}}

    + {{/if}} +
    +
    - -
    -
    - -
    -

    {{i18n "user.summary.top_badges"}}

    - {{#each model.badges as |badge|}} - {{badge-card badge=badge count=badge.count navigateOnClick="true" username=user.username_lower}} - {{else}} -

    {{i18n "user.summary.no_badges"}}

    - {{/each}} - {{#if moreBadges}} -

    {{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}

    - {{/if}} -
    +
    +

    {{i18n "user.summary.top_badges"}}

    + {{#each model.badges as |badge|}} + {{badge-card badge=badge count=badge.count navigateOnClick="true" username=user.username_lower}} + {{else}} +

    {{i18n "user.summary.no_badges"}}

    + {{/each}} + {{#if moreBadges}} +

    {{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}

    + {{/if}} +
    +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 82b7ce0c70..0fe4408dd7 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -1,44 +1,46 @@ -{{#load-more selector=".directory tbody tr" action="loadMore"}} -
    -
    +{{#d-section pageClass="users"}} + {{#load-more selector=".directory tbody tr" action="loadMore"}} +
    +
    + +
    + {{period-chooser period=period}} + {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}} +
    + + {{#conditional-loading-spinner condition=model.loading}} + {{#if model.length}} +
    {{i18n "directory.total_rows" count=model.totalRows}}
    + + + + + {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} + {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} + {{directory-toggle field="topic_count" order=order asc=asc}} + {{directory-toggle field="post_count" order=order asc=asc}} + {{directory-toggle field="topics_entered" order=order asc=asc}} + {{directory-toggle field="posts_read" order=order asc=asc}} + {{directory-toggle field="days_visited" order=order asc=asc}} + {{#if showTimeRead}} + + {{/if}} + + + {{#each model as |item|}} + {{directory-item item=item showTimeRead=showTimeRead}} + {{/each}} + +
     {{i18n "directory.time_read"}}
    + + {{conditional-loading-spinner condition=model.loadingMore}} + {{else}} +
    +

    {{i18n "directory.no_results"}}

    + {{/if}} + {{/conditional-loading-spinner}} -
    - {{period-chooser period=period}} - {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
    - - {{#conditional-loading-spinner condition=model.loading}} - {{#if model.length}} -
    {{i18n "directory.total_rows" count=model.totalRows}}
    - - - - - {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} - {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} - {{directory-toggle field="topic_count" order=order asc=asc}} - {{directory-toggle field="post_count" order=order asc=asc}} - {{directory-toggle field="topics_entered" order=order asc=asc}} - {{directory-toggle field="posts_read" order=order asc=asc}} - {{directory-toggle field="days_visited" order=order asc=asc}} - {{#if showTimeRead}} - - {{/if}} - - - {{#each model as |item|}} - {{directory-item item=item showTimeRead=showTimeRead}} - {{/each}} - -
     {{i18n "directory.time_read"}}
    - - {{conditional-loading-spinner condition=model.loadingMore}} - {{else}} -
    -

    {{i18n "directory.no_results"}}

    - {{/if}} - {{/conditional-loading-spinner}} -
    -
    -{{/load-more}} + {{/load-more}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/views/about.js.es6 b/app/assets/javascripts/discourse/views/about.js.es6 deleted file mode 100644 index a516e13917..0000000000 --- a/app/assets/javascripts/discourse/views/about.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('about-page'); diff --git a/app/assets/javascripts/discourse/views/badges-index.js.es6 b/app/assets/javascripts/discourse/views/badges-index.js.es6 deleted file mode 100644 index a852700449..0000000000 --- a/app/assets/javascripts/discourse/views/badges-index.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('badges-page').extend(ScrollTop); diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6 deleted file mode 100644 index ed9789dc69..0000000000 --- a/app/assets/javascripts/discourse/views/full-page-search.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('search-page').extend({ - classNames: ['search-container'] -}); diff --git a/app/assets/javascripts/discourse/views/navigation-default.js.es6 b/app/assets/javascripts/discourse/views/navigation-default.js.es6 deleted file mode 100644 index 031456f324..0000000000 --- a/app/assets/javascripts/discourse/views/navigation-default.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('navigation-topics'); diff --git a/app/assets/javascripts/discourse/views/preferences.js.es6 b/app/assets/javascripts/discourse/views/preferences.js.es6 deleted file mode 100644 index e0033515fc..0000000000 --- a/app/assets/javascripts/discourse/views/preferences.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-preferences-page').extend({ - templateName: 'user/preferences', - classNames: ['user-preferences'] -}); diff --git a/app/assets/javascripts/discourse/views/tags.js.es6 b/app/assets/javascripts/discourse/views/tags.js.es6 deleted file mode 100644 index de51094b36..0000000000 --- a/app/assets/javascripts/discourse/views/tags.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('tags-page'); diff --git a/app/assets/javascripts/discourse/views/user-activity.js.es6 b/app/assets/javascripts/discourse/views/user-activity.js.es6 deleted file mode 100644 index d7d7a40a22..0000000000 --- a/app/assets/javascripts/discourse/views/user-activity.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-activity-page'); diff --git a/app/assets/javascripts/discourse/views/user-badges.js.es6 b/app/assets/javascripts/discourse/views/user-badges.js.es6 deleted file mode 100644 index c0d0671906..0000000000 --- a/app/assets/javascripts/discourse/views/user-badges.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-badges-page').extend(ScrollTop); diff --git a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 deleted file mode 100644 index 8ea3dc05f2..0000000000 --- a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-invites-page'); diff --git a/app/assets/javascripts/discourse/views/user-messages.js.es6 b/app/assets/javascripts/discourse/views/user-messages.js.es6 deleted file mode 100644 index 97e7a13742..0000000000 --- a/app/assets/javascripts/discourse/views/user-messages.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-messages-page'); diff --git a/app/assets/javascripts/discourse/views/user-notifications.js.es6 b/app/assets/javascripts/discourse/views/user-notifications.js.es6 deleted file mode 100644 index a8141b59c0..0000000000 --- a/app/assets/javascripts/discourse/views/user-notifications.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-notifications-page'); diff --git a/app/assets/javascripts/discourse/views/user-summary.js.es6 b/app/assets/javascripts/discourse/views/user-summary.js.es6 deleted file mode 100644 index a51a5595b0..0000000000 --- a/app/assets/javascripts/discourse/views/user-summary.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-summary-page'); diff --git a/app/assets/javascripts/discourse/views/users.js.es6 b/app/assets/javascripts/discourse/views/users.js.es6 deleted file mode 100644 index ee5c1efe05..0000000000 --- a/app/assets/javascripts/discourse/views/users.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('users-page'); diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6 index 9819ed8cba..f6547bc646 100644 --- a/test/javascripts/acceptance/about-test.js.es6 +++ b/test/javascripts/acceptance/about-test.js.es6 @@ -4,6 +4,7 @@ acceptance("About"); test("viewing", () => { visit("/about"); andThen(() => { + ok($('body.about-page').length, "has body class"); ok(exists('.about.admins .user-info'), 'has admins'); ok(exists('.about.moderators .user-info'), 'has moderators'); ok(exists('.about.stats tr td'), 'has stats'); diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6 index 8017739caf..ad1f00c0d5 100644 --- a/test/javascripts/acceptance/badges-test.js.es6 +++ b/test/javascripts/acceptance/badges-test.js.es6 @@ -5,6 +5,7 @@ acceptance("Badges"); test("Visit Badge Pages", () => { visit("/badges"); andThen(() => { + ok($('body.badges-page').length, "has body class"); ok(exists('.badge-groups .badge-card'), "has a list of badges"); }); diff --git a/test/javascripts/acceptance/user-preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6 similarity index 88% rename from test/javascripts/acceptance/user-preferences-test.js.es6 rename to test/javascripts/acceptance/preferences-test.js.es6 index 1431840a99..49ac494713 100644 --- a/test/javascripts/acceptance/user-preferences-test.js.es6 +++ b/test/javascripts/acceptance/preferences-test.js.es6 @@ -5,6 +5,7 @@ test("update some fields", () => { visit("/users/eviltrout/preferences"); andThen(() => { + ok($('body.user-preferences-page').length, "has the body class"); equal(currentURL(), '/users/eviltrout/preferences', "it doesn't redirect"); ok(exists('.user-preferences'), 'it shows the preferences'); }); diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6 index 9804e6db07..2bc511f93b 100644 --- a/test/javascripts/acceptance/search-full-test.js.es6 +++ b/test/javascripts/acceptance/search-full-test.js.es6 @@ -43,6 +43,8 @@ test("perform various searches", assert => { visit("/search"); andThen(() => { + ok($('body.search-page').length, "has body class"); + ok(exists('.search-container'), "has container class"); assert.ok(find('input.search').length > 0); assert.ok(find('.fps-topic').length === 0); }); diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6 new file mode 100644 index 0000000000..c24cbee8d1 --- /dev/null +++ b/test/javascripts/acceptance/tags-test.js.es6 @@ -0,0 +1,11 @@ +import { acceptance } from "helpers/qunit-helpers"; +acceptance("Tags", { loggedIn: true }); + +test("list the tags", () => { + visit("/tags"); + + andThen(() => { + ok($('body.tags-page').length, "has the body class"); + ok(exists('.tag-eviltrout'), "shows the evil trout tag"); + }); +}); diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6 index 792b7ab7f5..28749712f3 100644 --- a/test/javascripts/acceptance/topic-discovery-test.js.es6 +++ b/test/javascripts/acceptance/topic-discovery-test.js.es6 @@ -4,6 +4,7 @@ acceptance("Topic Discovery"); test("Visit Discovery Pages", () => { visit("/"); andThen(() => { + ok($('body.navigation-topics').length, "has the default navigation"); ok(exists(".topic-list"), "The list of topics was rendered"); ok(exists('.topic-list .topic-list-item'), "has topics"); }); diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6 index 10baa01079..6d41bffc6a 100644 --- a/test/javascripts/acceptance/user-anonymous-test.js.es6 +++ b/test/javascripts/acceptance/user-anonymous-test.js.es6 @@ -24,6 +24,9 @@ test("Root URL", () => { test("Filters", () => { visit("/users/eviltrout/activity"); + andThen(() => { + ok($('body.user-activity-page').length, "has the body class"); + }); hasStream(); visit("/users/eviltrout/activity/topics"); @@ -33,6 +36,14 @@ test("Filters", () => { hasStream(); }); +test("Badges", () => { + visit("/users/eviltrout/badges"); + andThen(() => { + ok($('body.user-badges-page').length, "has the body class"); + ok(exists(".user-badges-list .badge-card"), "shows a badge"); + }); +}); + test("Restricted Routes", () => { visit("/users/eviltrout/preferences"); diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6 index a7e9172687..045750778e 100644 --- a/test/javascripts/acceptance/user-test.js.es6 +++ b/test/javascripts/acceptance/user-test.js.es6 @@ -1,17 +1,32 @@ import { acceptance } from "helpers/qunit-helpers"; -import { hasStream } from 'acceptance/user-anonymous-test'; acceptance("User", {loggedIn: true}); -test("Pending", () => { - visit("/users/eviltrout/activity/pending"); - hasStream(); +test("Invites", () => { + visit("/users/eviltrout/invited/pending"); + andThen(() => { + ok($('body.user-invites-page').length, "has the body class"); + }); +}); + +test("Messages", () => { + visit("/users/eviltrout/messages"); + andThen(() => { + ok($('body.user-messages-page').length, "has the body class"); + }); +}); + +test("Notifications", () => { + visit("/users/eviltrout/notifications"); + andThen(() => { + ok($('body.user-notifications-page').length, "has the body class"); + }); }); test("Root URL - Viewing Self", () => { visit("/users/eviltrout"); andThen(() => { + ok($('body.user-summary-page').length, "has the body class"); equal(currentPath(), 'user.summary', "it defaults to summary"); }); }); - diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6 index b517a8e872..eb89741d25 100644 --- a/test/javascripts/acceptance/users-test.js.es6 +++ b/test/javascripts/acceptance/users-test.js.es6 @@ -4,6 +4,7 @@ acceptance("User Directory"); test("Visit Page", function() { visit("/users"); andThen(() => { + ok($('body.users-page').length, "has the body class"); ok(exists('.directory table tr'), "has a list of users"); }); }); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 7e815029b6..54e33dcf43 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -56,6 +56,13 @@ export default function() { return response(json); }); + this.get('/tags', () => { + return response({ tags: [{ + id: 'eviltrout', + count: 1 + }] }); + }); + this.get('/users/eviltrout.json', () => { const json = fixturesByUrl['/users/eviltrout.json']; if (loggedIn()) { @@ -76,6 +83,20 @@ export default function() { }); }); + this.get('/users/eviltrout/invited_count.json', () => { + return response({ + "counts": { "pending": 1, "redeemed": 0, "total": 0 } + }); + }); + + this.get('/users/eviltrout/invited.json', () => { + return response({ "invites": [ {id: 1} ] }); + }); + + this.get('/topics/private-messages/eviltrout.json', () => { + return response({ topic_list: { topics: [] } }); + }); + this.get('/clicks/track', success); this.get('/search', request => { From a94f06ff7843bdd9b3904c73ad97e522f666ef11 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Nov 2016 14:35:53 -0500 Subject: [PATCH 067/266] Remove the `ScrollTop` Mixin --- .../admin/components/site-setting.js.es6 | 3 +- .../admin/templates/badges-index.hbs | 4 +- .../admin/templates/badges-show.hbs | 4 +- .../templates/site-settings-category.hbs | 4 +- .../javascripts/admin/templates/user.hbs | 4 +- .../admin/views/admin-badges-index.js.es6 | 3 -- .../admin/views/admin-badges-show.js.es6 | 7 ---- .../javascripts/admin/views/admin-user.js.es6 | 1 - .../discourse/components/d-section.js.es6 | 10 +---- .../discourse/components/watch-read.js.es6 | 24 +++++++++++ .../discourse/controllers/static.js.es6 | 3 ++ .../discourse/mixins/scroll-top.js.es6 | 18 +++++++-- .../discourse/templates/static.hbs | 26 ++++++------ .../javascripts/discourse/templates/user.hbs | 6 +-- .../discourse/templates/user/activity.hbs | 2 +- .../javascripts/discourse/views/static.js.es6 | 40 ------------------- .../javascripts/discourse/views/user.js.es6 | 4 -- .../javascripts/acceptance/static-test.js.es6 | 4 ++ test/javascripts/acceptance/user-test.js.es6 | 1 + .../helpers/create-pretender.js.es6 | 4 +- 20 files changed, 77 insertions(+), 95 deletions(-) delete mode 100644 app/assets/javascripts/admin/views/admin-badges-index.js.es6 delete mode 100644 app/assets/javascripts/admin/views/admin-badges-show.js.es6 delete mode 100644 app/assets/javascripts/admin/views/admin-user.js.es6 create mode 100644 app/assets/javascripts/discourse/components/watch-read.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/static.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user.js.es6 diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6 index 8b6601b4d3..662e4ef684 100644 --- a/app/assets/javascripts/admin/components/site-setting.js.es6 +++ b/app/assets/javascripts/admin/components/site-setting.js.es6 @@ -1,12 +1,11 @@ import BufferedContent from 'discourse/mixins/buffered-content'; -import ScrollTop from 'discourse/mixins/scroll-top'; import SiteSetting from 'admin/models/site-setting'; import { propertyNotEqual } from 'discourse/lib/computed'; import computed from 'ember-addons/ember-computed-decorators'; const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list']; -export default Ember.Component.extend(BufferedContent, ScrollTop, { +export default Ember.Component.extend(BufferedContent, { classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'], content: Ember.computed.alias('setting'), dirty: propertyNotEqual('buffered.value', 'setting.value'), diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs index 6ee80748f8..c94f59fe10 100644 --- a/app/assets/javascripts/admin/templates/badges-index.hbs +++ b/app/assets/javascripts/admin/templates/badges-index.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section class="current-badge span13"}}

    {{i18n 'admin.badges.none_selected'}}

    @@ -6,4 +6,4 @@ {{fa-icon "plus"}} {{i18n 'admin.badges.new'}} {{/link-to}}
    -
    +{{/d-section}} diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs index f29829eba5..e0ae7001df 100644 --- a/app/assets/javascripts/admin/templates/badges-show.hbs +++ b/app/assets/javascripts/admin/templates/badges-show.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section class="current-badge span13"}}
    @@ -143,7 +143,7 @@ {{/unless}}
    -
    +{{/d-section}} {{#if grant_count}}
    diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/templates/site-settings-category.hbs index 3e8b088f69..2e44f80c38 100644 --- a/app/assets/javascripts/admin/templates/site-settings-category.hbs +++ b/app/assets/javascripts/admin/templates/site-settings-category.hbs @@ -1,9 +1,9 @@ {{#if filteredContent}} -
    + {{#d-section class="form-horizontal settings"}} {{#each filteredContent as |setting|}} {{site-setting setting=setting saveAction="saveSetting"}} {{/each}} -
    + {{/d-section}} {{else}}
    {{i18n 'admin.site_settings.no_results'}} diff --git a/app/assets/javascripts/admin/templates/user.hbs b/app/assets/javascripts/admin/templates/user.hbs index c24cd68950..3b1c774271 100644 --- a/app/assets/javascripts/admin/templates/user.hbs +++ b/app/assets/javascripts/admin/templates/user.hbs @@ -1 +1,3 @@ -{{outlet}} +{{#d-section}} + {{outlet}} +{{/d-section}} diff --git a/app/assets/javascripts/admin/views/admin-badges-index.js.es6 b/app/assets/javascripts/admin/views/admin-badges-index.js.es6 deleted file mode 100644 index f0b0ceb85d..0000000000 --- a/app/assets/javascripts/admin/views/admin-badges-index.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; - -export default Ember.View.extend(ScrollTop); diff --git a/app/assets/javascripts/admin/views/admin-badges-show.js.es6 b/app/assets/javascripts/admin/views/admin-badges-show.js.es6 deleted file mode 100644 index 55f7e0b64d..0000000000 --- a/app/assets/javascripts/admin/views/admin-badges-show.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; - -export default Ember.View.extend(ScrollTop, { - _scrollOnModelChange: function() { - this._scrollTop(); - }.observes('controller.model.id') -}); diff --git a/app/assets/javascripts/admin/views/admin-user.js.es6 b/app/assets/javascripts/admin/views/admin-user.js.es6 deleted file mode 100644 index 2bd2497f15..0000000000 --- a/app/assets/javascripts/admin/views/admin-user.js.es6 +++ /dev/null @@ -1 +0,0 @@ -export default Ember.View.extend(Discourse.ScrollTop); diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6 index 1bb1942003..41e044f95e 100644 --- a/app/assets/javascripts/discourse/components/d-section.js.es6 +++ b/app/assets/javascripts/discourse/components/d-section.js.es6 @@ -1,14 +1,9 @@ -import DiscourseURL from 'discourse/lib/url'; +import { scrollTop } from 'discourse/mixins/scroll-top'; // Can add a body class from within a component, also will scroll to the top automatically. export default Ember.Component.extend({ tagName: 'section', - _scrollTop() { - if (Ember.testing) { return; } - $(document).scrollTop(0); - }, - didInsertElement() { this._super(); @@ -26,8 +21,7 @@ export default Ember.Component.extend({ return; } - if (DiscourseURL.isJumpScheduled()) { return; } - Ember.run.scheduleOnce('afterRender', this, this._scrollTop); + scrollTop(); }, willDestroyElement() { diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js.es6 new file mode 100644 index 0000000000..2a92380cbe --- /dev/null +++ b/app/assets/javascripts/discourse/components/watch-read.js.es6 @@ -0,0 +1,24 @@ +import isElementInViewport from "discourse/lib/is-element-in-viewport"; + +export default Ember.Component.extend({ + didInsertElement() { + this._super(); + const currentUser = this.currentUser; + if (!currentUser) { return; } + + const path = this.get('path'); + if (path === "faq" || path === "guidelines") { + $(window).on('load.faq resize.faq scroll.faq', () => { + const faqUnread = !currentUser.get('read_faq'); + if (faqUnread && isElementInViewport($(".contents p").last())) { + this.sendAction(); + } + }); + } + }, + + willDestroyElement() { + this._super(); + $(window).off('load.faq resize.faq scroll.faq'); + } +}); diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6 index 2c31b962c7..166a0676a7 100644 --- a/app/assets/javascripts/discourse/controllers/static.js.es6 +++ b/app/assets/javascripts/discourse/controllers/static.js.es6 @@ -6,6 +6,9 @@ export default Ember.Controller.extend({ showLoginButton: Em.computed.equal("model.path", "login"), + @computed('model.path') + bodyClass: path => `static-${path}`, + @computed("model.path") showSignupButton() { return this.get("model.path") === "login" && this.get('application.canSignUp'); diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 index 35af1d0eee..5945c73a60 100644 --- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 +++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 @@ -1,14 +1,24 @@ import DiscourseURL from 'discourse/lib/url'; +import { deprecated } from 'discourse/mixins/scroll-top'; + +const context = { + _scrollTop() { + if (Ember.testing) { return; } + $(document).scrollTop(0); + } +}; function scrollTop() { if (DiscourseURL.isJumpScheduled()) { return; } - Ember.run.schedule('afterRender', function() { - $(document).scrollTop(0); - }); + Ember.run.scheduleOnce('afterRender', context, context._scrollTop); } export default Ember.Mixin.create({ - _scrollTop: scrollTop.on('didInsertElement') + didInsertElement() { + deprecated('The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component'); + this._super(); + scrollTop(); + } }); export { scrollTop }; diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs index 91662eb334..529b5ba149 100644 --- a/app/assets/javascripts/discourse/templates/static.hbs +++ b/app/assets/javascripts/discourse/templates/static.hbs @@ -1,14 +1,16 @@ -
    -
    - {{plugin-outlet "above-static"}} - {{{model.html}}} +{{#d-section bodyClass=bodyClass class="container"}} + {{#watch-read action="markFaqRead" path=model.path}} +
    + {{plugin-outlet "above-static"}} + {{{model.html}}} - {{#if showSignupButton}} - {{d-button action="showCreateAccount" class="btn-primary sign-up-button" label="sign_up"}} - {{/if}} + {{#if showSignupButton}} + {{d-button action="showCreateAccount" class="btn-primary sign-up-button" label="sign_up"}} + {{/if}} - {{#if showLoginButton}} - {{d-button action="showLogin" class="btn-primary login-button" icon="user" label="log_in"}} - {{/if}} -
    -
    + {{#if showLoginButton}} + {{d-button action="showLogin" class="btn-primary login-button" icon="user" label="log_in"}} + {{/if}} +
    + {{/watch-read}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index 1d890517e2..fb22c218c3 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -1,5 +1,5 @@ -
    -
    +
    + {{#d-section class="user-main"}}
    {{#unless collapsedInfo}} @@ -186,5 +186,5 @@
    -
    + {{/d-section}}
    diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs index 72805bb8fd..c5243f1ffb 100644 --- a/app/assets/javascripts/discourse/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/templates/user/activity.hbs @@ -1,4 +1,4 @@ -{{#d-section pageClass="user-activity" class="user-nagivation" scrollTop="false"}} +{{#d-section pageClass="user-activity" class="user-navigation" scrollTop="false"}} {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=currentPath}}
  • {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}} diff --git a/app/assets/javascripts/discourse/views/static.js.es6 b/app/assets/javascripts/discourse/views/static.js.es6 deleted file mode 100644 index d075558a72..0000000000 --- a/app/assets/javascripts/discourse/views/static.js.es6 +++ /dev/null @@ -1,40 +0,0 @@ -import isElementInViewport from "discourse/lib/is-element-in-viewport"; -import ScrollTop from 'discourse/mixins/scroll-top'; -import { on } from 'ember-addons/ember-computed-decorators'; - -export default Ember.View.extend(ScrollTop, { - - @on('didInsertElement') - _addBodyClass() { - const path = this.get('controller.model.path'); - $('body').addClass(`static-${path}`); - }, - - @on('willDestroyElement') - _removeBodyClass() { - const path = this.get('controller.model.path'); - $('body').removeClass(`static-${path}`); - }, - - @on('didInsertElement') - _checkRead() { - const currentUser = this.get('controller.currentUser'); - if (currentUser) { - const path = this.get('controller.model.path'); - if (path === "faq" || path === "guidelines") { - const controller = this.get('controller'); - $(window).on('load.faq resize.faq scroll.faq', function() { - const faqUnread = !currentUser.get('read_faq'); - if (faqUnread && isElementInViewport($(".contents p").last())) { - controller.send('markFaqRead'); - } - }); - } - } - }, - - @on('willDestroyElement') - _stopChecking() { - $(window).off('load.faq resize.faq scroll.faq'); - } -}); diff --git a/app/assets/javascripts/discourse/views/user.js.es6 b/app/assets/javascripts/discourse/views/user.js.es6 deleted file mode 100644 index 0b358f18ee..0000000000 --- a/app/assets/javascripts/discourse/views/user.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; - -export default Ember.View.extend(ScrollTop, { -}); diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js.es6 index e3ad8afa38..26bc4e594b 100644 --- a/test/javascripts/acceptance/static-test.js.es6 +++ b/test/javascripts/acceptance/static-test.js.es6 @@ -4,21 +4,25 @@ acceptance("Static"); test("Static Pages", () => { visit("/faq"); andThen(() => { + ok($('body.static-faq').length, "has the body class"); ok(exists(".body-page"), "The content is present"); }); visit("/guidelines"); andThen(() => { + ok($('body.static-guidelines').length, "has the body class"); ok(exists(".body-page"), "The content is present"); }); visit("/tos"); andThen(() => { + ok($('body.static-tos').length, "has the body class"); ok(exists(".body-page"), "The content is present"); }); visit("/privacy"); andThen(() => { + ok($('body.static-privacy').length, "has the body class"); ok(exists(".body-page"), "The content is present"); }); diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6 index 045750778e..36bc916295 100644 --- a/test/javascripts/acceptance/user-test.js.es6 +++ b/test/javascripts/acceptance/user-test.js.es6 @@ -28,5 +28,6 @@ test("Root URL - Viewing Self", () => { andThen(() => { ok($('body.user-summary-page').length, "has the body class"); equal(currentPath(), 'user.summary', "it defaults to summary"); + ok(exists('.container.viewing-self'), "has the viewing-self class"); }); }); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 54e33dcf43..a9a6d769e4 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -65,9 +65,7 @@ export default function() { this.get('/users/eviltrout.json', () => { const json = fixturesByUrl['/users/eviltrout.json']; - if (loggedIn()) { - json.user.can_edit = true; - } + json.user.can_edit = loggedIn(); return response(json); }); From d98aa48f0d14603203ee5b1cb385d59a336d3130 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Nov 2016 15:54:21 -0500 Subject: [PATCH 068/266] Remove some preferences views, add extra tests --- .../discourse/components/d-editor.js.es6 | 4 +++ .../controllers/preferences/username.js.es6 | 23 +++++++++-------- .../discourse/templates/preferences-about.hbs | 25 +++++++++++++++++++ .../username.hbs => preferences-username.hbs} | 8 +++--- .../discourse/templates/user/about.hbs | 24 ------------------ .../discourse/views/preferences-about.js.es6 | 11 -------- .../views/preferences-username.js.es6 | 21 ---------------- .../acceptance/preferences-test.js.es6 | 15 +++++++++++ 8 files changed, 61 insertions(+), 70 deletions(-) create mode 100644 app/assets/javascripts/discourse/templates/preferences-about.hbs rename app/assets/javascripts/discourse/templates/{user/username.hbs => preferences-username.hbs} (83%) delete mode 100644 app/assets/javascripts/discourse/templates/user/about.hbs delete mode 100644 app/assets/javascripts/discourse/views/preferences-about.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/preferences-username.js.es6 diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 11feda8e3f..6e43dfde81 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -205,6 +205,10 @@ export default Ember.Component.extend({ _readyNow() { this.set('ready', true); + + if (this.get('autofocus')) { + this.$('textarea').focus(); + } }, init() { diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 index c1976a91fb..a597df810a 100644 --- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 @@ -39,18 +39,19 @@ export default Ember.Controller.extend({ }.property('saving'), actions: { - changeUsername: function() { - var self = this; - return bootbox.confirm(I18n.t("user.change_username.confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) { + changeUsername() { + if (this.get('saveDisabled')) { return; } + + return bootbox.confirm(I18n.t("user.change_username.confirm"), + I18n.t("no_value"), + I18n.t("yes_value"), result => { if (result) { - self.set('saving', true); - self.get('content').changeUsername(self.get('newUsername')).then(function() { - DiscourseURL.redirectTo("/users/" + self.get('newUsername').toLowerCase() + "/preferences"); - }, function() { - // error - self.set('error', true); - self.set('saving', false); - }); + this.set('saving', true); + this.get('content').changeUsername(this.get('newUsername')).then(() => { + DiscourseURL.redirectTo("/users/" + this.get('newUsername').toLowerCase() + "/preferences"); + }) + .catch(() => this.set('error', true)) + .finally(() => this.set('saving', false)); } }); } diff --git a/app/assets/javascripts/discourse/templates/preferences-about.hbs b/app/assets/javascripts/discourse/templates/preferences-about.hbs new file mode 100644 index 0000000000..6613c07732 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/preferences-about.hbs @@ -0,0 +1,25 @@ +
    +
    + +
    +
    +

    {{i18n 'user.change_about.title'}}

    +
    +
    + +
    + +
    + {{d-editor value=model.bio_raw class="raw-bio" autofocus="autofocus"}} +
    +
    + +
    +
    + {{#d-button action="changeAbout" class="btn btn-primary"}} + {{saveButtonText}} + {{/d-button}} +
    +
    +
    +
    diff --git a/app/assets/javascripts/discourse/templates/user/username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs similarity index 83% rename from app/assets/javascripts/discourse/templates/user/username.hbs rename to app/assets/javascripts/discourse/templates/preferences-username.hbs index afe6623292..ae27149d9d 100644 --- a/app/assets/javascripts/discourse/templates/user/username.hbs +++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs @@ -18,13 +18,15 @@
    - {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength}} + {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength autofocus="autofocus" insert-newline="changeUsername"}}
    -
    +
    +

    {{#if taken}} {{i18n 'user.change_username.taken'}} {{/if}} - {{ errorMessage }} + {{errorMessage}} +

    diff --git a/app/assets/javascripts/discourse/templates/user/about.hbs b/app/assets/javascripts/discourse/templates/user/about.hbs deleted file mode 100644 index 2d1e162db1..0000000000 --- a/app/assets/javascripts/discourse/templates/user/about.hbs +++ /dev/null @@ -1,24 +0,0 @@ -
    - -
    -
    -

    {{i18n 'user.change_about.title'}}

    -
    -
    - -
    - -
    - {{d-editor value=model.bio_raw}} -
    -
    - -
    -
    - {{#d-button action="changeAbout" class="btn btn-primary"}} - {{saveButtonText}} - {{/d-button}} -
    -
    - -
    diff --git a/app/assets/javascripts/discourse/views/preferences-about.js.es6 b/app/assets/javascripts/discourse/views/preferences-about.js.es6 deleted file mode 100644 index 63d6600ebf..0000000000 --- a/app/assets/javascripts/discourse/views/preferences-about.js.es6 +++ /dev/null @@ -1,11 +0,0 @@ -export default Ember.View.extend({ - templateName: 'user/about', - classNames: ['user-preferences'], - - _focusAbout: function() { - var self = this; - Ember.run.schedule('afterRender', function() { - self.$('textarea').focus(); - }); - }.on('didInsertElement') -}); diff --git a/app/assets/javascripts/discourse/views/preferences-username.js.es6 b/app/assets/javascripts/discourse/views/preferences-username.js.es6 deleted file mode 100644 index 14a36a5e9b..0000000000 --- a/app/assets/javascripts/discourse/views/preferences-username.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -export default Ember.View.extend({ - templateName: 'user/username', - classNames: ['user-preferences'], - - _focusUsername: function() { - Em.run.schedule('afterRender', function() { - $('#change_username').focus(); - }); - }.on('didInsertElement'), - - keyDown: function(e) { - if (e.keyCode === 13) { - if (!this.get('controller').get('saveDisabled')) { - return this.get('controller').send('changeUsername'); - } else { - e.preventDefault(); - return false; - } - } - } -}); diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6 index 49ac494713..feb6944334 100644 --- a/test/javascripts/acceptance/preferences-test.js.es6 +++ b/test/javascripts/acceptance/preferences-test.js.es6 @@ -18,3 +18,18 @@ test("update some fields", () => { ok(exists('.saved-user'), 'it displays the saved message'); }); }); + +test("about me", () => { + visit("/users/eviltrout/preferences/username"); + andThen(() => { + ok(exists("#change_username"), "it has the input element for the bio"); + }); +}); + +test("username", () => { + visit("/users/eviltrout/preferences/about-me"); + andThen(() => { + ok(exists(".raw-bio"), "it has the input element for the bio"); + }); +}); + From 01a8ef590ab6e4847ef1c42972bbfa8dfbab0ec4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Nov 2016 16:20:31 -0500 Subject: [PATCH 069/266] Remove more view classes --- .../templates/navigation/categories.hbs | 18 ++++++++------- .../{user/email.hbs => preferences-email.hbs} | 4 ++-- .../discourse/templates/topic/unsubscribe.hbs | 16 +++++++------ .../javascripts/discourse/views/button.js.es6 | 23 ------------------- .../views/navigation-categories.js.es6 | 15 ------------ .../discourse/views/preferences-email.js.es6 | 9 -------- .../views/topic-footer-main-buttons.js.es6 | 2 -- .../discourse/views/topic-unsubscribe.js.es6 | 3 --- app/assets/javascripts/main_include.js | 1 - .../acceptance/preferences-test.js.es6 | 14 +++++++---- .../acceptance/topic-discovery-test.js.es6 | 1 + 11 files changed, 32 insertions(+), 74 deletions(-) rename app/assets/javascripts/discourse/templates/{user/email.hbs => preferences-email.hbs} (93%) delete mode 100644 app/assets/javascripts/discourse/views/button.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/navigation-categories.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/preferences-email.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs index e6a650cfbe..a324ccebc7 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs @@ -1,10 +1,12 @@ -{{bread-crumbs categories=categories}} +{{#d-section bodyClass="navigation-categories"}} + {{bread-crumbs categories=categories}} -{{navigation-bar navItems=navItems filterMode=filterMode}} + {{navigation-bar navItems=navItems filterMode=filterMode}} -{{#if canCreateCategory}} - {{categories-admin-dropdown}} -{{/if}} -{{#if canCreateTopic}} - -{{/if}} + {{#if canCreateCategory}} + {{categories-admin-dropdown}} + {{/if}} + {{#if canCreateTopic}} + + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs similarity index 93% rename from app/assets/javascripts/discourse/templates/user/email.hbs rename to app/assets/javascripts/discourse/templates/preferences-email.hbs index b60f0c0496..0aecb67abd 100644 --- a/app/assets/javascripts/discourse/templates/user/email.hbs +++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs @@ -1,4 +1,4 @@ -
    +
    @@ -25,7 +25,7 @@
    - {{text-field value=newEmail id="change_email" classNames="input-xxlarge"}} + {{text-field value=newEmail id="change_email" classNames="input-xxlarge" autofocus="autofocus"}}
    {{#if taken}} diff --git a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs index d153867e87..f330d1046b 100644 --- a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs +++ b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs @@ -1,8 +1,10 @@ -
    -

    - {{{stopNotificiationsText}}} -

    -

    - {{i18n "topic.unsubscribe.change_notification_state"}} {{topic-notifications-button topic=model}} -

    +
    +
    +

    + {{{stopNotificiationsText}}} +

    +

    + {{i18n "topic.unsubscribe.change_notification_state"}} {{topic-notifications-button topic=model}} +

    +
    diff --git a/app/assets/javascripts/discourse/views/button.js.es6 b/app/assets/javascripts/discourse/views/button.js.es6 deleted file mode 100644 index a2a0dc0daf..0000000000 --- a/app/assets/javascripts/discourse/views/button.js.es6 +++ /dev/null @@ -1,23 +0,0 @@ -import { bufferedRender } from 'discourse-common/lib/buffered-render'; - -export default Ember.View.extend(bufferedRender({ - tagName: 'button', - classNameBindings: [':btn', ':standard', 'dropDownToggle'], - attributeBindings: ['title', 'data-toggle', 'data-share-url'], - - title: function() { - return I18n.t(this.get('helpKey') || this.get('textKey')); - }.property('helpKey', 'textKey'), - - text: function() { - if (Ember.isEmpty(this.get('textKey'))) { return ""; } - return I18n.t(this.get('textKey')); - }.property('textKey'), - - buildBuffer(buffer) { - if (this.renderIcon) { - this.renderIcon(buffer); - } - buffer.push(this.get('text')); - } -})); diff --git a/app/assets/javascripts/discourse/views/navigation-categories.js.es6 b/app/assets/javascripts/discourse/views/navigation-categories.js.es6 deleted file mode 100644 index dcd408de52..0000000000 --- a/app/assets/javascripts/discourse/views/navigation-categories.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -import { on } from 'ember-addons/ember-computed-decorators'; - -const CATEGORIES_BODY_CLASS = "navigation-categories"; - -export default Ember.View.extend({ - @on("didInsertElement") - addBodyClass() { - $('body').addClass(CATEGORIES_BODY_CLASS); - }, - - @on("willDestroyElement") - removeBodyClass() { - $('body').removeClass(CATEGORIES_BODY_CLASS); - }, -}); diff --git a/app/assets/javascripts/discourse/views/preferences-email.js.es6 b/app/assets/javascripts/discourse/views/preferences-email.js.es6 deleted file mode 100644 index 766a8c90ab..0000000000 --- a/app/assets/javascripts/discourse/views/preferences-email.js.es6 +++ /dev/null @@ -1,9 +0,0 @@ -export default Em.View.extend({ - templateName: 'user/email', - classNames: ['user-preferences'], - _focusField: function() { - Em.run.schedule('afterRender', function() { - $('#change_email').focus(); - }); - }.on('didInsertElement') -}); diff --git a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 deleted file mode 100644 index 4ece5f553f..0000000000 --- a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -// In case plugins are using the old `additionalButtons` API, don't break -export default Ember.View.extend(); diff --git a/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 b/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 deleted file mode 100644 index 46ac72e0f0..0000000000 --- a/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -export default Ember.View.extend({ - classNames: ["topic-unsubscribe"] -}); diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index c18248dffb..8993fff5a1 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -62,7 +62,6 @@ //= require ./discourse/views/modal-body //= require ./discourse/views/flag //= require ./discourse/components/edit-category-panel -//= require ./discourse/views/button //= require ./discourse/components/dropdown-button //= require ./discourse/components/notifications-button //= require ./discourse/lib/link-mentions diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6 index feb6944334..b6885400ea 100644 --- a/test/javascripts/acceptance/preferences-test.js.es6 +++ b/test/javascripts/acceptance/preferences-test.js.es6 @@ -19,17 +19,23 @@ test("update some fields", () => { }); }); -test("about me", () => { +test("username", () => { visit("/users/eviltrout/preferences/username"); andThen(() => { - ok(exists("#change_username"), "it has the input element for the bio"); + ok(exists("#change_username"), "it has the input element"); }); }); -test("username", () => { +test("about me", () => { visit("/users/eviltrout/preferences/about-me"); andThen(() => { - ok(exists(".raw-bio"), "it has the input element for the bio"); + ok(exists(".raw-bio"), "it has the input element"); }); }); +test("email", () => { + visit("/users/eviltrout/preferences/email"); + andThen(() => { + ok(exists("#change_email"), "it has the input element"); + }); +}); diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6 index 28749712f3..d6d1798d29 100644 --- a/test/javascripts/acceptance/topic-discovery-test.js.es6 +++ b/test/javascripts/acceptance/topic-discovery-test.js.es6 @@ -18,6 +18,7 @@ test("Visit Discovery Pages", () => { visit("/categories"); andThen(() => { + ok($('body.navigation-categories').length, "has the body class"); ok($('body.category-bug').length === 0, "removes the custom category class"); ok(exists('.category'), "has a list of categories"); ok($('body.categories-list').length, "has a custom class to indicate categories"); From 3d76ce14219a168bdf85769c5474420951c14253 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 11 Nov 2016 16:57:31 +1100 Subject: [PATCH 070/266] FEATURE: SSO support for adding and removing a user to groups Use: add_groups with a comma delimited list to ensure a user is in groups (using group names) Use: remove_groups with a comma delimited list to ensure a user is removed from groups (using group names) --- app/models/discourse_single_sign_on.rb | 27 +++++++++++++++ lib/single_sign_on.rb | 3 +- spec/models/discourse_single_sign_on_spec.rb | 35 ++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index 69bc0d1e83..a4c1fd151b 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -94,11 +94,38 @@ class DiscourseSingleSignOn < SingleSignOn sso_record.save! + if sso_record.user + apply_group_rules(sso_record.user) + end + sso_record && sso_record.user end private + def apply_group_rules(user) + if add_groups + split = add_groups.split(",") + if split.length > 0 + Group.where('name in (?) AND NOT automatic', split).pluck(:id).each do |id| + unless GroupUser.where(group_id: id, user_id: user.id).exists? + GroupUser.create(group_id: id, user_id: user.id) + end + end + end + end + + if remove_groups + split = remove_groups.split(",") + if split.length > 0 + GroupUser + .where(user_id: user.id) + .where('group_id IN (SELECT id FROM groups WHERE name in (?))',split) + .destroy_all + end + end + end + def match_email_or_create_user(ip_address) unless user = User.find_by_email(email) try_name = name.presence diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb index 64d4e909a6..bd0d408e1c 100644 --- a/lib/single_sign_on.rb +++ b/lib/single_sign_on.rb @@ -1,6 +1,7 @@ class SingleSignOn ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation, - :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message] + :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, + :add_groups, :remove_groups] FIXNUMS = [] BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message] NONCE_EXPIRY_TIME = 10.minutes diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb index 10a49a09d9..990884fe0a 100644 --- a/spec/models/discourse_single_sign_on_spec.rb +++ b/spec/models/discourse_single_sign_on_spec.rb @@ -113,6 +113,41 @@ describe DiscourseSingleSignOn do expect(admin_group.users.where('users.id = ?', user.id).exists?).to eq(true) end + it "can specify groups" do + + user = Fabricate(:user) + + add_group1 = Fabricate(:group, name: 'group1') + add_group2 = Fabricate(:group, name: 'group2') + existing_group = Fabricate(:group, name: 'group3') + + existing_group.add(user) + existing_group.save! + + add_group1.add(user) + existing_group.save! + + sso = DiscourseSingleSignOn.new + sso.username = "bobsky" + sso.name = "Bob" + sso.email = user.email + sso.external_id = "A" + + sso.add_groups = "#{add_group1.name},#{add_group2.name},badname" + sso.remove_groups = "#{existing_group.name},badname" + + sso.lookup_or_create_user(ip_address) + + existing_group.reload + expect(existing_group.usernames).to eq("") + + add_group1.reload + expect(add_group1.usernames).to eq(user.username) + + add_group2.reload + expect(add_group2.usernames).to eq(user.username) + end + it "can override name / email / username" do admin = Fabricate(:admin) From 2a25136ecf4ff180ca6568e86b79065b96e3bd41 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Nov 2016 13:01:53 -0500 Subject: [PATCH 071/266] FIX: Tags weren't showing up in Ember 2.4 --- .../javascripts/discourse/components/topic-category.js.es6 | 2 ++ app/assets/javascripts/discourse/templates/topic.hbs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/discourse/components/topic-category.js.es6 diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js.es6 new file mode 100644 index 0000000000..97fcde13cd --- /dev/null +++ b/app/assets/javascripts/discourse/components/topic-category.js.es6 @@ -0,0 +1,2 @@ +// Injections don't occur without a class +export default Ember.Component.extend(); diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 5c6689f0d6..d77551341a 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -53,7 +53,7 @@ {{#unless model.isPrivateMessage}} - {{topic-category topic=model}} + {{topic-category topic=model class="topic-category"}} {{/unless}} {{/if}}
    From 93403b0af63f8e04fd5f7c96419bb8b9f4e015c8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Nov 2016 14:13:19 -0500 Subject: [PATCH 072/266] Replace the share popup with a component --- .../discourse/components/share-popup.js.es6 | 157 ++++++++++++++++++ .../discourse/controllers/share.js.es6 | 56 ------- .../templates/components/share-popup.hbs | 24 +++ .../javascripts/discourse/templates/share.hbs | 26 --- .../javascripts/discourse/templates/topic.hbs | 2 +- .../javascripts/discourse/views/share.js.es6 | 116 ------------- test/javascripts/acceptance/topic-test.js.es6 | 18 ++ 7 files changed, 200 insertions(+), 199 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/share-popup.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/share.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/share-popup.hbs delete mode 100644 app/assets/javascripts/discourse/templates/share.hbs delete mode 100644 app/assets/javascripts/discourse/views/share.js.es6 diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6 new file mode 100644 index 0000000000..ffd52c91bd --- /dev/null +++ b/app/assets/javascripts/discourse/components/share-popup.js.es6 @@ -0,0 +1,157 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; +import { longDateNoYear } from 'discourse/lib/formatter'; +import computed from 'ember-addons/ember-computed-decorators'; +import Sharing from 'discourse/lib/sharing'; + +export default Ember.Component.extend({ + elementId: 'share-link', + classNameBindings: ['visible'], + link: null, + visible: null, + + @computed + sources() { + return Sharing.activeSources(this.siteSettings.share_links); + }, + + @computed('type', 'postNumber') + shareTitle(type, postNumber) { + if (type === 'topic') { return I18n.t('share.topic'); } + if (postNumber) { + return I18n.t('share.post', { postNumber }); + } + return I18n.t('share.topic'); + }, + + @computed('date') + displayDate(date) { + return longDateNoYear(new Date(date)); + }, + + _focusUrl() { + const link = this.get('link'); + if (!this.capabilities.touch) { + const $linkInput = $('#share-link input'); + $linkInput.val(link); + + // Wait for the fade-in transition to finish before selecting the link: + window.setTimeout(() => $linkInput.select().focus(), 160); + } else { + const $linkForTouch = $('#share-link .share-for-touch a'); + $linkForTouch.attr('href', link); + $linkForTouch.html(link); + const range = window.document.createRange(); + range.selectNode($linkForTouch[0]); + window.getSelection().addRange(range); + } + }, + + _showUrl($target, url) { + const $currentTargetOffset = $target.offset(); + const $this = this.$(); + + if (Ember.isEmpty(url)) { return; } + + // Relative urls + if (url.indexOf("/") === 0) { + url = window.location.protocol + "//" + window.location.host + url; + } + + const shareLinkWidth = $this.width(); + let x = $currentTargetOffset.left - (shareLinkWidth / 2); + if (x < 25) { x = 25; } + if (x + shareLinkWidth > $(window).width()) { + x -= shareLinkWidth / 2; + } + + const header = $('.d-header'); + let y = $currentTargetOffset.top - ($this.height() + 20); + if (y < header.offset().top + header.height()) { + y = $currentTargetOffset.top + 10; + } + + $this.css({top: "" + y + "px"}); + + if (!this.site.mobileView) { + $this.css({left: "" + x + "px"}); + } + this.set('link', url); + this.set('visible', true); + + Ember.run.scheduleOnce('afterRender', this, this._focusUrl); + }, + + didInsertElement() { + this._super(); + + const $html = $('html'); + $html.on('mousedown.outside-share-link', e => { + // Use mousedown instead of click so this event is handled before routing occurs when a + // link is clicked (which is a click event) while the share dialog is showing. + if (this.$().has(e.target).length !== 0) { return; } + this.send('close'); + return true; + }); + + $html.on('click.discoure-share-link', '[data-share-url]', e => { + // if they want to open in a new tab, let it so + if (wantsNewWindow(e)) { return true; } + + e.preventDefault(); + + const $currentTarget = $(e.currentTarget); + const url = $currentTarget.data('share-url'); + const postNumber = $currentTarget.data('post-number'); + const postId = $currentTarget.closest('article').data('post-id'); + const date = $currentTarget.children().data('time'); + + this.setProperties({ postNumber, date, postId }); + this._showUrl($currentTarget, url); + return false; + }); + + $html.on('keydown.share-view', e => { + if (e.keyCode === 27) { + this.send('close'); + } + }); + + this.appEvents.on('share:url', (url, $target) => this._showUrl($target, url)); + }, + + willDestroyElement() { + this._super(); + $('html').off('click.discoure-share-link') + .off('mousedown.outside-share-link') + .off('keydown.share-view'); + }, + + actions: { + replyAsNewTopic() { + const postStream = this.get("topic.postStream"); + const postId = this.get("postId") || postStream.findPostIdForPostNumber(1); + const post = postStream.findLoadedPost(postId); + this.sendAction('replyAsNewTopic', post); + this.send("close"); + }, + + close() { + this.setProperties({ + link: null, + postNumber: null, + postId: null, + visible: false + }); + }, + + share(source) { + var url = source.generateUrl(this.get('link'), this.get('title')); + if (source.shouldOpenInPopup) { + window.open(url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=' + (source.popupHeight || 315)); + } else { + window.open(url, '_blank'); + } + } + } + +}); diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6 deleted file mode 100644 index 00dc536364..0000000000 --- a/app/assets/javascripts/discourse/controllers/share.js.es6 +++ /dev/null @@ -1,56 +0,0 @@ -import Sharing from 'discourse/lib/sharing'; -import { longDateNoYear } from 'discourse/lib/formatter'; -import computed from 'ember-addons/ember-computed-decorators'; - -export default Ember.Controller.extend({ - topic: Ember.inject.controller(), - - title: Ember.computed.alias('topic.model.title'), - canReplyAsNewTopic: Ember.computed.alias('topic.model.details.can_reply_as_new_topic'), - - @computed('type', 'postNumber') - shareTitle(type, postNumber) { - if (type === 'topic') { return I18n.t('share.topic'); } - if (postNumber) { - return I18n.t('share.post', { postNumber }); - } else { - return I18n.t('share.topic'); - } - }, - - @computed('date') - displayDate(date) { - return longDateNoYear(new Date(date)); - }, - - // Close the share controller - actions: { - close() { - this.setProperties({ link: null, postNumber: null, postId: null }); - return false; - }, - - replyAsNewTopic() { - const topicController = this.get("topic"); - const postStream = topicController.get("model.postStream"); - const postId = this.get("postId") || postStream.findPostIdForPostNumber(1); - const post = postStream.findLoadedPost(postId); - topicController.send("replyAsNewTopic", post); - this.send("close"); - }, - - share(source) { - var url = source.generateUrl(this.get('link'), this.get('title')); - if (source.shouldOpenInPopup) { - window.open(url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=' + (source.popupHeight || 315)); - } else { - window.open(url, '_blank'); - } - } - }, - - @computed - sources() { - return Sharing.activeSources(this.siteSettings.share_links); - } -}); diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs new file mode 100644 index 0000000000..65e1c5d3c6 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs @@ -0,0 +1,24 @@ +

    {{shareTitle}}

    + +{{#if date}} + {{displayDate}} +{{/if}} + +
    + + +
    + +{{#each sources as |s|}} + {{share-source source=s title=model.title action="share"}} +{{/each}} + +{{#if topic.details.can_reply_as_new_topic}} +
    + {{fa-icon "plus"}}{{i18n 'topic.create'}} +
    +{{/if}} + +
    + {{fa-icon "close"}} +
    diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs deleted file mode 100644 index 65b3321884..0000000000 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ /dev/null @@ -1,26 +0,0 @@ -{{#if link}} -

    {{shareTitle}}

    - - {{#if date}} - {{displayDate}} - {{/if}} - -
    - - -
    - - {{#each sources as |s|}} - {{share-source source=s title=title action="share"}} - {{/each}} - - {{#if canReplyAsNewTopic}} -
    - {{fa-icon "plus"}}{{i18n 'topic.create'}} -
    - {{/if}} - -
    - {{fa-icon "close"}} -
    -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index d77551341a..68fd6469bc 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -221,7 +221,7 @@
    {{/if}} -{{render "share"}} +{{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}} {{#if currentUser.enable_quoting}} {{render "quote-button"}} diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 deleted file mode 100644 index 39d743cbbc..0000000000 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ /dev/null @@ -1,116 +0,0 @@ -import computed from 'ember-addons/ember-computed-decorators'; -import { observes } from 'ember-addons/ember-computed-decorators'; -import { wantsNewWindow } from 'discourse/lib/intercept-click'; - -export default Ember.View.extend({ - templateName: 'share', - elementId: 'share-link', - classNameBindings: ['hasLink'], - - @computed('controller.link') - hasLink(link) { - return !Ember.isEmpty(link) ? 'visible' : null; - }, - - @observes('controller.link') - linkChanged() { - const link = this.get('controller.link'); - if (!Ember.isEmpty(link)) { - Ember.run.next(() => { - if (!this.capabilities.touch) { - const $linkInput = $('#share-link input'); - $linkInput.val(link); - - // Wait for the fade-in transition to finish before selecting the link: - window.setTimeout(() => $linkInput.select().focus(), 160); - } else { - const $linkForTouch = $('#share-link .share-for-touch a'); - $linkForTouch.attr('href', link); - $linkForTouch.html(link); - const range = window.document.createRange(); - range.selectNode($linkForTouch[0]); - window.getSelection().addRange(range); - } - }); - } - }, - - didInsertElement() { - const self = this; - const $html = $('html'); - - $html.on('mousedown.outside-share-link', e => { - // Use mousedown instead of click so this event is handled before routing occurs when a - // link is clicked (which is a click event) while the share dialog is showing. - if (this.$().has(e.target).length !== 0) { return; } - this.get('controller').send('close'); - return true; - }); - - function showPanel($target, url, postNumber, date, postId) { - const $currentTargetOffset = $target.offset(); - const $shareLink = $('#share-link'); - - // Relative urls - if (url.indexOf("/") === 0) { - url = window.location.protocol + "//" + window.location.host + url; - } - - const shareLinkWidth = $shareLink.width(); - let x = $currentTargetOffset.left - (shareLinkWidth / 2); - if (x < 25) { x = 25; } - if (x + shareLinkWidth > $(window).width()) { - x -= shareLinkWidth / 2; - } - - const header = $('.d-header'); - let y = $currentTargetOffset.top - ($shareLink.height() + 20); - if (y < header.offset().top + header.height()) { - y = $currentTargetOffset.top + 10; - } - - $shareLink.css({top: "" + y + "px"}); - - if (!self.site.mobileView) { - $shareLink.css({left: "" + x + "px"}); - } - - self.set('controller.link', url); - self.set('controller.postNumber', postNumber); - self.set('controller.postId', postId); - self.set('controller.date', date); - } - - this.appEvents.on('share:url', (url, $target) => showPanel($target, url)); - - $html.on('click.discoure-share-link', '[data-share-url]', e => { - // if they want to open in a new tab, let it so - if (wantsNewWindow(e)) { return true; } - - e.preventDefault(); - - const $currentTarget = $(e.currentTarget), - url = $currentTarget.data('share-url'), - postNumber = $currentTarget.data('post-number'), - postId = $currentTarget.closest('article').data('post-id'), - date = $currentTarget.children().data('time'); - showPanel($currentTarget, url, postNumber, date, postId); - return false; - }); - - $html.on('keydown.share-view', e => { - if (e.keyCode === 27) { - this.get('controller').send('close'); - } - }); - }, - - willDestroyElement() { - this.get('controller').send('close'); - - $('html').off('click.discoure-share-link') - .off('mousedown.outside-share-link') - .off('keydown.share-view'); - } - -}); diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index 56fcc173f4..b3141c129a 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -1,6 +1,24 @@ import { acceptance } from "helpers/qunit-helpers"; acceptance("Topic", { loggedIn: true }); +test("Share Popup", () => { + visit("/t/internationalization-localization/280"); + andThen(() => { + ok(!exists('#share-link.visible'), 'it is not visible'); + }); + + click("[data-share-url]:eq(0)"); + andThen(() => { + ok(exists('#share-link.visible'), 'it shows the popup'); + ok(find('input[type=text]').val().length, 'it has the URL in the input box'); + }); + + click('#share-link .close-share'); + andThen(() => { + ok(!exists('#share-link.visible'), 'it closes the popup'); + }); +}); + test("Showing and hiding the edit controls", () => { visit("/t/internationalization-localization/280"); From 43fd3ebd4ace0fc119ce0637812e4385a8349fa7 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 11 Nov 2016 21:59:15 +0100 Subject: [PATCH 073/266] =?UTF-8?q?Add=20=E2=80=9Cpop3=5Fpolling=5Fopenssl?= =?UTF-8?q?=5Fverify=E2=80=9D=20setting=20to=20turn=20off=20TLS=20server?= =?UTF-8?q?=20certificate=20verification=20like=20=E2=80=9Csmtp=5Fopenssl?= =?UTF-8?q?=5Fverify=5Fmode=E2=80=9D.=20Defaults=20to=20=E2=80=9Ctrue?= =?UTF-8?q?=E2=80=9D,=20so=20it=20does=20not=20change=20current=20behavior?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/scheduled/poll_mailbox.rb | 9 ++++++++- config/locales/server.en.yml | 1 + config/site_settings.yml | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 837bef8505..273667cac1 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -29,7 +29,14 @@ module Jobs def poll_pop3 pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port) - pop3.enable_ssl if SiteSetting.pop3_polling_ssl + + if SiteSetting.pop3_polling_ssl + if SiteSetting.pop3_polling_openssl_verify + pop3.enable_ssl + else + pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) + end + end pop3.start(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password) do |pop| pop.delete_all do |p| diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c726595eb3..2df068ddee 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1248,6 +1248,7 @@ en: manual_polling_enabled: "Push emails using the API for email replies." pop3_polling_enabled: "Poll via POP3 for email replies." pop3_polling_ssl: "Use SSL while connecting to the POP3 server. (Recommended)" + pop3_polling_openssl_verify: "Verify TLS server certificate (Default: enabled)" pop3_polling_period_mins: "The period in minutes between checking the POP3 account for email. NOTE: requires restart." pop3_polling_port: "The port to poll a POP3 account on." pop3_polling_host: "The host to poll for email via POP3." diff --git a/config/site_settings.yml b/config/site_settings.yml index f93bc56709..2b12761ebb 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -603,6 +603,7 @@ email: default: false validator: "POP3PollingEnabledSettingValidator" pop3_polling_ssl: true + pop3_polling_openssl_verify: true pop3_polling_period_mins: 5 pop3_polling_host: '' pop3_polling_port: 995 From cc93cd76efd31eeb129d755f1ad5b8e5073d6ea1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Nov 2016 16:00:28 -0500 Subject: [PATCH 074/266] Replace quote button with a component --- .../discourse/components/quote-button.js.es6 | 173 ++++++++++++++++++ .../discourse/controllers/quote-button.js.es6 | 160 ---------------- .../discourse/controllers/topic.js.es6 | 78 ++++++-- .../javascripts/discourse/routes/topic.js.es6 | 2 +- .../{ => components}/quote-button.hbs | 0 .../javascripts/discourse/templates/topic.hbs | 5 +- .../discourse/views/quote-button.js.es6 | 106 ----------- .../javascripts/controllers/topic-test.js.es6 | 3 +- 8 files changed, 241 insertions(+), 286 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/quote-button.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/quote-button.js.es6 rename app/assets/javascripts/discourse/templates/{ => components}/quote-button.hbs (100%) delete mode 100644 app/assets/javascripts/discourse/views/quote-button.js.es6 diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6 new file mode 100644 index 0000000000..82db141444 --- /dev/null +++ b/app/assets/javascripts/discourse/components/quote-button.js.es6 @@ -0,0 +1,173 @@ +import computed from 'ember-addons/ember-computed-decorators'; +import { selectedText } from 'discourse/lib/utilities'; + +// we don't want to deselect when we click on buttons that use it +function ignoreElements(e) { + const $target = $(e.target); + return $target.hasClass('quote-button') || + $target.closest('.create').length || + $target.closest('.reply-new').length || + $target.closest('.share').length; +} + +export default Ember.Component.extend({ + classNames: ['quote-button'], + classNameBindings: ['visible'], + isMouseDown: false, + _isTouchInProgress: false, + + @computed('quoteState.buffer') + visible: buffer => buffer && buffer.length > 0, + + /** + Binds to the following global events: + - `mousedown` to clear the quote button if they click elsewhere. + - `mouseup` to trigger the display of the quote button. + - `selectionchange` to make the selection work under iOS + + @method didInsertElement + **/ + didInsertElement() { + let onSelectionChanged = () => this._selectText(window.getSelection().anchorNode); + + // Windows Phone hack, it is not firing the touch events + // best we can do is debounce this so we dont keep locking up + // the selection when we add the caret to measure where we place + // the quote reply widget + // + // Same hack applied to Android cause it has unreliable touchend + const isAndroid = this.capabilities.isAndroid; + if (this.capabilities.isWinphone || isAndroid) { + onSelectionChanged = _.debounce(onSelectionChanged, 500); + } + + $(document).on("mousedown.quote-button", e => { + this.set('isMouseDown', true); + + if (ignoreElements(e)) { return; } + + // deselects only when the user left click + // (allows anyone to `extend` their selection using shift+click) + if (!window.getSelection().isCollapsed && + e.which === 1 && + !e.shiftKey) { + this.sendAction('deselectText'); + } + }).on('mouseup.quote-button', e => { + if (ignoreElements(e)) { return; } + + this._selectText(e.target); + this.set('isMouseDown', false); + }).on('selectionchange', () => { + // there is no need to handle this event when the mouse is down + // or if there a touch in progress + if (this.get('isMouseDown') || this._isTouchInProgress) { return; } + // `selection.anchorNode` is used as a target + onSelectionChanged(); + }); + + // Android is dodgy, touchend often will not fire + // https://code.google.com/p/android/issues/detail?id=19827 + if (!this.isAndroid) { + $(document).on('touchstart.quote-button', () => { + this._isTouchInProgress = true; + return true; + }); + + $(document).on('touchend.quote-button', () => { + this._isTouchInProgress = false; + return true; + }); + } + }, + + _selectText(target) { + // anonymous users cannot "quote-reply" + if (!this.currentUser) return; + + const quoteState = this.get('quoteState'); + + const $target = $(target); + const postId = $target.closest('.boxed, .reply').data('post-id'); + + const details = this.get('topic.details'); + if (!(details.get('can_reply_as_new_topic') || details.get('can_create_post'))) { + return; + } + + const selection = window.getSelection(); + if (selection.isCollapsed) { + return; + } + + const range = selection.getRangeAt(0), + cloned = range.cloneRange(), + $ancestor = $(range.commonAncestorContainer); + + if ($ancestor.closest('.cooked').length === 0) { + return this.sendAction('deselectText'); + } + + const selVal = selectedText(); + if (quoteState.get('buffer') === selVal) { return; } + quoteState.setProperties({ postId, buffer: selVal }); + + // create a marker element containing a single invisible character + const markerElement = document.createElement("span"); + markerElement.appendChild(document.createTextNode("\ufeff")); + + const isMobileDevice = this.site.isMobileDevice; + const capabilities = this.capabilities; + const isIOS = capabilities.isIOS; + const isAndroid = capabilities.isAndroid; + + // collapse the range at the beginning/end of the selection + // and insert it at the start of our selection range + range.collapse(!isMobileDevice); + range.insertNode(markerElement); + + // retrieve the position of the marker + const $markerElement = $(markerElement); + const markerOffset = $markerElement.offset(); + const parentScrollLeft = $markerElement.parent().scrollLeft(); + const $quoteButton = this.$(); + + // remove the marker + markerElement.parentNode.removeChild(markerElement); + + // work around Chrome that would sometimes lose the selection + const sel = window.getSelection(); + sel.removeAllRanges(); + sel.addRange(cloned); + + Ember.run.scheduleOnce('afterRender', function() { + let topOff = markerOffset.top; + let leftOff = markerOffset.left; + + if (parentScrollLeft > 0) leftOff += parentScrollLeft; + + if (isMobileDevice || isIOS || isAndroid) { + topOff = topOff + 20; + leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth()); + } else { + topOff = topOff - $quoteButton.outerHeight() - 5; + } + + $quoteButton.offset({ top: topOff, left: leftOff }); + }); + }, + + willDestroyElement() { + $(document) + .off("mousedown.quote-button") + .off("mouseup.quote-button") + .off("touchstart.quote-button") + .off("touchend.quote-button") + .off("selectionchange"); + }, + + click(e) { + e.stopPropagation(); + this.sendAction('selectText'); + } +}); diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6 deleted file mode 100644 index d91712542e..0000000000 --- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 +++ /dev/null @@ -1,160 +0,0 @@ -import Quote from 'discourse/lib/quote'; -import computed from 'ember-addons/ember-computed-decorators'; -import { selectedText } from 'discourse/lib/utilities'; - -export default Ember.Controller.extend({ - topic: Ember.inject.controller(), - composer: Ember.inject.controller(), - - @computed('buffer', 'postId') - post(buffer, postId) { - if (!postId || Ember.isEmpty(buffer)) { return null; } - - const postStream = this.get('topic.model.postStream'); - const post = postStream.findLoadedPost(postId); - - return post; - }, - - // Save the currently selected text and displays the - // "quote reply" button - selectText(postId) { - // anonymous users cannot "quote-reply" - if (!this.currentUser) return; - - // don't display the "quote-reply" button if we can't reply - const topicDetails = this.get('topic.model.details'); - if (!(topicDetails.get('can_reply_as_new_topic') || topicDetails.get('can_create_post'))) { - return; - } - - const selection = window.getSelection(); - - // no selections - if (selection.isCollapsed) { - this.set('buffer', ''); - return; - } - - // retrieve the selected range - const range = selection.getRangeAt(0), - cloned = range.cloneRange(), - $ancestor = $(range.commonAncestorContainer); - - if ($ancestor.closest('.cooked').length === 0) { - this.set('buffer', ''); - return; - } - - const selVal = selectedText(); - if (this.get('buffer') === selVal) return; - - // we need to retrieve the post data from the posts collection in the topic controller - this.set('postId', postId); - this.set('buffer', selVal); - - // create a marker element - const markerElement = document.createElement("span"); - // containing a single invisible character - markerElement.appendChild(document.createTextNode("\ufeff")); - - const isMobileDevice = this.site.isMobileDevice; - const capabilities = this.capabilities, - isIOS = capabilities.isIOS, - isAndroid = capabilities.isAndroid; - - // collapse the range at the beginning/end of the selection - range.collapse(!isMobileDevice); - // and insert it at the start of our selection range - range.insertNode(markerElement); - - // retrieve the position of the marker - const $markerElement = $(markerElement), - markerOffset = $markerElement.offset(), - parentScrollLeft = $markerElement.parent().scrollLeft(), - $quoteButton = $('.quote-button'); - - // remove the marker - markerElement.parentNode.removeChild(markerElement); - - // work around Chrome that would sometimes lose the selection - const sel = window.getSelection(); - sel.removeAllRanges(); - sel.addRange(cloned); - - // move the quote button above the marker - Em.run.schedule('afterRender', function() { - let topOff = markerOffset.top; - let leftOff = markerOffset.left; - - if (parentScrollLeft > 0) leftOff += parentScrollLeft; - - if (isMobileDevice || isIOS || isAndroid) { - topOff = topOff + 20; - leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth()); - } else { - topOff = topOff - $quoteButton.outerHeight() - 5; - } - - $quoteButton.offset({ top: topOff, left: leftOff }); - }); - }, - - quoteText() { - const Composer = require('discourse/models/composer').default; - const postId = this.get('postId'); - const post = this.get('post'); - - // defer load if needed, if in an expanded replies section - if (!post) { - const postStream = this.get('topic.model.postStream'); - return postStream.loadPost(postId).then(p => { - this.set('post', p); - return this.quoteText(); - }); - } - - // If we can't create a post, delegate to reply as new topic - if (!this.get('topic.model.details.can_create_post')) { - this.get('topic').send('replyAsNewTopic', post); - return; - } - - const composerController = this.get('composer'); - const composerOpts = { - action: Composer.REPLY, - draftKey: post.get('topic.draft_key') - }; - - if (post.get('post_number') === 1) { - composerOpts.topic = post.get("topic"); - } else { - composerOpts.post = post; - } - - // If the composer is associated with a different post, we don't change it. - const composerPost = composerController.get('content.post'); - if (composerPost && (composerPost.get('id') !== this.get('post.id'))) { - composerOpts.post = composerPost; - } - - const buffer = this.get('buffer'); - const quotedText = Quote.build(post, buffer); - composerOpts.quote = quotedText; - if (composerController.get('content.viewOpen') || composerController.get('content.viewDraft')) { - this.appEvents.trigger('composer:insert-text', quotedText); - } else { - composerController.open(composerOpts); - } - this.set('buffer', ''); - return false; - }, - - deselectText() { - // clear selected text - window.getSelection().removeAllRanges(); - // clean up the buffer - this.set('buffer', ''); - } - -}); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 247d1a6755..40dcacd855 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -14,9 +14,7 @@ import isElementInViewport from "discourse/lib/is-element-in-viewport"; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { composer: Ember.inject.controller(), - quoteButton: Ember.inject.controller('quote-button'), application: Ember.inject.controller(), - multiSelect: false, allPostsSelected: false, editingTopic: false, @@ -30,9 +28,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { userTriggeredProgress: null, _progressIndex: null, hasScrolled: null, - username_filters: null, filter: null, + quoteState: null, topicDelegated: [ 'toggleMultiSelect', @@ -141,10 +139,12 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { I18n.t("suggested_topics.title"); }, - _clearSelected: function() { + init() { + this._super(); this.set('selectedPosts', []); this.set('selectedReplies', []); - }.on('init'), + this.set('quoteState', Ember.Object.create({ buffer: null, postId: null })); + }, showCategoryChooser: Ember.computed.not("model.isPrivateMessage"), @@ -167,6 +167,52 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { actions: { + deselectText() { + const quoteState = this.get('quoteState'); + quoteState.setProperties({ buffer: null, postId: null }); + }, + + selectText() { + const quoteState = this.get('quoteState'); + const postStream = this.get('model.postStream'); + + const postId = quoteState.get('postId'); + postStream.loadPost(postId).then(post => { + // If we can't create a post, delegate to reply as new topic + if (!this.get('model.details.can_create_post')) { + this.send('replyAsNewTopic', post); + return; + } + + const composer = this.get('composer'); + const composerOpts = { + action: Composer.REPLY, + draftKey: post.get('topic.draft_key') + }; + + if (post.get('post_number') === 1) { + composerOpts.topic = post.get("topic"); + } else { + composerOpts.post = post; + } + + // If the composer is associated with a different post, we don't change it. + const composerPost = composer.get('content.post'); + if (composerPost && (composerPost.get('id') !== this.get('post.id'))) { + composerOpts.post = composerPost; + } + + const quotedText = Quote.build(post, quoteState.get('buffer')); + composerOpts.quote = quotedText; + if (composer.get('content.viewOpen') || composer.get('content.viewDraft')) { + this.appEvents.trigger('composer:insert-text', quotedText); + } else { + composer.open(composerOpts); + } + this.send('deselectText'); + }); + }, + fillGapBefore(args) { return this.get('model.postStream').fillGapBefore(args.post, args.gap); }, @@ -265,12 +311,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { // Post related methods replyToPost(post) { - const composerController = this.get('composer'), - quoteController = this.get('quoteButton'), - quotedText = Quote.build(quoteController.get('post'), quoteController.get('buffer')), - topic = post ? post.get('topic') : this.get('model'); + const composerController = this.get('composer'); + const topic = post ? post.get('topic') : this.get('model'); - quoteController.set('buffer', ''); + const quoteState = this.get('quoteState'); + const postStream = this.get('model.postStream'); + const quotedPost = postStream.findLoadedPost(quoteState.get('postId')); + const quotedText = Quote.build(quotedPost, quoteState.get('buffer')); + this.send('deselectText'); if (composerController.get('content.topic.id') === topic.get('id') && composerController.get('content.action') === Composer.REPLY) { @@ -597,11 +645,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { replyAsNewTopic(post) { const composerController = this.get('composer'); - const quoteController = this.get('quoteButton'); - post = post || quoteController.get('post'); - const quotedText = Quote.build(post, quoteController.get('buffer')); - quoteController.deselectText(); + const quoteState = this.get('quoteState'); + post = post || quoteState.get('post'); + const quotedText = Quote.build(post, quoteState.get('buffer')); + this.send('deselectText'); composerController.open({ action: Composer.CREATE_TOPIC, @@ -633,7 +681,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { togglePostType(post) { const regular = this.site.get('post_types.regular'); const moderator = this.site.get('post_types.moderator_action'); - return post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator); }, @@ -922,7 +969,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } }, - _showFooter: function() { const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts"); this.set("application.showFooter", showFooter); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 989d100432..794c432a7b 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -117,7 +117,7 @@ const TopicRoute = Discourse.Route.extend({ willTransition() { this._super(); - this.controllerFor("quote-button").deselectText(); + this.controllerFor("topic").send('deselectText'); Em.run.cancel(scheduledReplace); isTransitioning = true; return true; diff --git a/app/assets/javascripts/discourse/templates/quote-button.hbs b/app/assets/javascripts/discourse/templates/components/quote-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/quote-button.hbs rename to app/assets/javascripts/discourse/templates/components/quote-button.hbs diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 68fd6469bc..625155eae7 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -224,6 +224,9 @@ {{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}} {{#if currentUser.enable_quoting}} - {{render "quote-button"}} + {{quote-button topic=model + quoteState=quoteState + selectText="selectText" + deselectText="deselectText"}} {{/if}} diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6 deleted file mode 100644 index 9e86495e15..0000000000 --- a/app/assets/javascripts/discourse/views/quote-button.js.es6 +++ /dev/null @@ -1,106 +0,0 @@ -// we don't want to deselect when we click on buttons that use it -function ignoreElements(e) { - const $target = $(e.target); - return $target.hasClass('quote-button') || - $target.closest('.create').length || - $target.closest('.reply-new').length || - $target.closest('.share').length; -} - -export default Ember.View.extend({ - classNames: ['quote-button'], - classNameBindings: ['visible'], - isMouseDown: false, - _isTouchInProgress: false, - - // The button is visible whenever there is something in the buffer - // (ie. something has been selected) - visible: Em.computed.notEmpty('controller.buffer'), - - /** - Binds to the following global events: - - `mousedown` to clear the quote button if they click elsewhere. - - `mouseup` to trigger the display of the quote button. - - `selectionchange` to make the selection work under iOS - - @method didInsertElement - **/ - didInsertElement() { - const controller = this.get('controller'); - - let onSelectionChanged = () => this.selectText(window.getSelection().anchorNode, controller); - - // Windows Phone hack, it is not firing the touch events - // best we can do is debounce this so we dont keep locking up - // the selection when we add the caret to measure where we place - // the quote reply widget - // - // Same hack applied to Android cause it has unreliable touchend - const isAndroid = this.capabilities.isAndroid; - if (this.capabilities.isWinphone || isAndroid) { - onSelectionChanged = _.debounce(onSelectionChanged, 500); - } - - $(document).on("mousedown.quote-button", e => { - this.set('isMouseDown', true); - - if (ignoreElements(e)) { return; } - - // deselects only when the user left click - // (allows anyone to `extend` their selection using shift+click) - if (!window.getSelection().isCollapsed && - e.which === 1 && - !e.shiftKey) controller.deselectText(); - }).on('mouseup.quote-button', e => { - if (ignoreElements(e)) { return; } - - this.selectText(e.target, controller); - this.set('isMouseDown', false); - }).on('selectionchange', () => { - // there is no need to handle this event when the mouse is down - // or if there a touch in progress - if (this.get('isMouseDown') || this._isTouchInProgress) { return; } - // `selection.anchorNode` is used as a target - onSelectionChanged(); - }); - - // Android is dodgy, touchend often will not fire - // https://code.google.com/p/android/issues/detail?id=19827 - if (!this.isAndroid) { - $(document).on('touchstart.quote-button', () => { - this._isTouchInProgress = true; - return true; - }); - - $(document).on('touchend.quote-button', () => { - this._isTouchInProgress = false; - return true; - }); - } - }, - - selectText(target, controller) { - const $target = $(target); - // breaks if quoting has been disabled by the user - if (!Discourse.User.currentProp('enable_quoting')) return; - // retrieve the post id from the DOM - const postId = $target.closest('.boxed, .reply').data('post-id'); - // select the text - if (postId) controller.selectText(postId); - }, - - willDestroyElement() { - $(document) - .off("mousedown.quote-button") - .off("mouseup.quote-button") - .off("touchstart.quote-button") - .off("touchend.quote-button") - .off("selectionchange"); - }, - - click(e) { - e.stopPropagation(); - return this.get('controller').quoteText(e); - } - -}); diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6 index 74bb33dabc..c3f2ad102b 100644 --- a/test/javascripts/controllers/topic-test.js.es6 +++ b/test/javascripts/controllers/topic-test.js.es6 @@ -2,8 +2,7 @@ import { blank, present } from 'helpers/qunit-helpers'; import { mapRoutes } from 'discourse/mapping-router'; moduleFor('controller:topic', 'controller:topic', { - needs: ['controller:modal', 'controller:composer', 'controller:quote-button', - 'controller:application'], + needs: ['controller:modal', 'controller:composer', 'controller:application'], setup() { this.registry.register('router:main', mapRoutes()); }, From a9ed15e11ac11371ba3ab73fa571879e6c89259d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Nov 2016 16:31:08 -0500 Subject: [PATCH 075/266] FIX: Remove more of those pesky View classes --- .../disable-custom-stylesheets.js.es6} | 12 ++-- .../controllers/admin-backups-index.js.es6 | 6 +- .../javascripts/admin/templates/admin.hbs | 4 +- .../admin/templates/backups-index.hbs | 7 +- .../javascripts/admin/templates/backups.hbs | 66 ++++++++++--------- .../admin/views/admin-backups.js.es6 | 25 ------- .../admin/views/admin-customize-colors.js.es6 | 3 - .../discourse-common/resolver.js.es6 | 41 +++--------- .../hide-modal-trigger.js.es6} | 0 .../initializers/live-development.js.es6 | 19 ------ .../discourse/routes/loading.js.es6 | 1 - .../discourse/templates/hide-modal.hbs | 1 + .../discourse/templates/loading.hbs | 1 + .../discourse/views/loading.js.es6 | 8 --- test/javascripts/acceptance/topic-test.js.es6 | 1 - 15 files changed, 65 insertions(+), 130 deletions(-) rename app/assets/javascripts/admin/{views/admin.js.es6 => components/disable-custom-stylesheets.js.es6} (53%) delete mode 100644 app/assets/javascripts/admin/views/admin-backups.js.es6 delete mode 100644 app/assets/javascripts/admin/views/admin-customize-colors.js.es6 rename app/assets/javascripts/discourse/{views/hide-modal.js.es6 => components/hide-modal-trigger.js.es6} (100%) delete mode 100644 app/assets/javascripts/discourse/routes/loading.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/hide-modal.hbs create mode 100644 app/assets/javascripts/discourse/templates/loading.hbs delete mode 100644 app/assets/javascripts/discourse/views/loading.js.es6 diff --git a/app/assets/javascripts/admin/views/admin.js.es6 b/app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6 similarity index 53% rename from app/assets/javascripts/admin/views/admin.js.es6 rename to app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6 index fc4a611fe4..f4d86899d0 100644 --- a/app/assets/javascripts/admin/views/admin.js.es6 +++ b/app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6 @@ -1,12 +1,14 @@ -export default Ember.View.extend({ - _disableCustomStylesheets: function() { +export default Ember.Component.extend({ + willInsertElement() { + this._super(); if (this.session.get("disableCustomCSS")) { $("link.custom-css").attr("rel", ""); this.session.set("disableCustomCSS", false); } - }.on("willInsertElement"), + }, - _enableCustomStylesheets: function() { + willDestroyElement() { + this._super(); $("link.custom-css").attr("rel", "stylesheet"); - }.on("willDestroyElement") + } }); diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 index 605ebe83af..558b9b4973 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 @@ -1,3 +1,4 @@ +import DiscourseURL from 'discourse/lib/url'; import { ajax } from 'discourse/lib/ajax'; export default Ember.Controller.extend({ @@ -35,8 +36,11 @@ export default Ember.Controller.extend({ } else { this._toggleReadOnlyMode(false); } - } + }, + download(backup) { + DiscourseURL.redirectTo(backup.get('link')); + } }, _toggleReadOnlyMode(enable) { diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs index e29125aec3..77904edc48 100644 --- a/app/assets/javascripts/admin/templates/admin.hbs +++ b/app/assets/javascripts/admin/templates/admin.hbs @@ -1,4 +1,4 @@ -
    +{{#disable-custom-stylesheets class="container"}}
    @@ -34,4 +34,4 @@
    -
    +{{/disable-custom-stylesheets}} diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs index 308e73f0fd..a8220a4e1a 100644 --- a/app/assets/javascripts/admin/templates/backups-index.hbs +++ b/app/assets/javascripts/admin/templates/backups-index.hbs @@ -19,7 +19,12 @@ {{human-size backup.size}}
    - {{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}} + {{d-button class="download" + action="download" + actionParam=backup + icon="download" + title="admin.backups.operations.download.title" + label="admin.backups.operations.download.label"}} {{#if status.isOperationRunning}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs index 7562754c08..ea8bc18987 100644 --- a/app/assets/javascripts/admin/templates/backups.hbs +++ b/app/assets/javascripts/admin/templates/backups.hbs @@ -1,35 +1,37 @@ -
    -
    -
      - {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}} - {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}} -
    +
    +
    +
    +
      + {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}} + {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}} +
    +
    +
    + {{#if model.canRollback}} + {{d-button action="rollback" + class="btn-rollback" + label="admin.backups.operations.rollback.label" + title="admin.backups.operations.rollback.title" + icon="ambulance" + disabled=rollbackDisabled}} + {{/if}} + {{#if model.isOperationRunning}} + {{d-button action="cancelOperation" + class="btn-danger" + title="admin.backups.operations.cancel.title" + label="admin.backups.operations.cancel.label" + icon="times"}} + {{else}} + {{d-button action="startBackup" + class="btn-primary" + title="admin.backups.operations.backup.title" + label="admin.backups.operations.backup.label" + icon="rocket"}} + {{/if}} +
    -
    - {{#if model.canRollback}} - {{d-button action="rollback" - class="btn-rollback" - label="admin.backups.operations.rollback.label" - title="admin.backups.operations.rollback.title" - icon="ambulance" - disabled=rollbackDisabled}} - {{/if}} - {{#if model.isOperationRunning}} - {{d-button action="cancelOperation" - class="btn-danger" - title="admin.backups.operations.cancel.title" - label="admin.backups.operations.cancel.label" - icon="times"}} - {{else}} - {{d-button action="startBackup" - class="btn-primary" - title="admin.backups.operations.backup.title" - label="admin.backups.operations.backup.label" - icon="rocket"}} - {{/if}} -
    -
    -
    - {{outlet}} +
    + {{outlet}} +
    diff --git a/app/assets/javascripts/admin/views/admin-backups.js.es6 b/app/assets/javascripts/admin/views/admin-backups.js.es6 deleted file mode 100644 index a779f4971d..0000000000 --- a/app/assets/javascripts/admin/views/admin-backups.js.es6 +++ /dev/null @@ -1,25 +0,0 @@ -import DiscourseURL from 'discourse/lib/url'; - -export default Ember.View.extend({ - classNames: ["admin-backups"], - - _hijackDownloads: function() { - this.$().on("mouseup.admin-backups", "a.download", function (e) { - var $link = $(e.currentTarget); - - if (!$link.data("href")) { - $link.addClass("no-href"); - $link.data("href", $link.attr("href")); - $link.attr("href", null); - $link.data("auto-route", true); - } - - DiscourseURL.redirectTo($link.data("href")); - }); - }.on("didInsertElement"), - - _removeBindings: function() { - this.$().off("mouseup.admin-backups"); - }.on("willDestroyElement") - -}); diff --git a/app/assets/javascripts/admin/views/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/views/admin-customize-colors.js.es6 deleted file mode 100644 index ac5df78af5..0000000000 --- a/app/assets/javascripts/admin/views/admin-customize-colors.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -export default Ember.View.extend({ - templateName: 'admin/templates/customize_colors' -}); diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6 index a3068b91b1..2462c791eb 100644 --- a/app/assets/javascripts/discourse-common/resolver.js.es6 +++ b/app/assets/javascripts/discourse-common/resolver.js.es6 @@ -6,29 +6,12 @@ var get = Ember.get; var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags', 'user', 'preferences', 'adminEmail', 'adminUsersList']; -var _dummyRoute; -var _loadingView; - - const _options = {}; export function setResolverOption(name, value) { _options[name] = value; } -function loadingResolver(cb) { - return function(parsedName) { - var fullNameWithoutType = parsedName.fullNameWithoutType; - - if (fullNameWithoutType.indexOf('Loading') >= 0) { - fullNameWithoutType = fullNameWithoutType.replace('Loading', ''); - if (LOADING_WHITELIST.indexOf(fullNameWithoutType) !== -1) { - return cb(fullNameWithoutType); - } - } - }; -} - function parseName(fullName) { const nameParts = fullName.split(":"), type = nameParts[0], fullNameWithoutType = nameParts[1], @@ -113,7 +96,7 @@ export function buildResolver(baseName) { }, resolveView(parsedName) { - return this.findLoadingView(parsedName) || this.customResolve(parsedName) || this._super(parsedName); + return this.customResolve(parsedName) || this._super(parsedName); }, resolveHelper(parsedName) { @@ -135,7 +118,13 @@ export function buildResolver(baseName) { }, resolveRoute(parsedName) { - return this.findLoadingRoute(parsedName) || this.customResolve(parsedName) || this._super(parsedName); + return this.customResolve(parsedName) || this._super(parsedName); + }, + + findLoadingTemplate(parsedName) { + if (parsedName.fullNameWithoutType.match(/loading$/)) { + return Ember.TEMPLATES.loading; + } }, resolveTemplate(parsedName) { @@ -143,22 +132,10 @@ export function buildResolver(baseName) { this.findPluginTemplate(parsedName) || this.findMobileTemplate(parsedName) || this.findTemplate(parsedName) || + this.findLoadingTemplate(parsedName) || Ember.TEMPLATES.not_found; }, - findLoadingRoute: loadingResolver(function() { - _dummyRoute = _dummyRoute || Ember.Route.extend(); - return _dummyRoute; - }), - - findLoadingView: loadingResolver(function() { - if (!_loadingView) { - _loadingView = require('discourse/views/loading', null, null, true /* force sync */); - if (_loadingView && _loadingView['default']) { _loadingView = _loadingView['default']; } - } - return _loadingView; - }), - findPluginTemplate(parsedName) { var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/")); return this.findTemplate(pluginParsedName); diff --git a/app/assets/javascripts/discourse/views/hide-modal.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 similarity index 100% rename from app/assets/javascripts/discourse/views/hide-modal.js.es6 rename to app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6 index a3c8afa51a..f73172e154 100644 --- a/app/assets/javascripts/discourse/initializers/live-development.js.es6 +++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6 @@ -1,4 +1,3 @@ -import loadScript from 'discourse/lib/load-script'; import DiscourseURL from 'discourse/lib/url'; // Use the message bus for live reloading of components for faster development. @@ -47,24 +46,6 @@ export default { if (me === "refresh") { // Refresh if necessary document.location.reload(true); - } else if (me.name.substr(-10) === "hbs") { - - // Reload handlebars - const js = me.name.replace(".hbs", "").replace("app/assets/javascripts", "/assets"); - loadScript(js + "?hash=" + me.hash).then(function() { - const templateName = js.replace(".js", "").replace("/assets/", ""); - return _.each(Ember.View.views, function(view) { - if (view.get('templateName') === templateName) { - view.set('templateName', 'empty'); - view.rerender(); - Em.run.schedule('afterRender', function() { - view.set('templateName', templateName); - view.rerender(); - }); - } - }); - }); - } else { $('link').each(function() { // TODO: stop bundling css in DEV please diff --git a/app/assets/javascripts/discourse/routes/loading.js.es6 b/app/assets/javascripts/discourse/routes/loading.js.es6 deleted file mode 100644 index 9d032c9e3b..0000000000 --- a/app/assets/javascripts/discourse/routes/loading.js.es6 +++ /dev/null @@ -1 +0,0 @@ -export default Ember.Route.extend(); diff --git a/app/assets/javascripts/discourse/templates/hide-modal.hbs b/app/assets/javascripts/discourse/templates/hide-modal.hbs new file mode 100644 index 0000000000..69c2e656d9 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/hide-modal.hbs @@ -0,0 +1 @@ +{{hide-modal-trigger}} diff --git a/app/assets/javascripts/discourse/templates/loading.hbs b/app/assets/javascripts/discourse/templates/loading.hbs new file mode 100644 index 0000000000..7b998117e8 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/loading.hbs @@ -0,0 +1 @@ +{{loading-spinner}} diff --git a/app/assets/javascripts/discourse/views/loading.js.es6 b/app/assets/javascripts/discourse/views/loading.js.es6 deleted file mode 100644 index 2d6227695f..0000000000 --- a/app/assets/javascripts/discourse/views/loading.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import { spinnerHTML } from 'discourse/helpers/loading-spinner'; -import { bufferedRender } from 'discourse-common/lib/buffered-render'; - -export default Ember.View.extend(bufferedRender({ - buildBuffer(buffer) { - buffer.push(spinnerHTML); - } -})); diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index b3141c129a..ea8471d71c 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -10,7 +10,6 @@ test("Share Popup", () => { click("[data-share-url]:eq(0)"); andThen(() => { ok(exists('#share-link.visible'), 'it shows the popup'); - ok(find('input[type=text]').val().length, 'it has the URL in the input box'); }); click('#share-link .close-share'); From b217db9337082ed6f1ed952a1a6c2f1ad877a654 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Nov 2016 17:23:51 -0500 Subject: [PATCH 076/266] Remove unused var --- app/assets/javascripts/discourse-common/resolver.js.es6 | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6 index 2462c791eb..a0089ae7d3 100644 --- a/app/assets/javascripts/discourse-common/resolver.js.es6 +++ b/app/assets/javascripts/discourse-common/resolver.js.es6 @@ -4,8 +4,6 @@ import { findHelper } from 'discourse-common/lib/helpers'; var classify = Ember.String.classify; var get = Ember.get; -var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags', - 'user', 'preferences', 'adminEmail', 'adminUsersList']; const _options = {}; export function setResolverOption(name, value) { From 3ed2d645a368d3511efd7ade0f7720f955b85f12 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sat, 12 Nov 2016 15:02:27 +0530 Subject: [PATCH 077/266] FIX: attach proper class to user notification section --- .../javascripts/discourse/templates/user/notifications.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index 6d2b1e989d..ecba8f9188 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -1,4 +1,4 @@ -{{#d-section pageClass="user-notifications" class="user-notifications"}} +{{#d-section pageClass="user-notifications" class="user-navigation"}} {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
  • {{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}} From 115c45400278243aa90d4997af9a8b87647552bd Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 14 Nov 2016 11:09:24 +1100 Subject: [PATCH 078/266] FIX: if prioritizing names in ux choose name over username in email --- app/helpers/user_notifications_helper.rb | 11 ++++++++ app/views/email/_post.html.erb | 2 ++ spec/mailers/user_notifications_spec.rb | 33 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb index 84b5204f84..8fca6d8ce2 100644 --- a/app/helpers/user_notifications_helper.rb +++ b/app/helpers/user_notifications_helper.rb @@ -58,7 +58,18 @@ module UserNotificationsHelper name.downcase.gsub(/[\s_-]/, '') end + def show_username_on_post(post) + return true if SiteSetting.prioritize_username_in_ux + return true unless SiteSetting.enable_names? + return true unless SiteSetting.display_name_on_posts? + return true unless post.user.name.present? + + normalize_name(post.user.name) != normalize_name(post.user.username) + end + def show_name_on_post(post) + return true unless SiteSetting.prioritize_username_in_ux + SiteSetting.enable_names? && SiteSetting.display_name_on_posts? && post.user.name.present? && diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb index 42bb7afb83..3f0d21580f 100644 --- a/app/views/email/_post.html.erb +++ b/app/views/email/_post.html.erb @@ -8,7 +8,9 @@ + <%- if show_username_on_post(post) %> <%= post.user.username %> + <% end %> <%- if show_name_on_post(post) %> <%= post.user.name %> <% end %> diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index bee8d13f25..bc7dfb4fdd 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -232,6 +232,39 @@ describe UserNotifications do expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0) + + + + SiteSetting.enable_names = true + SiteSetting.display_name_on_posts = true + SiteSetting.prioritize_username_in_ux = false + + response.user.username = "bobmarley" + response.user.name = "Bob Marley" + response.user.save + + mail = UserNotifications.user_replied(response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + + mail_html = mail.html_part.to_s + expect(mail_html.scan(/>Bob Marley/).count).to eq(1) + expect(mail_html.scan(/>bobmarley/).count).to eq(0) + + SiteSetting.prioritize_username_in_ux = true + + mail = UserNotifications.user_replied(response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + mail_html = mail.html_part.to_s + expect(mail_html.scan(/>Bob Marley/).count).to eq(0) + expect(mail_html.scan(/>bobmarley/).count).to eq(1) end end From 298b82f59ef4ab8da878a4f8c3f586bc808f414a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 9 Nov 2016 14:35:29 +0800 Subject: [PATCH 079/266] UX: Tweak position of radar ping. --- app/assets/stylesheets/common/base/discourse.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 4362f4779e..f6795dd00e 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -174,7 +174,7 @@ body { background: -moz-radial-gradient($gradient-start, $gradient-end); background: radial-gradient($gradient-start, $gradient-end); top: -11px !important; - right: 24px !important; + right: 23.5px !important; border-radius: 100%; width: 20px; height: 20px; From 8967357924def91e1044912d7b6e1d829764e898 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 14 Nov 2016 09:56:34 +0800 Subject: [PATCH 080/266] Update rails_multisite. --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d1dfeace9c..53a8ccdb37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,7 +264,8 @@ GEM loofah (~> 2.0) rails-observers (0.1.2) activemodel (~> 4.0) - rails_multisite (1.0.4) + rails_multisite (1.0.5) + rails (> 4.2, < 5) railties (4.2.7.1) actionpack (= 4.2.7.1) activesupport (= 4.2.7.1) From 80769a5acdd37ef7d362bc17fcd43f7189630084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Nov 2016 10:45:13 +0100 Subject: [PATCH 081/266] bump onebox version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53a8ccdb37..f38e435486 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.62) + onebox (1.5.63) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From 0d295cc7b9a2152226495e350509fb89516a5d85 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 14 Nov 2016 21:49:12 +0800 Subject: [PATCH 082/266] Bump onebox for fixes. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f38e435486..a823497bcc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.63) + onebox (1.5.64) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From aada925b21afe2936eba54547b19f1aaca889004 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 14 Nov 2016 12:57:01 -0500 Subject: [PATCH 083/266] Start converting modal views to components --- .../discourse/components/d-modal-body.js.es6 | 29 +++++++++++++++++++ .../discourse/routes/unknown.js.es6 | 3 +- .../templates/modal/edit-topic-auto-close.hbs | 4 +-- .../discourse/templates/modal/raw-email.hbs | 4 +-- .../templates/{ => modal}/rename-tag.hbs | 4 +-- .../discourse/templates/modal/split-topic.hbs | 5 ++-- .../templates/modal/upload-customization.hbs | 4 +-- .../discourse/templates/unknown.hbs | 3 ++ .../views/edit-topic-auto-close.js.es6 | 7 ----- .../javascripts/discourse/views/modal.js.es6 | 4 +++ .../javascripts/discourse/views/raw-email.es6 | 11 ------- .../discourse/views/rename-tag.js.es6 | 5 ---- .../discourse/views/split-topic.js.es6 | 7 ----- .../discourse/views/unknown.js.es6 | 9 ------ .../views/upload-customization.js.es6 | 6 ---- 15 files changed, 48 insertions(+), 57 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/d-modal-body.js.es6 rename app/assets/javascripts/discourse/templates/{ => modal}/rename-tag.hbs (83%) create mode 100644 app/assets/javascripts/discourse/templates/unknown.hbs delete mode 100644 app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/raw-email.es6 delete mode 100644 app/assets/javascripts/discourse/views/rename-tag.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/split-topic.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/unknown.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/upload-customization.js.es6 diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6 new file mode 100644 index 0000000000..0753cf4fef --- /dev/null +++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6 @@ -0,0 +1,29 @@ +export default Ember.Component.extend({ + classNames: ['modal-body'], + + didInsertElement() { + this._super(); + $('#modal-alert').hide(); + $('#discourse-modal').modal('show'); + Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender); + }, + + _afterFirstRender() { + if (!this.site.mobileView && this.get('autoFocus') !== 'false') { + this.$('input:first').focus(); + } + + const maxHeight = this.get('maxHeight'); + if (maxHeight) { + const maxHeightFloat = parseFloat(maxHeight) / 100.0; + if (maxHeightFloat > 0) { + const viewPortHeight = $(window).height(); + this.$().css("max-height", Math.floor(maxHeightFloat * viewPortHeight) + "px"); + } + } + + this.appEvents.trigger('modal:body-shown', { + title: this.get('title') + }); + } +}); diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6 index 7e01606f3b..40c8a30139 100644 --- a/app/assets/javascripts/discourse/routes/unknown.js.es6 +++ b/app/assets/javascripts/discourse/routes/unknown.js.es6 @@ -1,6 +1,7 @@ import { ajax } from 'discourse/lib/ajax'; + export default Discourse.Route.extend({ - model: function() { + model() { return ajax("/404-body", { dataType: 'html' }); } }); diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs index cc1f423cc0..d5dcb92fa6 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs @@ -1,5 +1,5 @@ -
    + {{#d-modal-body title="topic.auto_close_title" autoFocus="false"}} {{auto-close-form autoCloseTime=model.auto_close_time autoCloseValid=auto_close_valid autoCloseBasedOnLastPost=model.details.auto_close_based_on_last_post @@ -10,7 +10,7 @@ {{willCloseI18n}}
    {{/if}} -
    • + {{/d-modal-body}}
    {{d-button class="btn-primary" disabled=disable_submit label="topic.auto_close_save" action="saveAutoClose"}} {{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs index ad9f7ec508..12667d0143 100644 --- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs +++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs @@ -1,7 +1,7 @@ -
    +{{#d-modal-body title="raw_email.title" maxHeight="80%"}} {{#if rawEmail}} {{textarea value=rawEmail class="raw-email-textarea"}} {{else}} {{i18n 'raw_email.not_available'}} {{/if}} -
    +{{/d-modal-body}} diff --git a/app/assets/javascripts/discourse/templates/rename-tag.hbs b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs similarity index 83% rename from app/assets/javascripts/discourse/templates/rename-tag.hbs rename to app/assets/javascripts/discourse/templates/modal/rename-tag.hbs index 0d69f7f65d..e54a61551a 100644 --- a/app/assets/javascripts/discourse/templates/rename-tag.hbs +++ b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs @@ -1,9 +1,9 @@ -
    +{{#d-modal-body title="tagging.rename_tag"}} -
    +{{/d-modal-body}}
    {{d-button class="btn-primary" diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs index fe80f88174..b18a2d793b 100644 --- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs @@ -1,4 +1,4 @@ -
    +{{#d-modal-body id="move-selected" title="topic.split_topic.title"}} {{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}} @@ -8,8 +8,7 @@ {{category-chooser value=categoryId}} - -
    +{{/d-modal-body}}
    {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}} diff --git a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs index db8cf3de27..42af272a28 100644 --- a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs +++ b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs @@ -1,7 +1,7 @@
    -
    + {{#d-modal-body title="admin.customize.import_title"}} {{json-file-uploader value=customizationFile extension=".dcstyle.json"}} -
    + {{/d-modal-body}}
    {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}}
    diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs new file mode 100644 index 0000000000..0e9e6b9625 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/unknown.hbs @@ -0,0 +1,3 @@ +
    + {{{model}}} +
    diff --git a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 deleted file mode 100644 index 6265d41b80..0000000000 --- a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: "modal/edit-topic-auto-close", - title: I18n.t("topic.auto_close_title"), - focusInput: false -}); diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6 index 07f2bbeb14..fb9869db20 100644 --- a/app/assets/javascripts/discourse/views/modal.js.es6 +++ b/app/assets/javascripts/discourse/views/modal.js.es6 @@ -16,6 +16,10 @@ export default Ember.View.extend({ Em.run.next(() => $('.modal-header a.close').click()); } }); + + this.appEvents.on('modal:body-shown', data => { + this.set('controller.title', I18n.t(data.title)); + }); }, @on("willDestroyElement") diff --git a/app/assets/javascripts/discourse/views/raw-email.es6 b/app/assets/javascripts/discourse/views/raw-email.es6 deleted file mode 100644 index 6e96af1626..0000000000 --- a/app/assets/javascripts/discourse/views/raw-email.es6 +++ /dev/null @@ -1,11 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/raw-email', - title: I18n.t('raw_email.title'), - - resizeModal: function(){ - const viewPortHeight = $(window).height(); - this.$(".modal-body").css("max-height", Math.floor(0.8 * viewPortHeight) + "px"); - }.on("didInsertElement") -}); diff --git a/app/assets/javascripts/discourse/views/rename-tag.js.es6 b/app/assets/javascripts/discourse/views/rename-tag.js.es6 deleted file mode 100644 index 68a0b12c5c..0000000000 --- a/app/assets/javascripts/discourse/views/rename-tag.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import ModalBodyView from 'discourse/views/modal-body'; - -export default ModalBodyView.extend({ - title: I18n.t("tagging.rename_tag") -}); diff --git a/app/assets/javascripts/discourse/views/split-topic.js.es6 b/app/assets/javascripts/discourse/views/split-topic.js.es6 deleted file mode 100644 index 9291495adc..0000000000 --- a/app/assets/javascripts/discourse/views/split-topic.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -import SelectedPostsCount from 'discourse/mixins/selected-posts-count'; -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend(SelectedPostsCount, { - templateName: 'modal/split-topic', - title: I18n.t('topic.split_topic.title') -}); diff --git a/app/assets/javascripts/discourse/views/unknown.js.es6 b/app/assets/javascripts/discourse/views/unknown.js.es6 deleted file mode 100644 index 3060ed9306..0000000000 --- a/app/assets/javascripts/discourse/views/unknown.js.es6 +++ /dev/null @@ -1,9 +0,0 @@ -import { bufferedRender } from 'discourse-common/lib/buffered-render'; - -export default Ember.View.extend(bufferedRender({ - classNameBindings: [':container'], - - buildBuffer(buffer) { - buffer.push(this.get('controller.model')); - } -})); diff --git a/app/assets/javascripts/discourse/views/upload-customization.js.es6 b/app/assets/javascripts/discourse/views/upload-customization.js.es6 deleted file mode 100644 index c6e336157c..0000000000 --- a/app/assets/javascripts/discourse/views/upload-customization.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/upload-customization', - title: I18n.t('admin.customize.import_title') -}); From 120a7807635a9c56abc3f687030db06356d42d25 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 14 Nov 2016 14:36:29 -0500 Subject: [PATCH 084/266] Replace the add category class view mixin with a component --- .../components/add-category-class.js.es6 | 34 +++++++++++++++++++ .../mixins/add-category-class.js.es6 | 27 --------------- .../templates/navigation/category.hbs | 2 ++ .../javascripts/discourse/templates/topic.hbs | 2 ++ .../views/navigation-category.js.es6 | 5 --- .../javascripts/discourse/views/topic.js.es6 | 4 +-- 6 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/add-category-class.js.es6 delete mode 100644 app/assets/javascripts/discourse/mixins/add-category-class.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/navigation-category.js.es6 diff --git a/app/assets/javascripts/discourse/components/add-category-class.js.es6 b/app/assets/javascripts/discourse/components/add-category-class.js.es6 new file mode 100644 index 0000000000..7d8ad2dc37 --- /dev/null +++ b/app/assets/javascripts/discourse/components/add-category-class.js.es6 @@ -0,0 +1,34 @@ +import { observes } from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + _slug: null, + + didInsertElement() { + this._super(); + this.refreshClass(); + }, + + _updateClass() { + if (this.isDestroying || this.isDestroyed) { return; } + const slug = this.get('category.fullSlug'); + this._removeClass(); + if (slug) { + $("body").addClass(`category-${slug}`); + } + }, + + @observes('category.fullSlug') + refreshClass() { + Ember.run.scheduleOnce('afterRender', this, this._updateClass); + }, + + _removeClass() { + $("body").removeClass((_, css) => (css.match(/\bcategory-\S+/g) || []).join(" ")); + }, + + willDestroyElement() { + this._super(); + this._removeClass(); + } + +}); diff --git a/app/assets/javascripts/discourse/mixins/add-category-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-category-class.js.es6 deleted file mode 100644 index b3496ee8cb..0000000000 --- a/app/assets/javascripts/discourse/mixins/add-category-class.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -// Mix this in to a view that has a `categoryFullSlug` property to automatically -// add it to the body as the view is entered / left / model is changed. -// This is used for keeping the `body` style in sync for the background image. - -import Ember from "ember"; -const { on, observer } = Ember; - -export default { - _categoryChanged: on("didInsertElement", observer("categoryFullSlug", function() { - const categoryFullSlug = this.get("categoryFullSlug"); - - this._removeClass(); - - if (categoryFullSlug) { - $("body").addClass("category-" + categoryFullSlug); - } - })), - - _leave: on("willDestroyElement", function() { - this.removeObserver("categoryFullSlug"); - this._removeClass(); - }), - - _removeClass() { - $("body").removeClass((_, css) => (css.match(/\bcategory-\S+/g) || []).join(" ")); - }, -}; diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index a18531d5bb..e7f01c1cd1 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -1,3 +1,5 @@ +{{add-category-class category=category}} +
    {{#if category.logo_url}} {{cdn-img src=category.logo_url class="category-logo"}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 625155eae7..af3c187fde 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -1,4 +1,6 @@ + {{#if model}} + {{add-category-class category=model.category}}
    {{discourse-banner user=currentUser banner=site.banner overlay=hasScrolled hide=model.errorLoading}}
    diff --git a/app/assets/javascripts/discourse/views/navigation-category.js.es6 b/app/assets/javascripts/discourse/views/navigation-category.js.es6 deleted file mode 100644 index 6a871ecae3..0000000000 --- a/app/assets/javascripts/discourse/views/navigation-category.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import AddCategoryClass from 'discourse/mixins/add-category-class'; - -export default Ember.View.extend(AddCategoryClass, { - categoryFullSlug: Ember.computed.alias('controller.category.fullSlug') -}); diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index e41bd71130..4e91f70650 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -1,10 +1,9 @@ -import AddCategoryClass from 'discourse/mixins/add-category-class'; import AddArchetypeClass from 'discourse/mixins/add-archetype-class'; import ClickTrack from 'discourse/lib/click-track'; import Scrolling from 'discourse/mixins/scrolling'; import { selectedText } from 'discourse/lib/utilities'; -const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolling, { +const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { templateName: 'topic', topic: Ember.computed.alias('controller.model'), @@ -18,7 +17,6 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli menuVisible: true, SHORT_POST: 1200, - categoryFullSlug: Em.computed.alias('topic.category.fullSlug'), postStream: Em.computed.alias('topic.postStream'), archetype: Em.computed.alias('topic.archetype'), From 24227af9e8d59330542f457845051aab7824c94e Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 14 Nov 2016 18:32:59 -0200 Subject: [PATCH 085/266] Adds some styling for crawler view --- .../common/base/crawler_layout.scss | 24 +++++++++++++++++++ app/views/layouts/crawler.html.erb | 9 +++++-- app/views/list/list.erb | 2 +- app/views/topics/show.html.erb | 5 ---- 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 app/assets/stylesheets/common/base/crawler_layout.scss diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss new file mode 100644 index 0000000000..874b11df9d --- /dev/null +++ b/app/assets/stylesheets/common/base/crawler_layout.scss @@ -0,0 +1,24 @@ +body.crawler { + > header { + width: 100%; + position: absolute; + top: 0; + z-index: 1001; + background-color: #fff; + padding: 10px; + box-shadow: 0 2px 4px -1px rgba(0,0,0,0.25); + } + div.topic-list div[itemprop='itemListElement'] { + padding: 10px 0px; + border-bottom: 1px solid #e9e9e9; + } + .page-links a { + padding: 0px 4px; + } + footer nav { + margin: 50px 0px; + a { + padding: 15px; + } + } +} diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb index a04edf944a..e4e7f9a47e 100644 --- a/app/views/layouts/crawler.html.erb +++ b/app/views/layouts/crawler.html.erb @@ -5,18 +5,23 @@ <%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %> <%= render partial: "layouts/head" %> + <%- if rtl? %> + <%= DiscourseStylesheets.stylesheet_link_tag(mobile_view? ? :mobile_rtl : :desktop_rtl) %> + <%- else %> + <%= DiscourseStylesheets.stylesheet_link_tag(mobile_view? ? :mobile : :desktop) %> + <%- end %> <%- unless customization_disabled? %> <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %> <%- end %> <%= render_google_universal_analytics_code %> <%= yield :head %> - + <%- unless customization_disabled? %> <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %> <%- end %>
    - "> + ">
    <%= yield %> diff --git a/app/views/list/list.erb b/app/views/list/list.erb index 9b1513915f..0ac6b2821f 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -33,7 +33,7 @@ <%= t.title %> - <%= page_links(t) %> + <%= page_links(t) %> <% if (!@category || @category.has_children?) && t.category %> [<%= t.category.name %>] <% end %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 4f20a507f0..e72ebb1a00 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -69,11 +69,6 @@ <% if @topic_view.print %> <% content_for :after_body do %> - <%- if rtl? %> - <%= DiscourseStylesheets.stylesheet_link_tag(mobile_view? ? :mobile_rtl : :desktop_rtl, 'print') %> - <%- else %> - <%= DiscourseStylesheets.stylesheet_link_tag(mobile_view? ? :mobile : :desktop, 'print') %> - <%- end %> + + + + + + + + <%= SiteSetting.title %> <%- end %> - - - - + +
    + + + <%- if logo_url.blank? %> + <%= SiteSetting.title %> <%- else %> - - - <%- if logo_url.blank? %> - <%= SiteSetting.title %> - <%- else %> - - <%- end %> - -
    - <%= raw(t 'user_notifications.digest.why', site_link: html_site_link(@anchor_color), last_seen_at: @last_seen_at) %> + - <%- if @featured_topics.present? %> -
    -

    <%=t 'user_notifications.digest.top_topics' %>

    - - - <%- @featured_topics.each_with_index do |t, i| %> -
    - <%= raw format_topic_title(t.title) %> -
    - <%= category_badge(t.category, inline_style: true, absolute_url: true) %> -
    - - <%- if t.best_post.present? && !t.best_post.user_deleted %> -
    - <%= email_excerpt(t.best_post.cooked, @featured_topics.size) %> -
    - <%- end %> - - <%= digest_custom_html("below_post_#{i+1}") %> - - <%- if i < @featured_topics.size - 1 %><% end %> - - <%- end %> - <%- end %> - - <%= digest_custom_html("above_popular_topics") %> - - <%- if @new_topics.present? %> -
    -

    <%=t 'user_notifications.digest.other_new_topics' %>

    - - <%- @new_topics.each do |t| %> - - <%- end -%> - - <%- end -%> - - <%= digest_custom_html("below_popular_topics") %> - - <%- if @new_topics_since_seen > 0 %> - <%- if @new_by_category.present? %> -

    <%= t('user_notifications.digest.more_topics_category', last_seen_at: @last_seen_at, new_topics_since_seen: @new_topics_since_seen) %>

    -
    - <%- @new_by_category.first(10).each do |c| %> - - <%= c[0].name %> <%= c[1] %> - - <%- end %> -
    - <%- else %> -

    <%= t('user_notifications.digest.more_topics', last_seen_at: @last_seen_at, new_topics_since_seen: @new_topics_since_seen) %>

    - <%- end %> - <%- end -%> -
    + + + + + + +
    +
    + + + + + + +
     
    +
    +     		+ + + + + + +
    + +
    +
    <%=t 'user_notifications.digest.since_last_visit' %>
    + + + + + + + + + + + + + + + + +
    + <%= @new_topics_count -%> + + <%= @unread_messages -%> + + <%= @unread_notifications -%> +
    + <%=t 'user_notifications.digest.new_topics' %> + + <%=t 'user_notifications.digest.unread_messages' %> + + <%=t 'user_notifications.digest.unread_notifications' %> +
    + +
    <%=t 'user_notifications.digest.popular_topics' %>
    + + +
    + + + + + + +
    + +<% @popular_topics.each_with_index do |t, i| %> + + + + + + + + +
    +

    + <%= category_badge(t.category, inline_style: true, absolute_url: true) %> +

    +     		+

    + <%= short_date(t.created_at) %> +

    +
    + + + + + + + <% if t.image_url.present? %> + + <% end %> + + + +
    ;"> +

    + + <%= t.title -%> + +

    +     		+ +
    + + + + + + + + +
    + + +
    <%= t.user.try(:username) -%>
    + <% if t.user.try(:name).present? %> +

    <%= t.user.name -%>

    + <% end %> +
    + +<%- if t.first_post.present? && !t.first_post.user_deleted %> + + + + + + +
    + <%= email_excerpt(t.first_post.cooked) %> +
    +<%- end %> + + + + + + + + + + +
    + +

    <%= t.like_count -%>

    +     		+ +

    <%= t.posts_count - 1 -%>

    +     		+ <% t.posters_summary.each do |ps| %> + <% if ps.user %> + + <% end %> + <% end %> + + + <%=t 'user_notifications.digest.join_the_discussion' %> + +
    +
    + + +
     
    +
    + + +<%= digest_custom_html("below_post_#{i+1}") %> + +<% end %> + +
    +     		+ +
    + + + + + + +
     
    +
    +
    + +<% if @popular_posts.present? %> + + + + + +
    +

    + <%=t 'user_notifications.digest.popular_posts' %> +

    +
    + + + + + + + +
      + +<% @popular_posts.each do |post| %> + + + + + + + + +
    + <%= email_excerpt(post.cooked) %> +
    + + + + + + + +
    + +
    + + + + + + + + + +
    + + +
    <%= post.user.username -%>
    +

    <%= post.user.name -%>

    +     		+

    + <%=t 'user_notifications.digest.from_topic_label' %> + <%= post.topic.title -%> +

    + + <%=t 'user_notifications.digest.join_the_discussion' %> + +
    + +
    + + +
     
    +
    + + +<% end %> + +<% end %> + + + +<% if @other_new_for_you.present? %> +
    <%=t 'user_notifications.digest.more_new' %>
    + + +<%= digest_custom_html("above_popular_topics") %> + + + + +<% @other_new_for_you.each do |t| %> + + + + + + + + + + + + + + + +<% end %> + + +
    +

    + <%= t.user_data ? (t.highest_post_number - t.user_data.last_read_post_number) : t.highest_post_number %> +

    +     		+ + <%= t.title -%> + + +

    <%= t.category.try(:name) -%>

    +     		+ <% t.posters_summary[0,2].each do |ps| %> + <% if ps.user %> + + <% end %> + <% end %> + + +

    <%= t.like_count -%>

    +     		+ +

    <%= t.posts_count - 1 -%>

    +
     
    + +<%= digest_custom_html("below_popular_topics") %> + +<% end %> + + +     		 
    + + + <%= digest_custom_html("above_footer") %>
    @@ -92,3 +407,11 @@
    <%= digest_custom_html("below_footer") %> + + +
                                        +                        
    + + + + \ No newline at end of file diff --git a/app/views/user_notifications/digest.text.erb b/app/views/user_notifications/digest.text.erb index 07d5c4870e..b1c92a07bf 100644 --- a/app/views/user_notifications/digest.text.erb +++ b/app/views/user_notifications/digest.text.erb @@ -3,10 +3,16 @@ site_link: site_link, last_seen_at: @last_seen_at) %> -<%- if @featured_topics.present? %> -### <%=t 'user_notifications.digest.top_topics' %> +<%= @new_topics_count -%> <%=t 'user_notifications.digest.new_topics' %> +<%= @unread_messages -%> <%=t 'user_notifications.digest.unread_messages' %> +<%= @unread_notifications -%> <%=t 'user_notifications.digest.unread_notifications' %> -<%- @featured_topics.each_with_index do |t,i| %> +-------------------------------------------------------------------------------- + +<%- if @popular_topics.present? %> +### <%=t 'user_notifications.digest.popular_topics' %> + +<%- @popular_topics.each_with_index do |t,i| %> <%= raw(@markdown_linker.create(t.title, t.relative_url)) %> <%- if t.best_post.present? %> @@ -18,14 +24,26 @@ <%- end %> <%- end %> <%= digest_custom_text("above_popular_topics") %> -<%- if @new_topics.present? %> -**<%=t 'user_notifications.digest.other_new_topics' %>** -<%- @new_topics.each do |t| %> +<%- if @popular_posts.present? %> +### <%=t 'user_notifications.digest.popular_posts' %> + +<%- @popular_posts.each_with_index do |post,i| %> +<%= post.user.username -%> <%=t 'user_notifications.digest.from_topic_label' -%> <%= raw(@markdown_linker.create(post.topic.title, post.topic.relative_url)) %> + + <%= raw(post.excerpt(1000, strip_links: true, text_entities: true, markdown_images: true)) %> +-------------------------------------------------------------------------------- + +<%- end %> +<%- end %> + +<%- if @other_new_for_you.present? %> +**<%=t 'user_notifications.digest.more_new' %>** + +<%- @other_new_for_you.each do |t| %> * <%= raw(@markdown_linker.create(t.title, t.relative_url)) %> - <%= t.posts_count %> - <%- if t.category %>[<%= t.category.name %>]<%- end %> <%- end -%> - -<%- end -%> +<%- end %> <%= digest_custom_text("below_popular_topics") %> @@ -38,4 +56,4 @@ <%= raw(@markdown_linker.references) %> -<%= digest_custom_text("below_footer") %> \ No newline at end of file +<%= digest_custom_text("below_footer") %> diff --git a/app/views/user_notifications/mailing_list.html.erb b/app/views/user_notifications/mailing_list.html.erb index c6b4240542..749ee60867 100644 --- a/app/views/user_notifications/mailing_list.html.erb +++ b/app/views/user_notifications/mailing_list.html.erb @@ -1,7 +1,7 @@
    -
    + <% if logo_url.blank? %> <%= SiteSetting.title %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 26622bfe55..eeef7a6c84 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1279,6 +1279,7 @@ en: default_avatars: "URLs to avatars that will be used by default for new users until they change them." automatically_download_gravatars: "Download Gravatars for users upon account creation or email change." digest_topics: "The maximum number of topics to display in the email summary." + digest_posts: "The maximum number of popular posts to display in the email summary." digest_min_excerpt_length: "Minimum post excerpt in the email summary, in characters." delete_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days." digest_suppress_categories: "Suppress these categories from summary emails." @@ -2427,16 +2428,21 @@ en: digest: why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}" + since_last_visit: "Since your last visit" + new_topics: "New Topics" + unread_messages: "Unread Messages" + unread_notifications: "Unread Notifications" + popular_topics: "Popular Topics" + follow_topic: "Follow this topic" + join_the_discussion: "Join the discussion" + popular_posts: "Popular Posts" + from_topic_label: "From" + more_new: "New in topics and categories you follow" subject_template: "[%{site_name}] Summary" - new_activity: "New activity on your topics and posts:" - top_topics: "Popular posts" - other_new_topics: "Popular topics" unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}." click_here: "click here" from: "%{site_name} summary" - read_more: "Read More" - more_topics: "There were %{new_topics_since_seen} other new topics." - more_topics_category: "More new topics:" + preheader: "A brief summary since your last visit on %{last_seen_at}" custom: html: header: '' diff --git a/config/site_settings.yml b/config/site_settings.yml index 0005bc48ba..9be481803e 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -584,7 +584,10 @@ email: private_email_time_window_seconds: 20 email_posts_context: 5 digest_min_excerpt_length: 100 - digest_topics: 20 + digest_topics: + default: 5 + min: 1 + digest_posts: 3 delete_digest_email_after_days: 365 digest_suppress_categories: type: category_list diff --git a/public/images/emails/comment.png b/public/images/emails/comment.png new file mode 100644 index 0000000000000000000000000000000000000000..77c849f282fd6476acbbb31c96f1cccb5093bf67 GIT binary patch literal 1067 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~&H|6fVg?3o zVGw3ym^DWNs30;kB%&n3*T*V3KUXg?B|j-uuOhbqsG5Pnrosxy%uOvxRH(?!$t$+1 zuvG%9umZ9{!um=IU?nBlwn`Dc0SeCfMX3s=dM0`XN_Jcd3JNwwDQQ+gE^bimK%T8q zMoCG5mA-y?dAVM>v0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP#GNIXX$YJ0ilN>DdQcxEqi?8Zpbs}2sMQ7}YUN*) znF_QSWWJrD4Ok_L7}OpceURlyj)C|TEDH3h9hZ$hJlO2Gd=9BcGB7Y@d%8G=SO}gC z@y!7Ct;xvUs&#)}3D;^`(9@|B|1j*TJ1! zk{f%P>ChtXTOJyQLT+jXhd<8=R|{*Nc0{k{kPIp5nmXv!cwl^o^kzZ(`A|OUhmRNy#L&+E&dqO9u@YJC0fO??;|)qZVJ(o{Zh48 z;zXL(Wl?_3r5pF{v&-3jd-uHOZ`%()a>9e8*(%=4FMA8d>4bK7n*UfU=lDS0 zRy0m~;iclaT>tBxO1+zc-Fm&Y)=p#Es&DnOZvX$&`dk}6Z(U{Np^;E!Hv4Z`UER8k z>pXVs-K*=cU{l%d*u>l0?&p}P_x!c1h-PbM+{hHJzvMF<<6vSKK`@DE^z(z(Vhb~x36!U^5E93TSnPiXSFs+y~ypK@Nso&owG`j6jt se5!cGs-sn6!`s{3r&~9kZjP~McoofZ#zaOS9F&7SUHx3vIVCg!08V?WW&i*H literal 0 HcmV?d00001 diff --git a/public/images/emails/heart.png b/public/images/emails/heart.png new file mode 100644 index 0000000000000000000000000000000000000000..f1fb65dad5744706dfb2d274fa5fd027f86731a7 GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~&H|6fVg?3o zVGw3ym^DWNs30;kB%&n3*T*V3KUXg?B|j-uuOhbqsG5Pnrosxy%uOvxRH(?!$t$+1 zuvG%9umZ9{!um=IU?nBlwn`Dc0SeCfMX3s=dM0`XN_Jcd3JNwwDQQ+gE^bimK%T8q zMoCG5mA-y?dAVM>v0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP#GNIXX$YJ0ilN>DdQcxEqi?8Zpbs}2sMQ7}YUN*) znF_QSWWJrD4Ok_L7}OpceURlyj)C|TEDH3h9hZ$hJlO2Gd=9Bc0t5M!r;B5Vg<$U# zTW^^_kv8>pADa^n$SbVzxUxiac8Q?0x1w3uEw8$^2oHlqUdJ5WOR55wmifqPdp@0X zLp$@1f??&nxz*DWcP{>X$oTuc;(OK4&dj~3+ZD9dmc(rZ)2M)gl+{PO?7k`k+dnmo*BlDjovll;kwLb`V zdG2WN*E6zGDw}I@?g?)#TfV`=N2YTuJ*ASjXv^zwIh~>}*7NMk3*Ns8o8B+tj`q7y zVac;@-s%>cMXzpEyt$cHm$!i3+b`hmY?He1b9=A7xVep0zIjvgoIhNzM5>n=e98H5 zoug77E3P?LHtD?grsY;~4f79e;tsKWVH8x)yS_iW_v(gUY`i+l93+(IOCSE+vgCfo zf8OjKdH@gh3eL8_i5P5wQhWq zoONR5uOEfWHcLD|kko4>t(SB0#g#?>l$oO@@p`S+`1-dyuv eKa6v8>2C3j0H>BYgI4C3kP=d#Wzp$PyR>tfFU literal 0 HcmV?d00001 diff --git a/public/images/emails/right_triangle.png b/public/images/emails/right_triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..d377e840e4fd693056435df7180f0f2c9a5907b7 GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~&H|6fVg?3o zVGw3ym^DWNs30;kB%&n3*T*V3KUXg?B|j-uuOhbqsG5Pnrosxy%uOvxRH(?!$t$+1 zuvG%9umZ9{!um=IU?nBlwn`Dc0SeCfMX3s=dM0`XN_Jcd3JNwwDQQ+gE^bimK%T8q zMoCG5mA-y?dAVM>v0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP#GNIXX$YJ0ilN>DdQcxEqi?8Zpbs}2sMQ7}YUN*) znF_QSWWJrD4Ok_L7}OpceURlyj)C|TEDH3h9hZ$hJlO2Gd=9Bc0z-0>r;B5Vh2YxB zjeN}p94=ey_r2YI_3b*RAj#JYrn;<;s Date: Fri, 18 Nov 2016 16:57:23 -0500 Subject: [PATCH 167/266] FIX: digest popular posts need minimum datetime --- app/mailers/user_notifications.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 6a6e3acb14..3894104214 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -108,7 +108,7 @@ class UserNotifications < ActionMailer::Base topics_for_digest = Topic.for_digest(user, min_date, limit: SiteSetting.digest_topics + 3, top_order: true).to_a @popular_topics = topics_for_digest[0,SiteSetting.digest_topics] - @popular_posts = SiteSetting.digest_posts > 0 ? Post.where("post_number > ?", 1).where("score > ?", 5.0).order("score DESC").limit(SiteSetting.digest_posts) : [] + @popular_posts = SiteSetting.digest_posts > 0 ? Post.where("post_number > ? AND score > ? AND created_at > ?", 1, 5.0, min_date).order("score DESC").limit(SiteSetting.digest_posts) : [] @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : [] topic_lookup = TopicUser.lookup_for(user, @other_new_for_you) From c97614bcd200390769ee70cca381585cf6423621 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 18 Nov 2016 15:17:34 -0800 Subject: [PATCH 168/266] copyedit on summary digest --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index eeef7a6c84..de1a1926af 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2434,7 +2434,7 @@ en: unread_notifications: "Unread Notifications" popular_topics: "Popular Topics" follow_topic: "Follow this topic" - join_the_discussion: "Join the discussion" + join_the_discussion: "Read More" popular_posts: "Popular Posts" from_topic_label: "From" more_new: "New in topics and categories you follow" From c86588469fecde53a0f85ea789ec094323b07af5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sat, 19 Nov 2016 08:11:23 +0800 Subject: [PATCH 169/266] UX: Bump limit for "view older notification" link. --- .../javascripts/discourse/widgets/user-notifications.js.es6 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 index 6e07271834..2be1dd832d 100644 --- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 @@ -64,13 +64,14 @@ export default createWidget('user-notifications', { } else if (state.notifications.length) { const notificationItems = state.notifications.map(n => this.attach('notification-item', n)); - const href = `${attrs.path}/notifications`; result.push(h('hr')); const items = [notificationItems]; - if (notificationItems.length > 0) { + if (notificationItems.length > 5) { + const href = `${attrs.path}/notifications`; + items.push( h('li.read.last.heading', h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])), h('hr') From c90376653b129940b3f3b7f80276e91131bb8b27 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Sat, 19 Nov 2016 23:49:31 +0530 Subject: [PATCH 170/266] Update hamburger-menu.js.es6 --- app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index 5fa48a8413..d670a89c6f 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -144,7 +144,7 @@ export default createWidget('hamburger-menu', { label: this.site.mobileView ? "desktop_view" : "mobile_view" }); } - const extraLinks = applyDecorators(this, 'footerLinks', this.attrs, this.state); + const extraLinks = flatten(applyDecorators(this, 'footerLinks', this.attrs, this.state)); return links.concat(extraLinks).map(l => this.attach('link', l)); }, From fe94c5f9a56f6e451121d3cd8ef608aee4be72dd Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Sat, 19 Nov 2016 21:13:25 -0200 Subject: [PATCH 171/266] FIX: Login was broken on mobile --- app/assets/javascripts/discourse/lib/show-modal.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index e34d7398ef..7a3808c266 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -18,7 +18,7 @@ export default function(name, opts) { } else { const templateName = opts.templateName || Ember.String.dasherize(name); - const renderArgs = { into: 'modal', outlet: 'modalBody'}; + const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'}; if (controller) { renderArgs.controller = controllerName; } const modalName = `modal/${templateName}`; @@ -38,4 +38,4 @@ export default function(name, opts) { } return controller; -}; +}; \ No newline at end of file From cba763a162b6ca14edcb59cf1b77ccf3c2d100e7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sun, 20 Nov 2016 10:11:16 +0800 Subject: [PATCH 172/266] Revert "FIX: Login was broken on mobile" This reverts commit fe94c5f9a56f6e451121d3cd8ef608aee4be72dd. --- app/assets/javascripts/discourse/lib/show-modal.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index 7a3808c266..e34d7398ef 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -18,7 +18,7 @@ export default function(name, opts) { } else { const templateName = opts.templateName || Ember.String.dasherize(name); - const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'}; + const renderArgs = { into: 'modal', outlet: 'modalBody'}; if (controller) { renderArgs.controller = controllerName; } const modalName = `modal/${templateName}`; @@ -38,4 +38,4 @@ export default function(name, opts) { } return controller; -}; \ No newline at end of file +}; From c6a4b46b32962170167b8887a623ee1f3a972df5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sun, 20 Nov 2016 10:11:25 +0800 Subject: [PATCH 173/266] FIX: Login modal not showing on mobile. --- .../javascripts/discourse/templates/mobile/modal/login.hbs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs index ee1d5cbcfc..aacaa22bc4 100644 --- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs @@ -1,4 +1,4 @@ -
    +{{#d-modal-body title="login.title" class="login-modal"}} {{login-buttons action="externalLogin"}} {{#if canLoginLocal}} @@ -32,7 +32,8 @@ {{/if}} {{authMessage}}
    {{alert}}
    -
    +{{/d-modal-body}} +
    {{#if authenticate}} {{i18n 'login.authenticating'}} From 18156719bd9cd1494b23dc1f8bc985fddeedade1 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 20 Nov 2016 01:52:08 -0800 Subject: [PATCH 174/266] downsize digest heading font a tad --- app/views/user_notifications/digest.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 0e5aefa9a6..0a499c3254 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -85,7 +85,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
    -
    <%=t 'user_notifications.digest.popular_topics' %>
    +
    <%=t 'user_notifications.digest.popular_topics' %>
    @@ -227,7 +227,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo @@ -299,7 +299,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo <% if @other_new_for_you.present? %> -
    <%=t 'user_notifications.digest.more_new' %>
    +
    <%=t 'user_notifications.digest.more_new' %>
    <%= digest_custom_html("above_popular_topics") %> From 7cb76f7333ed452f89b63d56c97f8164f92debb4 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sun, 20 Nov 2016 17:07:27 +0530 Subject: [PATCH 175/266] FIX: add rel noopener and noreferrer in addition to nofollow --- lib/pretty_text.rb | 4 ++-- spec/components/cooked_post_processor_spec.rb | 8 ++++---- spec/components/pretty_text_spec.rb | 2 +- spec/models/post_analyzer_spec.rb | 2 +- spec/models/post_spec.rb | 4 ++-- spec/models/user_profile_spec.rb | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 3814fd42a0..4ad0c96c3c 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -261,11 +261,11 @@ module PrettyText whitelist.any?{|u| uri.host == u || uri.host.ends_with?("." << u)} # we are good no need for nofollow else - l["rel"] = "nofollow" + l["rel"] = "nofollow noopener noreferrer" end rescue URI::InvalidURIError, URI::InvalidComponentError # add a nofollow anyway - l["rel"] = "nofollow" + l["rel"] = "nofollow noopener noreferrer" end end end diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 86810e5e59..8e95b49e83 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -446,7 +446,7 @@ describe CookedPostProcessor do it "uses schemaless url for uploads" do cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end context "when CDN is enabled" do @@ -454,20 +454,20 @@ describe CookedPostProcessor do it "does use schemaless CDN url for http uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end it "does not use schemaless CDN url for https uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("https://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end it "does not use CDN when login is required" do SiteSetting.login_required = true Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 63577b90e9..0105e0ae04 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -77,7 +77,7 @@ HTML end it "should inject nofollow in all user provided links" do - expect(PrettyText.cook('cnn')).to match(/nofollow/) + expect(PrettyText.cook('cnn')).to match(/nofollow noopener noreferrer/) end it "should not inject nofollow in all local links" do diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb index 6bfe2f9cb8..8b549af717 100644 --- a/spec/models/post_analyzer_spec.rb +++ b/spec/models/post_analyzer_spec.rb @@ -200,7 +200,7 @@ describe PostAnalyzer do it "ignores oneboxes" do post_analyzer = PostAnalyzer.new("Hello @Jake\n#{url}", default_topic_id) - post_analyzer.stubs(:cook).returns("

    Hello @Jake
    @Finn

    ") + post_analyzer.stubs(:cook).returns("

    Hello @Jake
    @Finn

    ") expect(post_analyzer.raw_mentions).to eq(['jake']) end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index e70f176d4a..0ce0ce9c57 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -812,7 +812,7 @@ describe Post do it "should add nofollow to links in the post for trust levels below 3" do post.user.trust_level = 2 post.save - expect(post.cooked).to match(/nofollow/) + expect(post.cooked).to match(/nofollow noopener noreferrer/) end it "when tl3_links_no_follow is false, should not add nofollow for trust level 3 and higher" do @@ -826,7 +826,7 @@ describe Post do SiteSetting.stubs(:tl3_links_no_follow).returns(true) post.user.trust_level = 3 post.save - expect(post.cooked).to match(/nofollow/) + expect(post.cooked).to match(/nofollow noopener noreferrer/) end end diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb index 620b79e12b..90918ffe15 100644 --- a/spec/models/user_profile_spec.rb +++ b/spec/models/user_profile_spec.rb @@ -121,8 +121,8 @@ describe UserProfile do it 'includes the link as nofollow if the user is not new' do user.user_profile.send(:cook) - expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end it 'removes the link if the user is new' do @@ -160,8 +160,8 @@ describe UserProfile do created_user.save created_user.reload created_user.change_trust_level!(TrustLevel[2]) - expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(created_user.user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(created_user.user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end end @@ -171,8 +171,8 @@ describe UserProfile do it 'includes the link with nofollow if the user is trust level 3 or higher' do user.trust_level = TrustLevel[3] user_profile.send(:cook) - expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end end end From 2d0c99636af1a74d6046541361f0652c96e08030 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sun, 20 Nov 2016 18:19:14 +0530 Subject: [PATCH 176/266] do not add rel noreferrer --- lib/pretty_text.rb | 4 ++-- spec/components/cooked_post_processor_spec.rb | 8 ++++---- spec/components/pretty_text_spec.rb | 2 +- spec/models/post_analyzer_spec.rb | 2 +- spec/models/post_spec.rb | 4 ++-- spec/models/user_profile_spec.rb | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 4ad0c96c3c..71f68d173c 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -261,11 +261,11 @@ module PrettyText whitelist.any?{|u| uri.host == u || uri.host.ends_with?("." << u)} # we are good no need for nofollow else - l["rel"] = "nofollow noopener noreferrer" + l["rel"] = "nofollow noopener" end rescue URI::InvalidURIError, URI::InvalidComponentError # add a nofollow anyway - l["rel"] = "nofollow noopener noreferrer" + l["rel"] = "nofollow noopener" end end end diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 8e95b49e83..46db958932 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -446,7 +446,7 @@ describe CookedPostProcessor do it "uses schemaless url for uploads" do cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end context "when CDN is enabled" do @@ -454,20 +454,20 @@ describe CookedPostProcessor do it "does use schemaless CDN url for http uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end it "does not use schemaless CDN url for https uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("https://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end it "does not use CDN when login is required" do SiteSetting.login_required = true Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' + expect(cpp.html).to match_html '

    Link

    Google

    text.txt (20 Bytes)
    :smile:

    ' end end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 0105e0ae04..6066d93e02 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -77,7 +77,7 @@ HTML end it "should inject nofollow in all user provided links" do - expect(PrettyText.cook('cnn')).to match(/nofollow noopener noreferrer/) + expect(PrettyText.cook('cnn')).to match(/nofollow noopener/) end it "should not inject nofollow in all local links" do diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb index 8b549af717..91cefd382b 100644 --- a/spec/models/post_analyzer_spec.rb +++ b/spec/models/post_analyzer_spec.rb @@ -200,7 +200,7 @@ describe PostAnalyzer do it "ignores oneboxes" do post_analyzer = PostAnalyzer.new("Hello @Jake\n#{url}", default_topic_id) - post_analyzer.stubs(:cook).returns("

    Hello @Jake
    @Finn

    ") + post_analyzer.stubs(:cook).returns("

    Hello @Jake
    @Finn

    ") expect(post_analyzer.raw_mentions).to eq(['jake']) end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 0ce0ce9c57..1e827c0e6d 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -812,7 +812,7 @@ describe Post do it "should add nofollow to links in the post for trust levels below 3" do post.user.trust_level = 2 post.save - expect(post.cooked).to match(/nofollow noopener noreferrer/) + expect(post.cooked).to match(/nofollow noopener/) end it "when tl3_links_no_follow is false, should not add nofollow for trust level 3 and higher" do @@ -826,7 +826,7 @@ describe Post do SiteSetting.stubs(:tl3_links_no_follow).returns(true) post.user.trust_level = 3 post.save - expect(post.cooked).to match(/nofollow noopener noreferrer/) + expect(post.cooked).to match(/nofollow noopener/) end end diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb index 90918ffe15..d6b2c6ac01 100644 --- a/spec/models/user_profile_spec.rb +++ b/spec/models/user_profile_spec.rb @@ -121,8 +121,8 @@ describe UserProfile do it 'includes the link as nofollow if the user is not new' do user.user_profile.send(:cook) - expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end it 'removes the link if the user is new' do @@ -160,8 +160,8 @@ describe UserProfile do created_user.save created_user.reload created_user.change_trust_level!(TrustLevel[2]) - expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(created_user.user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(created_user.user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end end @@ -171,8 +171,8 @@ describe UserProfile do it 'includes the link with nofollow if the user is trust level 3 or higher' do user.trust_level = TrustLevel[3] user_profile.send(:cook) - expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") - expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") + expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org") + expect(user_profile.bio_processed).to match_html("

    I love http://discourse.org

    ") end end end From 3909f342f67c20e9a62ef85bd6ad7a652a74ced5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 21 Nov 2016 10:20:31 +0800 Subject: [PATCH 177/266] FEATURE: Allow options to be set when adding model callbacks. --- lib/plugin/instance.rb | 5 +-- spec/components/plugin/instance_spec.rb | 45 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index 199c3af035..a41ab8af8c 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -112,7 +112,7 @@ class Plugin::Instance end end - def add_model_callback(klass, callback, &block) + def add_model_callback(klass, callback, options = {}, &block) klass = klass.to_s.classify.constantize rescue klass.to_s.constantize plugin = self @@ -122,10 +122,11 @@ class Plugin::Instance hidden_method_name = :"#{method_name}_without_enable_check" klass.send(:define_method, hidden_method_name, &block) - klass.send(callback) do |*args| + klass.send(callback, options) do |*args| send(hidden_method_name, *args) if plugin.enabled? end + hidden_method_name end # Add validation method but check that the plugin is enabled diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb index 2e99df132a..d5c7150850 100644 --- a/spec/components/plugin/instance_spec.rb +++ b/spec/components/plugin/instance_spec.rb @@ -191,4 +191,49 @@ describe Plugin::Instance do end end + describe '#add_model_callback' do + let(:metadata) do + metadata = Plugin::Metadata.new + metadata.name = 'test' + metadata + end + + let(:plugin_instance) do + plugin = Plugin::Instance.new(nil, "/tmp/test.rb") + plugin.metadata = metadata + plugin + end + + it 'should add the right callback' do + called = 0 + + method_name = plugin_instance.add_model_callback(User, :after_create) do + called += 1 + end + + user = Fabricate(:user) + + expect(called).to eq(1) + + user.update_attributes!(username: 'some_username') + + expect(called).to eq(1) + end + + it 'should add the right callback with options' do + called = 0 + + method_name = plugin_instance.add_model_callback(User, :after_commit, on: :create) do + called += 1 + end + + user = Fabricate(:user) + + expect(called).to eq(1) + + user.update_attributes!(username: 'some_username') + + expect(called).to eq(1) + end + end end From e2c87da42a07d24c6c2321b077f5371f3e54b160 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 21 Nov 2016 16:46:02 +1100 Subject: [PATCH 178/266] FEATURE: Add basic support for Safe Mode In Safe Mode all JS extensions and site customizations are disabled. To access Safe Mode visit `sitename.org/safe-mode` --- .../discourse/components/global-notice.js.es6 | 4 +++ app/controllers/safe_mode_controller.rb | 20 +++++++++++++ app/helpers/application_helper.rb | 13 ++++++++- .../common/_discourse_javascript.html.erb | 3 ++ app/views/layouts/application.html.erb | 4 +++ app/views/safe_mode/index.html.erb | 29 +++++++++++++++++++ config/locales/client.en.yml | 4 +++ config/locales/server.en.yml | 7 +++++ config/routes.rb | 3 ++ 9 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 app/controllers/safe_mode_controller.rb create mode 100644 app/views/safe_mode/index.html.erb diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 0b291384c6..d3ae423548 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -9,6 +9,10 @@ export default Ember.Component.extend(bufferedRender({ buildBuffer(buffer) { let notices = []; + if (this.session.get('safe_mode')) { + notices.push([I18n.t("safe_mode.enabled"), 'safe-mode']); + } + if (this.site.get("isReadOnly")) { notices.push([I18n.t("read_only_mode.enabled"), 'alert-read-only']); } diff --git a/app/controllers/safe_mode_controller.rb b/app/controllers/safe_mode_controller.rb new file mode 100644 index 0000000000..d414f141b7 --- /dev/null +++ b/app/controllers/safe_mode_controller.rb @@ -0,0 +1,20 @@ +class SafeModeController < ApplicationController + layout 'no_ember' + skip_before_filter :preload_json, :check_xhr + + def index + end + + def enter + safe_mode = [] + safe_mode << "no_custom" if params["no_customizations"] == "true" + safe_mode << "no_plugins" if params["no_plugins"] == "true" + safe_mode << "only_official" if params["only_official"] == "true" + + if safe_mode.length > 0 + redirect_to path("/?safe_mode=#{safe_mode.join("%2C")}") + else + redirect_to :index + end + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8d313386cb..07d7ce951c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -241,7 +241,18 @@ module ApplicationHelper end def customization_disabled? - session[:disable_customization] + safe_mode = params["safe_mode"] + session[:disable_customization] || (safe_mode && safe_mode.include?("no_custom")) + end + + def allow_plugins? + safe_mode = params["safe_mode"] + !(safe_mode && safe_mode.include?("no_plugins")) + end + + def allow_third_party_plugins? + safe_mode = params["safe_mode"] + !(safe_mode && (safe_mode.include?("no_plugins") || safe_mode.include?("only_official"))) end def loading_admin? diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb index c337c56a86..c214d5e1fd 100644 --- a/app/views/common/_discourse_javascript.html.erb +++ b/app/views/common/_discourse_javascript.html.erb @@ -52,6 +52,9 @@ Discourse.start(); Discourse.set('assetVersion','<%= Discourse.assets_digest %>'); Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>); + <%- if params["safe_mode"] %> + Discourse.Session.currentProp("safe_mode", <%= params["safe_mode"].inspect.html_safe %>); + <%- end %> Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>; <%- if SiteSetting.enable_s3_uploads %> <%- if SiteSetting.s3_cdn_url.present? %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8cdb11cc51..178fd7cbd8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,8 +28,12 @@ <%= script "vendor" %> <%= script "pretty-text-bundle" %> <%= script "application" %> + <%- if allow_plugins? %> <%= script "plugin" %> + <%- end %> + <%- if allow_third_party_plugins? %> <%= script "plugin-third-party" %> + <%- end %> <%- if staff? %> diff --git a/app/views/safe_mode/index.html.erb b/app/views/safe_mode/index.html.erb new file mode 100644 index 0000000000..4908bf23b3 --- /dev/null +++ b/app/views/safe_mode/index.html.erb @@ -0,0 +1,29 @@ +
    +

    <%= t 'safe_mode.title'%>

    + <%= form_tag(safe_mode_enter_path) do %> +

    + <%= t 'safe_mode.description' %> +

    +

    + +

    +

    + +

    +

    + +

    +

    + <%= submit_tag t('safe_mode.enter'), class: 'btn btn-danger' %> +

    + <% end %> +
    diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a5d7578c29..9753f74224 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2308,6 +2308,10 @@ en: custom_message_template_forum: "Hey, you should join this forum!" custom_message_template_topic: "Hey, I thought you might enjoy this topic!" + safe_mode: + enabled: "Safe mode is enabled, to exit safe mode close this browser window" + + # This section is exported to the javascript for i18n in the admin section admin_js: type_to_filter: "type to filter..." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index de1a1926af..6f0d5c1702 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3222,6 +3222,13 @@ en: title: "Resend Activation Email" message: "

    We've re-sent the activation email to %{email}" + safe_mode: + title: "Enter safe mode" + description: "Safe mode allows you to test your site without loading plugins or site customizations." + no_customizations: "Disable all site customizations" + only_official: "Disable unofficial plugins" + no_plugins: "Disable all plugins" + enter: "Enter Safe Mode" wizard: title: "Discourse Setup" step: diff --git a/config/routes.rb b/config/routes.rb index 61f05947a3..b511a21036 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -699,6 +699,9 @@ Discourse::Application.routes.draw do post "/user-api-key/revoke" => "user_api_keys#revoke" post "/user-api-key/undo-revoke" => "user_api_keys#undo_revoke" + get "/safe-mode" => "safe_mode#index" + post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter" + get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new end From 07717dfaa79f139a722051122172404971e4f592 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 21 Nov 2016 14:33:17 +0800 Subject: [PATCH 179/266] FIX: Emoji not rendering using plugin api. --- app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 86ffc6c57b..2908549293 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -94,8 +94,8 @@ class PluginApi { } else if (result.emoji) { iconBody = result.emoji.split('|').map(name => { let widgetAttrs = { name }; - if (result.title) widgetAttrs.title = true; - dec.attach('emoji', widgetAttrs); + if (result.emojiTitle) widgetAttrs.title = true; + return dec.attach('emoji', widgetAttrs); }); } From 1de28ce8be78d9ca3808b67d4d15ef8b89eccc3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 21 Nov 2016 17:20:55 +0100 Subject: [PATCH 180/266] bump onebox --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2268365ad..9888729c67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.64) + onebox (1.5.65) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From 24fb060f5078bde1baa60727c1a67067c75d1fc0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 11:34:31 -0500 Subject: [PATCH 181/266] Remove private `Ember.TargetActionSupport` usage --- app/assets/javascripts/discourse/mixins/load-more.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6 index c422e1cd63..d83725f790 100644 --- a/app/assets/javascripts/discourse/mixins/load-more.js.es6 +++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6 @@ -3,7 +3,7 @@ import Scrolling from 'discourse/mixins/scrolling'; import { on } from 'ember-addons/ember-computed-decorators'; // Provides the ability to load more items for a view which is scrolled to the bottom. -export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { +export default Ember.Mixin.create(Scrolling, { scrolled() { const eyeline = this.get('eyeline'); From dffefcaa6aa85cd03b7aab3d3077ba2963b62b86 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 21 Nov 2016 11:07:24 -0500 Subject: [PATCH 182/266] FIX: links in digest with href="#" --- app/views/user_notifications/digest.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 0a499c3254..bb53b3df6e 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -317,7 +317,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo

    From 47be1a8be92d65592cbda9193c5f34336f23708d Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 21 Nov 2016 11:09:38 -0500 Subject: [PATCH 183/266] FIX: digest email: put topic title and category in the same column in the "New in ... you follow" section --- app/views/user_notifications/digest.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index bb53b3df6e..66a108b8b5 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -320,8 +320,6 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo <%= t.title -%> - - <% end %> From 28061316ade83d42d543cff981543510ee6ec1c3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 14:49:00 -0500 Subject: [PATCH 185/266] Migrate poll plugin to use components --- .../discourse-poll.js.es6} | 19 +++++++++---- .../discourse-poll.hbs} | 0 .../initializers/extend-for-poll.js.es6 | 28 ++++++------------- .../poll/assets/javascripts/views/poll.js.es6 | 12 -------- .../controllers/poll-ui-builder-test.js.es6 | 27 +++++------------- 5 files changed, 29 insertions(+), 57 deletions(-) rename plugins/poll/assets/javascripts/{controllers/poll.js.es6 => components/discourse-poll.js.es6} (89%) rename plugins/poll/assets/javascripts/discourse/templates/{poll.hbs => components/discourse-poll.hbs} (100%) delete mode 100644 plugins/poll/assets/javascripts/views/poll.js.es6 diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/components/discourse-poll.js.es6 similarity index 89% rename from plugins/poll/assets/javascripts/controllers/poll.js.es6 rename to plugins/poll/assets/javascripts/components/discourse-poll.js.es6 index ba1f840e67..7b3cae9dce 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/components/discourse-poll.js.es6 @@ -1,7 +1,16 @@ -import { ajax } from 'discourse/lib/ajax'; import { default as computed, observes } from "ember-addons/ember-computed-decorators"; +import { ajax } from 'discourse/lib/ajax'; + +export default Ember.Component.extend({ + layoutName: 'components/discourse-poll', + classNames: ["poll"], + attributeBindings: ["data-poll-type", "data-poll-name", "data-poll-status", "data-poll-public"], + + "data-poll-type": Ember.computed.alias("poll.type"), + "data-poll-name": Ember.computed.alias("poll.name"), + "data-poll-status": Ember.computed.alias("poll.status"), + "data-poll-public": Ember.computed.alias("poll.public"), -export default Ember.Controller.extend({ isMultiple: Ember.computed.equal("poll.type", "multiple"), isNumber: Ember.computed.equal("poll.type", "number"), isClosed: Ember.computed.equal("poll.status", "closed"), @@ -11,10 +20,10 @@ export default Ember.Controller.extend({ // - poll is closed // - topic is archived // - user wants to see the results - showingResults: Em.computed.or("isClosed", "post.topic.archived", "showResults"), + showingResults: Ember.computed.or("isClosed", "post.topic.archived", "showResults"), - showResultsDisabled: Em.computed.equal("poll.voters", 0), - hideResultsDisabled: Em.computed.or("isClosed", "post.topic.archived"), + showResultsDisabled: Ember.computed.equal("poll.voters", 0), + hideResultsDisabled: Ember.computed.or("isClosed", "post.topic.archived"), @observes("post.polls") _updatePoll() { diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/discourse-poll.hbs similarity index 100% rename from plugins/poll/assets/javascripts/discourse/templates/poll.hbs rename to plugins/poll/assets/javascripts/discourse/templates/components/discourse-poll.hbs diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 index e0d64d3ce7..3141d15397 100644 --- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 +++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 @@ -1,20 +1,10 @@ import { withPluginApi } from 'discourse/lib/plugin-api'; import { observes } from "ember-addons/ember-computed-decorators"; -function createPollView(container, post, poll, vote, publicPoll) { - const controller = container.lookup("controller:poll", { singleton: false }); - const view = container.lookup("view:poll"); - - controller.setProperties({ - model: poll, - vote: vote, - public: publicPoll, - post - }); - - view.set("controller", controller); - - return view; +function createPollComponent(container, post, poll, vote) { + const component = container.lookup("component:discourse-poll"); + component.setProperties({ model: poll, vote, post }); + return component; } let _pollViews; @@ -89,20 +79,18 @@ function initializePolls(api) { const $poll = $(pollElem); const pollName = $poll.data("poll-name"); - const publicPoll = $poll.data("poll-public"); const pollId = `${pollName}-${post.id}`; - const pollView = createPollView( + const pollComponent = createPollComponent( helper.container, post, polls[pollName], - votes[pollName], - publicPoll + votes[pollName] ); $poll.replaceWith($div); - Em.run.schedule('afterRender', () => pollView.renderer.replaceIn(pollView, $div[0])); - postPollViews[pollId] = pollView; + Em.run.schedule('afterRender', () => pollComponent.renderer.replaceIn(pollComponent, $div[0])); + postPollViews[pollId] = pollComponent; }); _pollViews = postPollViews; diff --git a/plugins/poll/assets/javascripts/views/poll.js.es6 b/plugins/poll/assets/javascripts/views/poll.js.es6 deleted file mode 100644 index c9d6e632e3..0000000000 --- a/plugins/poll/assets/javascripts/views/poll.js.es6 +++ /dev/null @@ -1,12 +0,0 @@ -export default Em.View.extend({ - templateName: "poll", - classNames: ["poll"], - attributeBindings: ["data-poll-type", "data-poll-name", "data-poll-status", "data-poll-public"], - - poll: Em.computed.alias("controller.poll"), - - "data-poll-type": Em.computed.alias("poll.type"), - "data-poll-name": Em.computed.alias("poll.name"), - "data-poll-status": Em.computed.alias("poll.status"), - "data-poll-public": Em.computed.alias("poll.public") -}); diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 index 1e9446d90e..60c50ca58f 100644 --- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 +++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 @@ -3,6 +3,9 @@ import { mapRoutes } from 'discourse/mapping-router'; moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", { setup() { this.registry.register('router:main', mapRoutes()); + this.subject().set('toolbarEvent', { + getText: () => "" + }); }, needs: ['controller:modal'] }); @@ -170,21 +173,13 @@ test("number pollOutput", function() { equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); - controller.set("pollName", 'test'); - - equal(controller.get("pollOutput"), "[poll name=test type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); - - controller.set("pollName", ' test poll more '); - - equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); - controller.set("pollStep", 2); - equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output"); controller.set("publicPoll", true); - equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output"); }); test("regular pollOutput", function() { @@ -196,13 +191,9 @@ test("regular pollOutput", function() { equal(controller.get("pollOutput"), "[poll]\n* 1\n* 2\n[/poll]", "it should return the right output"); - controller.set("pollName", "test"); - - equal(controller.get("pollOutput"), "[poll name=test]\n* 1\n* 2\n[/poll]", "it should return the right output"); - controller.set("publicPoll", "true"); - equal(controller.get("pollOutput"), "[poll name=test public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); }); @@ -220,11 +211,7 @@ test("multiple pollOutput", function() { equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output"); - controller.set("pollName", "test"); - - equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output"); - controller.set("publicPoll", "true"); - equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); }); From 2c585783ff90727141074f0fe924fc454b85afe3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 15:10:36 -0500 Subject: [PATCH 186/266] Convert TopicView to component --- .../discourse-topic.js.es6} | 71 ++- .../javascripts/discourse/templates/topic.hbs | 424 +++++++++--------- 2 files changed, 244 insertions(+), 251 deletions(-) rename app/assets/javascripts/discourse/{views/topic.js.es6 => components/discourse-topic.js.es6} (79%) diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 similarity index 79% rename from app/assets/javascripts/discourse/views/topic.js.es6 rename to app/assets/javascripts/discourse/components/discourse-topic.js.es6 index 4e91f70650..5d5c629933 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 @@ -2,13 +2,24 @@ import AddArchetypeClass from 'discourse/mixins/add-archetype-class'; import ClickTrack from 'discourse/lib/click-track'; import Scrolling from 'discourse/mixins/scrolling'; import { selectedText } from 'discourse/lib/utilities'; +import { observes } from 'ember-addons/ember-computed-decorators'; -const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { - templateName: 'topic', - topic: Ember.computed.alias('controller.model'), +function highlight(postNumber) { + const $contents = $(`#post_${postNumber} .topic-body`), + origColor = $contents.data('orig-color') || $contents.css('backgroundColor'); + $contents.data("orig-color", origColor) + .addClass('highlighted') + .stop() + .animate({ backgroundColor: origColor }, 2500, 'swing', function() { + $contents.removeClass('highlighted'); + $contents.css({'background-color': ''}); + }); +} + +export default Ember.Component.extend(AddArchetypeClass, Scrolling, { userFilters: Ember.computed.alias('topic.userFilters'), - classNameBindings: ['controller.multiSelect:multi-select', + classNameBindings: ['multiSelect', 'topic.archetype', 'topic.is_warning', 'topic.category.read_restricted:read_restricted', @@ -17,30 +28,26 @@ const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { menuVisible: true, SHORT_POST: 1200, - postStream: Em.computed.alias('topic.postStream'), - archetype: Em.computed.alias('topic.archetype'), + postStream: Ember.computed.alias('topic.postStream'), + archetype: Ember.computed.alias('topic.archetype'), _lastShowTopic: null, - _composeChanged: function() { - const composerController = Discourse.get('router.composerController'); - composerController.clearState(); - composerController.set('topic', this.get('topic')); - }.observes('composer'), - - _enteredTopic: function() { + @observes('enteredAt') + _enteredTopic() { // Ember is supposed to only call observers when values change but something // in our view set up is firing this observer with the same value. This check // prevents scrolled from being called twice. - const enteredAt = this.get('controller.enteredAt'); + const enteredAt = this.get('enteredAt'); if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) { this._lastShowTopic = null; this.scrolled(); this.set('lastEnteredAt', enteredAt); } - }.observes('controller.enteredAt'), + }, - _inserted: function() { + didInsertElement() { + this._super(); this.bindScrolling({name: 'topic-view'}); $(window).on('resize.discourse-on-scroll', () => this.scrolled()); @@ -63,10 +70,10 @@ const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { this.appEvents.on('post:highlight', postNumber => { Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); }); - }.on('didInsertElement'), + }, - // This view is being removed. Shut down operations - _destroyed: function() { + willDestroyElement() { + this._super(); this.unbindScrolling('topic-view'); $(window).unbind('resize.discourse-on-scroll'); @@ -79,15 +86,16 @@ const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { this.appEvents.trigger('header:hide-topic'); this.appEvents.off('post:highlight'); - }.on('willDestroyElement'), + }, - gotFocus: function() { + @observes('Discourse.hasFocus') + gotFocus() { if (Discourse.get('hasFocus')){ this.scrolled(); } - }.observes("Discourse.hasFocus"), + }, - resetExamineDockCache: function() { + resetExamineDockCache() { this.set('docAt', false); }, @@ -113,7 +121,7 @@ const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { } } - this.set('controller.hasScrolled', offset > 0); + this.set('hasScrolled', offset > 0); const topic = this.get('topic'); const showTopic = this.showTopicInHeader(topic, offset); @@ -131,18 +139,3 @@ const TopicView = Ember.View.extend(AddArchetypeClass, Scrolling, { this.appEvents.trigger('topic:scrolled', offset); } }); - -function highlight(postNumber) { - const $contents = $(`#post_${postNumber} .topic-body`), - origColor = $contents.data('orig-color') || $contents.css('backgroundColor'); - - $contents.data("orig-color", origColor) - .addClass('highlighted') - .stop() - .animate({ backgroundColor: origColor }, 2500, 'swing', function() { - $contents.removeClass('highlighted'); - $contents.css({'background-color': ''}); - }); -} - -export default TopicView; diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 8a8710f332..dc30bd9395 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -1,233 +1,233 @@ - -{{#if model}} - {{add-category-class category=model.category}} -
    - {{discourse-banner user=currentUser banner=site.banner overlay=hasScrolled hide=model.errorLoading}} -
    -{{/if}} - -{{plugin-outlet "topic-above-post-stream"}} - -{{#if model.postStream.loaded}} - {{#if model.postStream.firstPostPresent}} -
    -
    - -
    - {{#if editingTopic}} - {{#if model.isPrivateMessage}} - {{fa-icon "envelope"}} - {{/if}} - - {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}} - {{#if showCategoryChooser}} -
    - {{category-chooser valueAttribute="id" value=buffered.category_id}} - {{/if}} - - {{#if canEditTags}} -
    - {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}} - {{/if}} - - {{plugin-outlet "edit-topic"}} - - {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} - {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} - {{else}} -

    - {{#unless model.is_warning}} - - {{fa-icon "envelope"}} - - {{/unless}} - - {{#if model.details.loaded}} - {{topic-status topic=model}} - - {{{model.fancyTitle}}} - - {{/if}} - - {{#if model.details.can_edit}} - {{fa-icon "pencil"}} - {{/if}} -

    - - {{#unless model.isPrivateMessage}} - {{topic-category topic=model class="topic-category"}} - {{/unless}} - {{/if}} -
    - {{plugin-outlet "topic-title"}} -
    +{{#discourse-topic multiSelect=multiSelect enteredAt=enteredAt topic=model hasScrolled=hasScrolled}} + {{#if model}} + {{add-category-class category=model.category}} +
    + {{discourse-banner user=currentUser banner=site.banner overlay=hasScrolled hide=model.errorLoading}}
    {{/if}} -
    -
    - {{partial "selected-posts"}} -
    + {{plugin-outlet "topic-above-post-stream"}} - {{#topic-navigation jumpToIndex="jumpToIndex" as |info|}} + {{#if model.postStream.loaded}} + {{#if model.postStream.firstPostPresent}} +
    +
    - {{#if info.renderAdminMenuButton}} - {{topic-admin-menu-button topic=model fixed="true" delegated=topicDelegated}} - {{/if}} - - {{#if info.renderTimeline}} - {{topic-timeline topic=model - prevEvent=info.prevEvent - fullscreen=info.topicProgressExpanded - enteredIndex=enteredIndex - loading=model.postStream.loading - delegated=topicDelegated}} - - {{else}} - {{topic-progress prevEvent=info.prevEvent topic=model delegated=topicDelegated expanded=info.topicProgressExpanded}} - {{/if}} - - - {{/topic-navigation}} - -
    -
    - -
    - {{conditional-loading-spinner condition=model.postStream.loadingAbove}} - - {{plugin-outlet "topic-above-posts"}} - - {{#unless model.postStream.loadingFilter}} - {{scrolling-post-stream - posts=postsToRender - canCreatePost=model.details.can_create_post - multiSelect=multiSelect - selectedPostsCount=selectedPostsCount - selectedQuery=selectedQuery - gaps=model.postStream.gaps - showFlags="showFlags" - editPost="editPost" - showHistory="showHistory" - showLogin="showLogin" - showRawEmail="showRawEmail" - deletePost="deletePost" - recoverPost="recoverPost" - expandHidden="expandHidden" - newTopicAction="replyAsNewTopic" - expandFirstPost="expandFirstPost" - toggleBookmark="toggleBookmark" - togglePostType="togglePostType" - rebakePost="rebakePost" - changePostOwner="changePostOwner" - unhidePost="unhidePost" - replyToPost="replyToPost" - toggleWiki="toggleWiki" - toggleSummary="toggleSummary" - removeAllowedUser="removeAllowedUser" - removeAllowedGroup="removeAllowedGroup" - showInvite="showInvite" - topVisibleChanged="topVisibleChanged" - currentPostChanged="currentPostChanged" - currentPostScrolled="currentPostScrolled" - bottomVisibleChanged="bottomVisibleChanged" - selectPost="toggledSelectedPost" - selectReplies="toggledSelectedPostReplies" - fillGapBefore="fillGapBefore" - fillGapAfter="fillGapAfter"}} - {{/unless}} - - {{conditional-loading-spinner condition=model.postStream.loadingBelow}} -
    -
    - - {{#conditional-loading-spinner condition=model.postStream.loadingFilter}} - {{#if loadedAllPosts}} - - {{topic-closing topic=model}} - {{#if session.showSignupCta}} - {{! replace "Log In to Reply" with the infobox }} - {{signup-cta}} - {{else}} - {{#if currentUser}} - {{topic-footer-buttons topic=model topicDelegated=topicDelegated}} - {{else}} - {{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.title"}} +
    + {{#if editingTopic}} + {{#if model.isPrivateMessage}} + {{fa-icon "envelope"}} {{/if}} - {{/if}} - {{#if model.pending_posts_count}} -
    - {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}} + {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}} + {{#if showCategoryChooser}} +
    + {{category-chooser valueAttribute="id" value=buffered.category_id}} + {{/if}} - {{#if currentUser.show_queued_posts}} - {{#link-to "queued-posts"}} - {{fa-icon "check"}} - {{i18n "queue.view_pending"}} - {{/link-to}} + {{#if canEditTags}} +
    + {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}} + {{/if}} + + {{plugin-outlet "edit-topic"}} + + {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} + {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} + {{else}} +

    + {{#unless model.is_warning}} + + {{fa-icon "envelope"}} + + {{/unless}} + + {{#if model.details.loaded}} + {{topic-status topic=model}} + + {{{model.fancyTitle}}} + {{/if}} -

    + + {{#if model.details.can_edit}} + {{fa-icon "pencil"}} + {{/if}} + + + {{#unless model.isPrivateMessage}} + {{topic-category topic=model class="topic-category"}} + {{/unless}} {{/if}} +
    + {{plugin-outlet "topic-title"}} +
    +
    + {{/if}} - {{#if showSelectedPostsAtBottom}} -
    - {{partial "selected-posts"}} -
    - {{/if}} +
    +
    + {{partial "selected-posts"}} +
    - {{plugin-outlet "topic-above-suggested"}} + {{#topic-navigation jumpToIndex="jumpToIndex" as |info|}} - {{#if model.details.suggested_topics.length}} -
    -

    {{{suggestedTitle}}}

    -
    - {{#if model.isPrivateMessage}} - {{basic-topic-list hideCategory="true" - showPosters="true" - topics=model.details.suggested_topics}} - {{else}} - {{basic-topic-list topics=model.details.suggested_topics}} + {{#if info.renderAdminMenuButton}} + {{topic-admin-menu-button topic=model fixed="true" delegated=topicDelegated}} + {{/if}} + + {{#if info.renderTimeline}} + {{topic-timeline topic=model + prevEvent=info.prevEvent + fullscreen=info.topicProgressExpanded + enteredIndex=enteredIndex + loading=model.postStream.loading + delegated=topicDelegated}} + + {{else}} + {{topic-progress prevEvent=info.prevEvent topic=model delegated=topicDelegated expanded=info.topicProgressExpanded}} + {{/if}} + + + {{/topic-navigation}} + +
    +
    + +
    + {{conditional-loading-spinner condition=model.postStream.loadingAbove}} + + {{plugin-outlet "topic-above-posts"}} + + {{#unless model.postStream.loadingFilter}} + {{scrolling-post-stream + posts=postsToRender + canCreatePost=model.details.can_create_post + multiSelect=multiSelect + selectedPostsCount=selectedPostsCount + selectedQuery=selectedQuery + gaps=model.postStream.gaps + showFlags="showFlags" + editPost="editPost" + showHistory="showHistory" + showLogin="showLogin" + showRawEmail="showRawEmail" + deletePost="deletePost" + recoverPost="recoverPost" + expandHidden="expandHidden" + newTopicAction="replyAsNewTopic" + expandFirstPost="expandFirstPost" + toggleBookmark="toggleBookmark" + togglePostType="togglePostType" + rebakePost="rebakePost" + changePostOwner="changePostOwner" + unhidePost="unhidePost" + replyToPost="replyToPost" + toggleWiki="toggleWiki" + toggleSummary="toggleSummary" + removeAllowedUser="removeAllowedUser" + removeAllowedGroup="removeAllowedGroup" + showInvite="showInvite" + topVisibleChanged="topVisibleChanged" + currentPostChanged="currentPostChanged" + currentPostScrolled="currentPostScrolled" + bottomVisibleChanged="bottomVisibleChanged" + selectPost="toggledSelectedPost" + selectReplies="toggledSelectedPostReplies" + fillGapBefore="fillGapBefore" + fillGapAfter="fillGapAfter"}} + {{/unless}} + + {{conditional-loading-spinner condition=model.postStream.loadingBelow}} +
    +
    + + {{#conditional-loading-spinner condition=model.postStream.loadingFilter}} + {{#if loadedAllPosts}} + + {{topic-closing topic=model}} + {{#if session.showSignupCta}} + {{! replace "Log In to Reply" with the infobox }} + {{signup-cta}} + {{else}} + {{#if currentUser}} + {{topic-footer-buttons topic=model topicDelegated=topicDelegated}} + {{else}} + {{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.title"}} + {{/if}} + {{/if}} + + {{#if model.pending_posts_count}} +
    + {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}} + + {{#if currentUser.show_queued_posts}} + {{#link-to "queued-posts"}} + {{fa-icon "check"}} + {{i18n "queue.view_pending"}} + {{/link-to}} {{/if}}
    -

    {{{browseMoreMessage}}}

    -
    + {{/if}} + + {{#if showSelectedPostsAtBottom}} +
    + {{partial "selected-posts"}} +
    + {{/if}} + + {{plugin-outlet "topic-above-suggested"}} + + {{#if model.details.suggested_topics.length}} +
    +

    {{{suggestedTitle}}}

    +
    + {{#if model.isPrivateMessage}} + {{basic-topic-list hideCategory="true" + showPosters="true" + topics=model.details.suggested_topics}} + {{else}} + {{basic-topic-list topics=model.details.suggested_topics}} + {{/if}} +
    +

    {{{browseMoreMessage}}}

    +
    + {{/if}} + {{/if}} + {{/conditional-loading-spinner}} - {{/if}} - {{/conditional-loading-spinner}} + +
    -
    + {{else}} +
    + {{#conditional-loading-spinner condition=noErrorYet}} + {{#if model.notFoundHtml}} +
    {{{model.notFoundHtml}}}
    + {{else}} +
    +
    {{model.message}}
    + {{#if model.noRetry}} + {{#unless currentUser}} + {{d-button action="showLogin" class="btn-primary topic-retry" icon="user" label="log_in"}} + {{/unless}} + {{else}} + {{d-button action="retryLoading" class="btn-primary topic-retry" icon="refresh" label="errors.buttons.again"}} + {{/if}} +
    + {{conditional-loading-spinner condition=retrying}} + {{/if}} + {{/conditional-loading-spinner}} +
    + {{/if}} -
    -{{else}} -
    - {{#conditional-loading-spinner condition=noErrorYet}} - {{#if model.notFoundHtml}} -
    {{{model.notFoundHtml}}}
    - {{else}} -
    -
    {{model.message}}
    - {{#if model.noRetry}} - {{#unless currentUser}} - {{d-button action="showLogin" class="btn-primary topic-retry" icon="user" label="log_in"}} - {{/unless}} - {{else}} - {{d-button action="retryLoading" class="btn-primary topic-retry" icon="refresh" label="errors.buttons.again"}} - {{/if}} -
    - {{conditional-loading-spinner condition=retrying}} - {{/if}} - {{/conditional-loading-spinner}} -
    -{{/if}} - -{{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}} - -{{#if currentUser.enable_quoting}} - {{quote-button topic=model - quoteState=quoteState - selectText="selectText" - deselectText="deselectText"}} -{{/if}} + {{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}} + {{#if currentUser.enable_quoting}} + {{quote-button topic=model + quoteState=quoteState + selectText="selectText" + deselectText="deselectText"}} + {{/if}} +{{/discourse-topic}} From 3d8cfac8bf32a40d5064705e182a20775aec9ef7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 15:18:43 -0500 Subject: [PATCH 187/266] Migrate `ModalView` to Component --- .../d-modal.js.es6} | 7 +++---- .../javascripts/discourse/templates/modal.hbs | 21 +++++++++++++++++++ .../discourse/templates/modal/modal.hbs | 19 ----------------- 3 files changed, 24 insertions(+), 23 deletions(-) rename app/assets/javascripts/discourse/{views/modal.js.es6 => components/d-modal.js.es6} (83%) create mode 100644 app/assets/javascripts/discourse/templates/modal.hbs delete mode 100644 app/assets/javascripts/discourse/templates/modal/modal.hbs diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6 similarity index 83% rename from app/assets/javascripts/discourse/views/modal.js.es6 rename to app/assets/javascripts/discourse/components/d-modal.js.es6 index 10599d2374..a8de2b82ea 100644 --- a/app/assets/javascripts/discourse/views/modal.js.es6 +++ b/app/assets/javascripts/discourse/components/d-modal.js.es6 @@ -1,9 +1,8 @@ import { on } from "ember-addons/ember-computed-decorators"; -export default Ember.View.extend({ +export default Ember.Component.extend({ elementId: 'discourse-modal', - templateName: 'modal/modal', - classNameBindings: [':modal', ':hidden', 'controller.modalClass'], + classNameBindings: [':modal', ':hidden', 'modalClass'], attributeBindings: ['data-keyboard'], // We handle ESC ourselves @@ -19,7 +18,7 @@ export default Ember.View.extend({ this.appEvents.on('modal:body-shown', data => { if (data.title) { - this.set('controller.title', I18n.t(data.title)); + this.set('title', I18n.t(data.title)); } }); }, diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/templates/modal.hbs new file mode 100644 index 0000000000..3d778a0476 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal.hbs @@ -0,0 +1,21 @@ +{{#d-modal modalClass=modalClass title=title}} +
    +
    +
    +
    + {{fa-icon "times"}} +

    {{title}}

    +
    +
    + + {{outlet "modalBody"}} + {{#each errors as |error|}} +
    + + {{error}} +
    + {{/each}} +
    +
    +
    +{{/d-modal}} diff --git a/app/assets/javascripts/discourse/templates/modal/modal.hbs b/app/assets/javascripts/discourse/templates/modal/modal.hbs deleted file mode 100644 index afe0296f97..0000000000 --- a/app/assets/javascripts/discourse/templates/modal/modal.hbs +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    -
    -
    - {{fa-icon "times"}} -

    {{title}}

    -
    -
    - - {{outlet "modalBody"}} - {{#each errors as |error|}} -
    - - {{error}} -
    - {{/each}} -
    -
    -
    From 438e1bc0a9b2ede8c9f29f83d8836b4f097d1aad Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 15:31:14 -0500 Subject: [PATCH 188/266] Use the view registry instead of `Ember.View.views` --- .../javascripts/discourse/lib/keyboard-shortcuts.js.es6 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 477b914ce5..d393127a73 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -209,8 +209,11 @@ export default { sendToTopicListItemView(action) { const elem = $('tr.selected.topic-list-item.ember-view')[0]; if (elem) { - const view = Ember.View.views[elem.id]; - view.send(action); + const registry = this.container.lookup('-view-registry:main'); + if (registry) { + const view = registry[elem.id]; + view.send(action); + } } }, From daabdd2ccf07ca6a083f5728a1b541f4a073fd16 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Nov 2016 16:18:41 -0500 Subject: [PATCH 189/266] FIX: Topic status icons weren't being displayed --- app/assets/javascripts/discourse-loader.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js index b80e3aac0c..2d9f1d9f35 100644 --- a/app/assets/javascripts/discourse-loader.js +++ b/app/assets/javascripts/discourse-loader.js @@ -135,8 +135,12 @@ var define, require, requirejs; } requirejs = require = function(name) { - var mod = registry[name] || registry[MOVED_MODULES[name]]; + if (MOVED_MODULES[name]) { + name = MOVED_MODULES[name]; + } + + var mod = registry[name]; if (mod && mod.callback instanceof Alias) { mod = registry[mod.callback.name]; From 71e4fe9c8577012288c5ad1195a8fabfb7359a62 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 21 Nov 2016 17:33:10 -0500 Subject: [PATCH 190/266] FIX: consistent rendering of categories in digest emails --- app/views/user_notifications/digest.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index e77fd85355..75f6bf0808 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -320,7 +320,9 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo <%= t.title -%> -

    <%= t.category.try(:name) -%>

    +

    + <%= category_badge(t.category, inline_style: true, absolute_url: true) %> +

    -

    +

    <%=t 'user_notifications.digest.popular_posts' %>

    		- + <%= t.title -%>

    <%= t.category.try(:name) -%>

    		 From 7d37c2b9199fb59b4f84384e3b988c9e96aafc35 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 21 Nov 2016 12:33:40 -0500 Subject: [PATCH 184/266] FIX: digest email has broken images in popular topics section --- app/helpers/user_notifications_helper.rb | 6 ++++++ app/views/user_notifications/digest.html.erb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb index e65ea04a6c..ad82c3c4f5 100644 --- a/app/helpers/user_notifications_helper.rb +++ b/app/helpers/user_notifications_helper.rb @@ -97,4 +97,10 @@ module UserNotificationsHelper UrlHelper.absolute("#{Discourse.base_uri}/images/emails/#{basename}") end + def url_for_email(href) + URI(href).host.present? ? href : UrlHelper.absolute("#{Discourse.base_uri}#{href}") + rescue URI::InvalidURIError, URI::InvalidComponentError + href + end + end diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 66a108b8b5..e77fd85355 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -129,7 +129,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo <% if t.image_url.present? %> - + <% t.posters_summary[0,2].each do |ps| %> From 5b05c8102eb84f44d828367e0475526af797efd1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 12:17:40 -0500 Subject: [PATCH 191/266] FIX: Read posts weren't refreshing on Ember 2.4 --- .../discourse-common/lib/buffered-render.js.es6 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 index c1eebb7768..c77523f033 100644 --- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 +++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 @@ -25,18 +25,13 @@ export function bufferedRender(obj) { return obj; } - const caller = { - _didRender: false - }; + const caller = { }; // True in 1.13 or greater if (Ember.Helper) { caller.didRender = function() { this._super(); - if (!this._didRender) { - this._customRender(); - } - this._didRender = true; + this._customRender(); }; } else { caller.didInsertElement = function() { From db4b3a7aa41489b4cfee389ccac3b99109ea8b59 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 22 Nov 2016 12:37:22 -0500 Subject: [PATCH 192/266] FIX: show emoji in digest emails --- app/helpers/application_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 07d7ce951c..d79ace3f34 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -91,8 +91,7 @@ module ApplicationHelper end def format_topic_title(title) - PrettyText.unescape_emoji(title) - strip_tags(title) + PrettyText.unescape_emoji strip_tags(title) end def with_format(format, &block) From 86deec352873f82d3026bb7ff5f094db84a37c13 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 22 Nov 2016 13:23:21 -0500 Subject: [PATCH 193/266] FIX: exclude popular posts from deleted topics --- app/mailers/user_notifications.rb | 10 +++++++++- spec/mailers/user_notifications_spec.rb | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 3894104214..d1d117995f 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -108,9 +108,17 @@ class UserNotifications < ActionMailer::Base topics_for_digest = Topic.for_digest(user, min_date, limit: SiteSetting.digest_topics + 3, top_order: true).to_a @popular_topics = topics_for_digest[0,SiteSetting.digest_topics] - @popular_posts = SiteSetting.digest_posts > 0 ? Post.where("post_number > ? AND score > ? AND created_at > ?", 1, 5.0, min_date).order("score DESC").limit(SiteSetting.digest_posts) : [] @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : [] + @popular_posts = if SiteSetting.digest_posts > 0 + Post.public_posts + .where("posts.post_number > ? AND posts.score > ? AND posts.created_at > ?", 1, 5.0, min_date) + .order("posts.score DESC") + .limit(SiteSetting.digest_posts) + else + [] + end + topic_lookup = TopicUser.lookup_for(user, @other_new_for_you) @other_new_for_you.each { |t| t.user_data = topic_lookup[t.id] } diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index bc7dfb4fdd..7d98425ce3 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -175,7 +175,17 @@ describe UserNotifications do expect(subject.subject).to match(/Try Discourse/) expect(subject.subject).not_to match(/Discourse Meta/) end + + it "excludes deleted topics and their posts" do + deleted = Fabricate(:topic, user: Fabricate(:user), title: "Delete this topic plz") + post = Fabricate(:post, topic: deleted, score: 100.0, post_number: 2, raw: "Your wish is my command") + deleted.trash! + html = subject.html_part.body.to_s + expect(html).to_not include deleted.title + expect(html).to_not include post.raw + end end + end describe '.user_replied' do From 217007ff54aa62cb6aa2de418e8f2cece93fae05 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 14:02:47 -0500 Subject: [PATCH 194/266] Add acceptance tests for plugin outlets --- .../discourse/helpers/plugin-outlet.js.es6 | 5 +++ .../plugin-outlet-multi-template-test.js.es6 | 28 ++++++++++++++++ .../plugin-outlet-single-template-test.js.es6 | 32 +++++++++++++++++++ .../helpers/create-pretender.js.es6 | 4 +++ 4 files changed, 69 insertions(+) create mode 100644 test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 create mode 100644 test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 index 00a4307d7c..b56ea69f08 100644 --- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 +++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 @@ -61,6 +61,11 @@ function findOutlets(collection, callback) { }); } +export function clearCache() { + _connectorCache = null; + _rawCache = null; +} + function buildConnectorCache() { _connectorCache = {}; _rawCache = {}; diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 new file mode 100644 index 0000000000..7c306aef8a --- /dev/null +++ b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 @@ -0,0 +1,28 @@ +import { acceptance } from "helpers/qunit-helpers"; +import { clearCache } from 'discourse/helpers/plugin-outlet'; + +const HELLO = 'javascripts/multi-test/connectors/user-profile-primary/hello'; +const GOODBYE = 'javascripts/multi-test/connectors/user-profile-primary/goodbye'; + +acceptance("Plugin Outlet - Multi Template", { + setup() { + Ember.TEMPLATES[HELLO] = Ember.HTMLBars.compile(`Hello`); + Ember.TEMPLATES[GOODBYE] = Ember.HTMLBars.compile(`Goodbye`); + }, + + teardown() { + delete Ember.TEMPLATES[HELLO]; + delete Ember.TEMPLATES[GOODBYE]; + clearCache(); + } +}); + +test("Renders a template into the outlet", assert => { + visit("/users/eviltrout"); + andThen(() => { + assert.ok(find('.user-profile-primary-outlet.hello').length === 1, 'it has class names'); + assert.ok(find('.user-profile-primary-outlet.goodbye').length === 1, 'it has class names'); + assert.equal(find('.hello-span').text(), 'Hello', 'it renders into the outlet'); + assert.equal(find('.bye-span').text(), 'Goodbye', 'it renders into the outlet'); + }); +}); diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 new file mode 100644 index 0000000000..492ab6611b --- /dev/null +++ b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 @@ -0,0 +1,32 @@ +import { acceptance } from "helpers/qunit-helpers"; +import { clearCache } from 'discourse/helpers/plugin-outlet'; + +const CONNECTOR = 'javascripts/single-test/connectors/user-profile-primary/hello'; +acceptance("Plugin Outlet - Single Template", { + setup() { + Ember.TEMPLATES[CONNECTOR] = Ember.HTMLBars.compile( + ` + {{model.username}} + + {{model.email}} + ` + ); + }, + + teardown() { + delete Ember.TEMPLATES[CONNECTOR]; + clearCache(); + } +}); + +test("Renders a template into the outlet", assert => { + visit("/users/eviltrout"); + andThen(() => { + assert.ok(find('.user-profile-primary-outlet.hello').length === 1, 'it has class names'); + assert.equal(find('.hello-username').text(), 'eviltrout', 'it renders into the outlet'); + }); + click('.hello-check-email'); + andThen(() => { + assert.equal(find('.hello-email').text(), 'eviltrout@example.com', 'actions delegate properly'); + }); +}); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index a9a6d769e4..bfb071f90c 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -63,6 +63,10 @@ export default function() { }] }); }); + this.get(`/users/eviltrout/emails.json`, () => { + return response({ email: 'eviltrout@example.com' }); + }); + this.get('/users/eviltrout.json', () => { const json = fixturesByUrl['/users/eviltrout.json']; json.user.can_edit = loggedIn(); From f51bf2358e4a7532330de7a110d68daf4e3b5327 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 14:28:10 -0500 Subject: [PATCH 195/266] FIX: Error finding `$fields.position` during tests --- .../javascripts/discourse/components/composer-body.js.es6 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6 index 8ec0a388f3..8c8ddf6e09 100644 --- a/app/assets/javascripts/discourse/components/composer-body.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-body.js.es6 @@ -35,9 +35,11 @@ export default Ember.Component.extend({ // Figure out the size of the fields const $fields = this.$('.composer-fields'); - const fieldPos = $fields.position(); - if (fieldPos) { - this.$('.wmd-controls').css('top', $fields.height() + fieldPos.top + 5); + if ($fields) { + const fieldPos = $fields.position(); + if (fieldPos) { + this.$('.wmd-controls').css('top', $fields.height() + fieldPos.top + 5); + } } // get the submit panel height From ca5ed77b431c5da89036547abd32b7abb959823d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 14:34:41 -0500 Subject: [PATCH 196/266] FIX: More robust `afterRender` for the composer --- .../discourse/components/composer-body.js.es6 | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6 index 8c8ddf6e09..ec3bc602cd 100644 --- a/app/assets/javascripts/discourse/components/composer-body.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-body.js.es6 @@ -28,27 +28,27 @@ export default Ember.Component.extend({ }, @observes('composeState', 'composer.action') - resize() { - Ember.run.scheduleOnce('afterRender', () => { - const h = $('#reply-control').height() || 0; - this.movePanels(h + "px"); + resize() { + Ember.run.scheduleOnce('afterRender', () => { + if (!this.element || this.isDestroying || this.isDestroyed) { return; } - // Figure out the size of the fields - const $fields = this.$('.composer-fields'); - if ($fields) { - const fieldPos = $fields.position(); - if (fieldPos) { - this.$('.wmd-controls').css('top', $fields.height() + fieldPos.top + 5); - } - } + const h = $('#reply-control').height() || 0; + this.movePanels(h + "px"); - // get the submit panel height - const submitPos = this.$('.submit-panel').position(); - if (submitPos) { - this.$('.wmd-controls').css('bottom', h - submitPos.top + 7); - } - }); - }, + // Figure out the size of the fields + const $fields = this.$('.composer-fields'); + const fieldPos = $fields.position(); + if (fieldPos) { + this.$('.wmd-controls').css('top', $fields.height() + fieldPos.top + 5); + } + + // get the submit panel height + const submitPos = this.$('.submit-panel').position(); + if (submitPos) { + this.$('.wmd-controls').css('bottom', h - submitPos.top + 7); + } + }); + }, keyUp() { this.sendAction('typed'); From b07a2baedc964ecb04185e8c367e2eb64966d12d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 14:50:03 -0500 Subject: [PATCH 197/266] FIX: Clear the outlet cache before and after tests --- .../acceptance/plugin-outlet-multi-template-test.js.es6 | 1 + .../acceptance/plugin-outlet-single-template-test.js.es6 | 1 + 2 files changed, 2 insertions(+) diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 index 7c306aef8a..34d5bc0045 100644 --- a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 +++ b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 @@ -6,6 +6,7 @@ const GOODBYE = 'javascripts/multi-test/connectors/user-profile-primary/goodbye' acceptance("Plugin Outlet - Multi Template", { setup() { + clearCache(); Ember.TEMPLATES[HELLO] = Ember.HTMLBars.compile(`Hello`); Ember.TEMPLATES[GOODBYE] = Ember.HTMLBars.compile(`Goodbye`); }, diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 index 492ab6611b..df63e01311 100644 --- a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 +++ b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 @@ -4,6 +4,7 @@ import { clearCache } from 'discourse/helpers/plugin-outlet'; const CONNECTOR = 'javascripts/single-test/connectors/user-profile-primary/hello'; acceptance("Plugin Outlet - Single Template", { setup() { + clearCache(); Ember.TEMPLATES[CONNECTOR] = Ember.HTMLBars.compile( ` {{model.username}} From 9afa55a3fd5f0421d6b0784c75edbf1751e83974 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 15:36:18 -0500 Subject: [PATCH 198/266] FIX: Random failing plugin tests --- app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 4 ++++ .../test/javascripts/acceptance/details-button-test.js.es6 | 4 ---- test/javascripts/helpers/qunit-helpers.js.es6 | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 2908549293..c4833d4b45 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -368,6 +368,10 @@ function decorate(klass, evt, cb) { klass.reopen(mixin); } +export function resetPluginApi() { + _pluginv01 = null; +} + export function decorateCooked() { console.warn('`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead'); } diff --git a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 index 5109b62881..afe45dfffd 100644 --- a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 +++ b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 @@ -9,10 +9,6 @@ function findTextarea() { test('details button', () => { visit("/"); - andThen(() => { - ok(exists('#create-topic'), 'the create button is visible'); - }); - click('#create-topic'); click('button.options'); click('.popup-menu .fa-caret-right'); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 1fe326b36b..3e235474a3 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -4,6 +4,7 @@ import sessionFixtures from 'fixtures/session-fixtures'; import siteFixtures from 'fixtures/site-fixtures'; import HeaderComponent from 'discourse/components/site-header'; import { forceMobile, resetMobile } from 'discourse/lib/mobile'; +import { resetPluginApi } from 'discourse/lib/plugin-api'; function currentUser() { return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); @@ -74,6 +75,7 @@ function acceptance(name, options) { Discourse.User.resetCurrent(); Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site))); + resetPluginApi(); Discourse.reset(); } }); From bfd0418f071bc6e3c96fbfa8d4fcb5c78a387241 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 23 Nov 2016 13:31:05 +1100 Subject: [PATCH 199/266] added a test for safe mode --- spec/controllers/list_controller_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb index c07c6ad2f7..23c3d866ab 100644 --- a/spec/controllers/list_controller_spec.rb +++ b/spec/controllers/list_controller_spec.rb @@ -313,4 +313,24 @@ describe ListController do end + describe "safe mode" do + render_views + + it "handles safe mode" do + get :latest + expect(response.body).to match(/plugin\.js/) + expect(response.body).to match(/plugin-third-party\.js/) + + get :latest, safe_mode: "no_plugins" + expect(response.body).not_to match(/plugin\.js/) + expect(response.body).not_to match(/plugin-third-party\.js/) + + get :latest, safe_mode: "only_official" + expect(response.body).to match(/plugin\.js/) + expect(response.body).not_to match(/plugin-third-party\.js/) + + end + + end + end From 02025207d57728ed60c43a9d8e723fef3f96b3e1 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 23 Nov 2016 11:29:28 +0800 Subject: [PATCH 200/266] FIX: Make sure Redis fallback don't fall into a permanent readonly state. --- lib/discourse_redis.rb | 7 +++++-- spec/components/discourse_redis_spec.rb | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 9ed43c4e3a..91bbd1a36c 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -60,7 +60,7 @@ class DiscourseRedis end def running? - synchronize { @timer_task.running? } + @timer_task.running? end private @@ -92,7 +92,10 @@ class DiscourseRedis end def resolve - return @slave_options if !@fallback_handler.master + if !@fallback_handler.master + @fallback_handler.verify_master unless @fallback_handler.running? + return @slave_options + end begin options = @options.dup diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb index 8cc8c76d47..c0d644cc5a 100644 --- a/spec/components/discourse_redis_spec.rb +++ b/spec/components/discourse_redis_spec.rb @@ -60,11 +60,14 @@ describe DiscourseRedis do Redis::Client.any_instance.expects(:call).raises(error).once expect { connector.resolve }.to raise_error(error) + fallback_handler.instance_variable_get(:@timer_task).shutdown + expect(fallback_handler.running?).to eq(false) config = connector.resolve expect(config[:host]).to eq(slave_host) expect(config[:port]).to eq(slave_port) + expect(fallback_handler.running?).to eq(true) ensure fallback_handler.master = true end From dd4cab3be2ddc099d6cef438ac4243ee209f7f0e Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 23 Nov 2016 14:04:43 +0800 Subject: [PATCH 201/266] FIX: Set master to true before forcing slave connections to reconnect. --- lib/discourse_redis.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 91bbd1a36c..aaa5f74ef7 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -35,13 +35,14 @@ class DiscourseRedis if slave_client.call([:info]).split("\r\n").include?(MASTER_LINK_STATUS) logger.info "#{log_prefix}: Master server is active, killing all connections to slave..." + self.master = true + CONNECTION_TYPES.each do |connection_type| slave_client.call([:client, [:kill, 'type', connection_type]]) end Discourse.clear_readonly! Discourse.request_refresh! - self.master = true success = true end ensure From 55013be19ff3cb4a0e33ae9c0b620f984837728d Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 23 Nov 2016 14:45:47 +0800 Subject: [PATCH 202/266] FIX: Make sure we clean quoteState when destroying quoteButton. --- app/assets/javascripts/discourse/components/quote-button.js.es6 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6 index 68c3eb5a7d..6e3ad3502a 100644 --- a/app/assets/javascripts/discourse/components/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/components/quote-button.js.es6 @@ -164,6 +164,8 @@ export default Ember.Component.extend({ .off("touchstart.quote-button") .off("touchend.quote-button") .off("selectionchange"); + + this.sendAction('deselectText'); }, click(e) { From acf9da6b8df1914ac827df82fcb3053e9aa7b866 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 23 Nov 2016 14:23:12 +0800 Subject: [PATCH 203/266] Run tests for Discourse Cakeday on Travis. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ca3ba4a081..513f3c15ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,7 @@ before_install: - gem install bundler - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3 - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert + - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday - npm i -g eslint babel-eslint - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts From 91c21dad28256598148f0df63bfa16f650376ea9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 23 Nov 2016 10:41:21 -0500 Subject: [PATCH 204/266] Reset plugins before tests too --- test/javascripts/helpers/qunit-helpers.js.es6 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 3e235474a3..4a822c1266 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -65,6 +65,7 @@ function acceptance(name, options) { } } + resetPluginApi(); Discourse.reset(); }, From 79dc0518c944d3482c23289db8e799cd01302be7 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 23 Nov 2016 11:24:06 -0500 Subject: [PATCH 205/266] FIX: popular posts in digest need to use same restrictions as topics --- app/mailers/user_notifications.rb | 4 ++-- spec/mailers/user_notifications_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index d1d117995f..9c845d7883 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -111,8 +111,8 @@ class UserNotifications < ActionMailer::Base @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : [] @popular_posts = if SiteSetting.digest_posts > 0 - Post.public_posts - .where("posts.post_number > ? AND posts.score > ? AND posts.created_at > ?", 1, 5.0, min_date) + Post.for_mailing_list(user, min_date) + .where("posts.post_number > ? AND posts.score > ?", 1, 5.0) .order("posts.score DESC") .limit(SiteSetting.digest_posts) else diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index 7d98425ce3..51f73a58ae 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -155,8 +155,8 @@ describe UserNotifications do context "with new topics" do before do - Topic.expects(:for_digest).returns([Fabricate(:topic, user: Fabricate(:coding_horror))]) - Topic.expects(:new_since_last_seen).returns(Topic.none) + Topic.stubs(:for_digest).returns([Fabricate(:topic, user: Fabricate(:coding_horror))]) + Topic.stubs(:new_since_last_seen).returns(Topic.none) end it "works" do From ae4fd06444637e06829f4ca7236f777ed30657b3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 23 Nov 2016 12:57:50 -0500 Subject: [PATCH 206/266] Add acceptance tests for `custom-html` --- .../discourse/helpers/custom-html.js.es6 | 6 +++- .../acceptance/custom-html-set-test.js.es6 | 30 +++++++++++++++++++ .../custom-html-template-test.js.es6 | 18 +++++++++++ .../plugin-outlet-single-template-test.js.es6 | 9 ++---- .../helpers/custom-html-test.js.es6 | 16 ---------- test/javascripts/helpers/qunit-helpers.js.es6 | 6 ++++ 6 files changed, 61 insertions(+), 24 deletions(-) create mode 100644 test/javascripts/acceptance/custom-html-set-test.js.es6 create mode 100644 test/javascripts/acceptance/custom-html-template-test.js.es6 delete mode 100644 test/javascripts/helpers/custom-html-test.js.es6 diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6 index 5a389ea49c..4828ae057e 100644 --- a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 +++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6 @@ -1,7 +1,7 @@ import { registerHelper } from 'discourse-common/lib/helpers'; import PreloadStore from 'preload-store'; -const _customizations = {}; +let _customizations = {}; export function getCustomHTML(key) { const c = _customizations[key]; @@ -15,6 +15,10 @@ export function getCustomHTML(key) { } } +export function clearHTMLCache() { + _customizations = {}; +} + // Set a fragment of HTML by key. It can then be looked up with `getCustomHTML(key)`. export function setCustomHTML(key, html) { _customizations[key] = html; diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js.es6 new file mode 100644 index 0000000000..3ae0bd6373 --- /dev/null +++ b/test/javascripts/acceptance/custom-html-set-test.js.es6 @@ -0,0 +1,30 @@ +import { acceptance } from "helpers/qunit-helpers"; +import { setCustomHTML } from 'discourse/helpers/custom-html'; +import PreloadStore from 'preload-store'; + +acceptance("CustomHTML set"); + +test("has no custom HTML in the top", assert => { + visit("/static/faq"); + andThen(() => { + assert.ok(!exists('span.custom-html-test'), 'it has no markup'); + }); +}); + +test("renders set HTML", assert => { + setCustomHTML('top', 'HTML'); + + visit("/static/faq"); + andThen(() => { + assert.equal(find('span.custom-html-test').text(), 'HTML', 'it inserted the markup'); + }); +}); + +test("renders preloaded HTML", assert => { + PreloadStore.store('customHTML', {top: "monster"}); + + visit("/static/faq"); + andThen(() => { + assert.equal(find('span.cookie').text(), 'monster', 'it inserted the markup'); + }); +}); diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js.es6 new file mode 100644 index 0000000000..d125236ebb --- /dev/null +++ b/test/javascripts/acceptance/custom-html-template-test.js.es6 @@ -0,0 +1,18 @@ +import { acceptance } from "helpers/qunit-helpers"; + +acceptance("CustomHTML template", { + setup() { + Ember.TEMPLATES['top'] = Ember.HTMLBars.compile(`TOP`); + }, + + teardown() { + delete Ember.TEMPLATES['top']; + } +}); + +test("renders custom template", assert => { + visit("/static/faq"); + andThen(() => { + assert.equal(find('span.top-span').text(), 'TOP', 'it inserted the template'); + }); +}); diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 index df63e01311..228506e27c 100644 --- a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 +++ b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 @@ -1,22 +1,17 @@ import { acceptance } from "helpers/qunit-helpers"; -import { clearCache } from 'discourse/helpers/plugin-outlet'; const CONNECTOR = 'javascripts/single-test/connectors/user-profile-primary/hello'; acceptance("Plugin Outlet - Single Template", { setup() { - clearCache(); Ember.TEMPLATES[CONNECTOR] = Ember.HTMLBars.compile( - ` - {{model.username}} + `{{model.username}} - {{model.email}} - ` + {{model.email}}` ); }, teardown() { delete Ember.TEMPLATES[CONNECTOR]; - clearCache(); } }); diff --git a/test/javascripts/helpers/custom-html-test.js.es6 b/test/javascripts/helpers/custom-html-test.js.es6 deleted file mode 100644 index 4c7f765e60..0000000000 --- a/test/javascripts/helpers/custom-html-test.js.es6 +++ /dev/null @@ -1,16 +0,0 @@ -import { blank } from 'helpers/qunit-helpers'; -import PreloadStore from 'preload-store'; - -module("helper:custom-html"); - -import { getCustomHTML, setCustomHTML } from 'discourse/helpers/custom-html'; - -test("customHTML", function() { - blank(getCustomHTML('evil'), "there is no custom HTML for a key by default"); - - setCustomHTML('evil', 'trout'); - equal(getCustomHTML('evil'), 'trout', 'it retrieves the custom html'); - - PreloadStore.store('customHTML', {cookie: 'monster'}); - equal(getCustomHTML('cookie'), 'monster', 'it returns HTML fragments from the PreloadStore'); -}); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 4a822c1266..d8351405f0 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -5,6 +5,8 @@ import siteFixtures from 'fixtures/site-fixtures'; import HeaderComponent from 'discourse/components/site-header'; import { forceMobile, resetMobile } from 'discourse/lib/mobile'; import { resetPluginApi } from 'discourse/lib/plugin-api'; +import { clearCache as clearOutletCache } from 'discourse/helpers/plugin-outlet'; +import { clearHTMLCache } from 'discourse/helpers/custom-html'; function currentUser() { return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); @@ -65,6 +67,8 @@ function acceptance(name, options) { } } + clearOutletCache(); + clearHTMLCache(); resetPluginApi(); Discourse.reset(); }, @@ -76,6 +80,8 @@ function acceptance(name, options) { Discourse.User.resetCurrent(); Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site))); + clearOutletCache(); + clearHTMLCache(); resetPluginApi(); Discourse.reset(); } From c5687100b04662b3d754ed0a8ae053d6298fca26 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 23 Nov 2016 14:27:47 -0500 Subject: [PATCH 207/266] Add the ability to connect a component to a Discourse widget --- .../components/connector-container.js.es6 | 1 + .../discourse/widgets/connector.js.es6 | 50 +++++++++++++------ .../discourse/widgets/decorator-helper.js.es6 | 2 +- 3 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/connector-container.js.es6 diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js.es6 new file mode 100644 index 0000000000..905ec1058e --- /dev/null +++ b/app/assets/javascripts/discourse/components/connector-container.js.es6 @@ -0,0 +1 @@ +export default Ember.Component.extend(); diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6 index b81c758e8d..22f225e808 100644 --- a/app/assets/javascripts/discourse/widgets/connector.js.es6 +++ b/app/assets/javascripts/discourse/widgets/connector.js.es6 @@ -1,3 +1,5 @@ +import deprecated from 'discourse-common/lib/deprecated'; + export default class Connector { constructor(widget, opts) { @@ -14,23 +16,43 @@ export default class Connector { const mounted = widget._findView(); - let context; - if (opts.context === 'model') { - const model = widget.findAncestorModel(); - context = model; + if (opts.templateName) { + deprecated(`Using a 'templateName' for a connector is deprecated. Use 'component' instead [${opts.templateName}]`); } - const view = Ember.View.create({ - container: mounted.container || widget.register, - templateName: opts.templateName, - context - }); - if (Ember.setOwner) { - Ember.setOwner(view, Ember.getOwner(mounted)); - } - mounted._connected.push(view); + const container = Ember.getOwner ? Ember.getOwner(mounted) : mounted.container; - view.renderer.replaceIn(view, $elem[0]); + let view; + + if (opts.component) { + const connector = container.lookupFactory('component:connector-container'); + view = connector.create({ + layoutName: `components/${opts.component}`, + model: widget.findAncestorModel() + }); + } + + if (opts.templateName) { + let context; + if (opts.context === 'model') { + const model = widget.findAncestorModel(); + context = model; + } + + view = Ember.View.create({ + container: container || widget.register, + templateName: opts.templateName, + context + }); + } + + if (view) { + if (Ember.setOwner) { + Ember.setOwner(view, Ember.getOwner(mounted)); + } + mounted._connected.push(view); + view.renderer.replaceIn(view, $elem[0]); + } }); return elem; diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 index 2ee8df8723..601a8fc96f 100644 --- a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 +++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 @@ -7,6 +7,7 @@ class DecoratorHelper { constructor(widget, attrs, state) { this.widget = widget; this.attrs = attrs; + this.canConnectComponent = true; this.state = state; this.register = widget.register; this.register.deprecateContainer(this); @@ -105,7 +106,6 @@ class DecoratorHelper { connect(details) { return new Connector(this.widget, details); } - } DecoratorHelper.prototype.h = h; From 9030e4004184747a5f24b1bd1d6165f79a81e03f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 23 Nov 2016 14:58:10 -0500 Subject: [PATCH 208/266] FIX: Container appending was broken in Ember 2.4 --- app/assets/javascripts/discourse/widgets/connector.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6 index 22f225e808..1cea95ae82 100644 --- a/app/assets/javascripts/discourse/widgets/connector.js.es6 +++ b/app/assets/javascripts/discourse/widgets/connector.js.es6 @@ -25,7 +25,7 @@ export default class Connector { let view; if (opts.component) { - const connector = container.lookupFactory('component:connector-container'); + const connector = widget.register.lookupFactory('component:connector-container'); view = connector.create({ layoutName: `components/${opts.component}`, model: widget.findAncestorModel() @@ -51,7 +51,7 @@ export default class Connector { Ember.setOwner(view, Ember.getOwner(mounted)); } mounted._connected.push(view); - view.renderer.replaceIn(view, $elem[0]); + view.renderer.appendTo(view, $elem[0]); } }); From b8c88dbfe0da58fc60211a547ce358bc48f3d4f6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 23 Nov 2016 16:44:57 -0500 Subject: [PATCH 209/266] Update docs for connector --- .../javascripts/discourse/widgets/decorator-helper.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 index 601a8fc96f..19593f583d 100644 --- a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 +++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 @@ -87,7 +87,7 @@ class DecoratorHelper { } /** - * You can use this bridge to mount an Ember View inside the virtual + * You can use this bridge to mount an Ember Component inside the virtual * DOM post stream. Note that this is a bit bizarre, as our core app * is rendered in Ember, then we switch to a virtual dom, and this * allows part of that virtual dom to use Ember again! @@ -100,7 +100,7 @@ class DecoratorHelper { * Example: * * ``` - * helper.connect({ templateName: 'my-handlebars-template' }); + * helper.connect({ component: 'my-component-name' }); * ``` **/ connect(details) { From 47aa3d94aa46984b8340df1fc0d3578c235c1d88 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 23 Nov 2016 17:46:57 -0500 Subject: [PATCH 210/266] FEATURE: send digest preview to an email address --- .../admin-email-preview-digest.js.es6 | 22 +++++++++++++++++++ .../admin/models/email-preview.js.es6 | 14 ++++++++++++ .../admin/templates/email-preview-digest.hbs | 18 +++++++++++++++ app/controllers/admin/email_controller.rb | 19 ++++++++++++++++ config/locales/client.en.yml | 3 +++ config/routes.rb | 1 + 6 files changed, 77 insertions(+) diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 index 160f998365..b46fc4c280 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 @@ -1,7 +1,12 @@ import EmailPreview from 'admin/models/email-preview'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; export default Ember.Controller.extend({ + emailEmpty: Em.computed.empty('email'), + sendEmailDisabled: Em.computed.or('emailEmpty', 'sendingEmail'), + showSendEmailForm: Em.computed.notEmpty('model.html_content'), + actions: { refresh() { const model = this.get('model'); @@ -15,6 +20,23 @@ export default Ember.Controller.extend({ toggleShowHtml() { this.toggleProperty('showHtml'); + }, + + sendEmail() { + this.set('sendingEmail', true); + this.set('sentEmail', false); + + const self = this; + + EmailPreview.sendDigest(this.get('lastSeen'), this.get('username'), this.get('email')).then(result => { + if (result.errors) { + bootbox.alert(result.errors); + } else { + self.set('sentEmail', true); + } + }).catch(popupAjaxError).finally(function() { + self.set('sendingEmail', false); + }); } } diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js.es6 index f992bf250d..cfe96c6e0d 100644 --- a/app/assets/javascripts/admin/models/email-preview.js.es6 +++ b/app/assets/javascripts/admin/models/email-preview.js.es6 @@ -17,6 +17,20 @@ EmailPreview.reopenClass({ }).then(function (result) { return EmailPreview.create(result); }); + }, + + sendDigest: function(lastSeenAt, username, email) { + if (Em.isEmpty(lastSeenAt)) { + lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD'); + } + + if (Em.isEmpty(username)) { + username = Discourse.User.current().username; + } + + return ajax("/admin/email/send-digest.json", { + data: { last_seen_at: lastSeenAt, username: username, email: email } + }); } }); diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs index 7bd2a4455f..f64245c154 100644 --- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs +++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs @@ -19,6 +19,24 @@ {{#conditional-loading-spinner condition=loading}} + + {{#if showSendEmailForm}} +
    +
    + {{#if sendingEmail}} + {{i18n 'admin.email.sending_test'}} + {{else}} + + {{text-field value=email placeholderKey="admin.email.test_email_address"}} + + {{#if sentEmail}} + {{i18n 'admin.email.sent_test'}} + {{/if}} + {{/if}} +
    +
    + {{/if}} + {{#if showHtml}} {{{model.html_content}}} {{else}} diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 287b0ffdac..06dfe3ad55 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -50,6 +50,25 @@ class Admin::EmailController < Admin::AdminController render json: MultiJson.dump(html_content: renderer.html, text_content: renderer.text) end + def send_digest + params.require(:last_seen_at) + params.require(:username) + params.require(:email) + user = User.find_by_username(params[:username]) + message, skip_reason = UserNotifications.send(:digest, user, {since: params[:last_seen_at]}) + if message + message.to = params[:email] + begin + Email::Sender.new(message, :digest).send + render nothing: true + rescue => e + render json: {errors: [e.message]}, status: 422 + end + else + render json: {errors: skip_reason} + end + end + def handle_mail params.require(:email) Email::Processor.process!(params[:email]) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 9753f74224..3212a03275 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2762,6 +2762,9 @@ en: delivery_method: "Delivery Method" preview_digest_desc: "Preview the content of the digest emails sent to inactive users." refresh: "Refresh" + send_digest_label: "Send this result to:" + send_digest: "Send" + sending_email: "Sending email..." format: "Format" html: "html" text: "text" diff --git a/config/routes.rb b/config/routes.rb index b511a21036..35645a8fbc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -151,6 +151,7 @@ Discourse::Application.routes.draw do get "/incoming/:id/raw" => "email#raw_email" get "/incoming/:id" => "email#incoming" get "preview-digest" => "email#preview_digest" + get "send-digest" => "email#send_digest" post "handle_mail" end end From 4efb3069e2f0818a9d0f34c0cbd97a187f1c5bf0 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 23 Nov 2016 17:51:48 -0500 Subject: [PATCH 211/266] FIX: exception in digest email when last_read_post_number is nil --- app/views/user_notifications/digest.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 75f6bf0808..7d32b72e86 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -313,7 +313,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo

    - <%= t.user_data ? (t.highest_post_number - t.user_data.last_read_post_number) : t.highest_post_number %> + <%= t.user_data ? (t.highest_post_number - (t.user_data.last_read_post_number || 0)) : t.highest_post_number %>

    		From 1867442fbc3174c80b74b95112abfedc0e0527ee Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 10:11:39 +0800 Subject: [PATCH 212/266] PERF: Add score indexes for top topics. --- .../20161124020918_add_scores_indexes_to_top_topics.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb diff --git a/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb b/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb new file mode 100644 index 0000000000..0e79373d23 --- /dev/null +++ b/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb @@ -0,0 +1,9 @@ +class AddScoresIndexesToTopTopics < ActiveRecord::Migration + def change + add_index :top_topics, :daily_score + add_index :top_topics, :weekly_score + add_index :top_topics, :monthly_score + add_index :top_topics, :yearly_score + add_index :top_topics, :all_score + end +end From f812415c526f422e8944797efec442e4330d94fa Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 10:13:03 +0800 Subject: [PATCH 213/266] Update annotations. --- app/models/category.rb | 8 +++++--- app/models/post_upload.rb | 4 +++- app/models/top_topic.rb | 5 +++++ app/models/user.rb | 15 ++++++++------- app/models/user_avatar.rb | 4 +++- app/models/user_profile.rb | 2 ++ 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/app/models/category.rb b/app/models/category.rb index e0ac08ac87..2a044088c8 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -547,7 +547,9 @@ end # # Indexes # -# index_categories_on_email_in (email_in) UNIQUE -# index_categories_on_topic_count (topic_count) -# unique_index_categories_on_name (name) UNIQUE +# index_categories_on_background_url (background_url) +# index_categories_on_email_in (email_in) UNIQUE +# index_categories_on_logo_url (logo_url) +# index_categories_on_topic_count (topic_count) +# unique_index_categories_on_name (name) UNIQUE # diff --git a/app/models/post_upload.rb b/app/models/post_upload.rb index f341877ff7..ea7ece7327 100644 --- a/app/models/post_upload.rb +++ b/app/models/post_upload.rb @@ -13,5 +13,7 @@ end # # Indexes # -# idx_unique_post_uploads (post_id,upload_id) UNIQUE +# idx_unique_post_uploads (post_id,upload_id) UNIQUE +# index_post_uploads_on_post_id (post_id) +# index_post_uploads_on_upload_id (upload_id) # diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index 29f206ea30..3a5328723a 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -265,13 +265,16 @@ end # # Indexes # +# index_top_topics_on_all_score (all_score) # index_top_topics_on_daily_likes_count (daily_likes_count) # index_top_topics_on_daily_op_likes_count (daily_op_likes_count) # index_top_topics_on_daily_posts_count (daily_posts_count) +# index_top_topics_on_daily_score (daily_score) # index_top_topics_on_daily_views_count (daily_views_count) # index_top_topics_on_monthly_likes_count (monthly_likes_count) # index_top_topics_on_monthly_op_likes_count (monthly_op_likes_count) # index_top_topics_on_monthly_posts_count (monthly_posts_count) +# index_top_topics_on_monthly_score (monthly_score) # index_top_topics_on_monthly_views_count (monthly_views_count) # index_top_topics_on_quarterly_likes_count (quarterly_likes_count) # index_top_topics_on_quarterly_op_likes_count (quarterly_op_likes_count) @@ -281,9 +284,11 @@ end # index_top_topics_on_weekly_likes_count (weekly_likes_count) # index_top_topics_on_weekly_op_likes_count (weekly_op_likes_count) # index_top_topics_on_weekly_posts_count (weekly_posts_count) +# index_top_topics_on_weekly_score (weekly_score) # index_top_topics_on_weekly_views_count (weekly_views_count) # index_top_topics_on_yearly_likes_count (yearly_likes_count) # index_top_topics_on_yearly_op_likes_count (yearly_op_likes_count) # index_top_topics_on_yearly_posts_count (yearly_posts_count) +# index_top_topics_on_yearly_score (yearly_score) # index_top_topics_on_yearly_views_count (yearly_views_count) # diff --git a/app/models/user.rb b/app/models/user.rb index 62f7835a59..d292d4917b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1096,11 +1096,12 @@ end # # Indexes # -# idx_users_admin (id) -# idx_users_moderator (id) -# index_users_on_auth_token (auth_token) -# index_users_on_last_posted_at (last_posted_at) -# index_users_on_last_seen_at (last_seen_at) -# index_users_on_username (username) UNIQUE -# index_users_on_username_lower (username_lower) UNIQUE +# idx_users_admin (id) +# idx_users_moderator (id) +# index_users_on_auth_token (auth_token) +# index_users_on_last_posted_at (last_posted_at) +# index_users_on_last_seen_at (last_seen_at) +# index_users_on_uploaded_avatar_id (uploaded_avatar_id) +# index_users_on_username (username) UNIQUE +# index_users_on_username_lower (username_lower) UNIQUE # diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index 391936c79e..6b24debf58 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -105,5 +105,7 @@ end # # Indexes # -# index_user_avatars_on_user_id (user_id) +# index_user_avatars_on_custom_upload_id (custom_upload_id) +# index_user_avatars_on_gravatar_upload_id (gravatar_upload_id) +# index_user_avatars_on_user_id (user_id) # diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 092276dc25..c05caea3b2 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -124,4 +124,6 @@ end # Indexes # # index_user_profiles_on_bio_cooked_version (bio_cooked_version) +# index_user_profiles_on_card_background (card_background) +# index_user_profiles_on_profile_background (profile_background) # From 857955dd043c17605584f7f43ec1c383b3b47b1c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 10:26:39 +0800 Subject: [PATCH 214/266] Follow our convention of declaring private methods. --- app/models/top_topic.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index 3a5328723a..d0564c9f7e 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -52,6 +52,8 @@ class TopTopic < ActiveRecord::Base all: 6) end + private + def self.sort_orders @@sort_orders ||= [:posts, :views, :likes, :op_likes].freeze end @@ -224,10 +226,6 @@ class TopTopic < ActiveRecord::Base AND tt.#{period}_#{sort}_count <> c.count", from: start_of(period)) end - - private_class_method :sort_orders, :update_counts_and_compute_scores_for, :remove_invisible_topics, - :add_new_visible_topics, :update_posts_count_for, :update_views_count_for, :update_likes_count_for, - :compute_top_score_for, :start_of, :update_top_topics end # == Schema Information From b889bfefbb60469d039525e4874aef772d26bfe7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 10:29:44 +0800 Subject: [PATCH 215/266] PERF: Don't calculate the same query twice. --- app/controllers/list_controller.rb | 14 ++++++++++---- app/models/site_setting.rb | 4 ++-- app/models/top_topic.rb | 6 ------ spec/models/site_setting_spec.rb | 7 +++++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index e680ce8d68..080c9029e4 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -327,14 +327,20 @@ class ListController < ApplicationController exclude_category_ids.pluck(:id) end - def self.best_period_for(previous_visit_at, category_id=nil) + def self.best_period_with_topics_for(previous_visit_at, category_id=nil) best_periods_for(previous_visit_at).each do |period| top_topics = TopTopic.where("#{period}_score > 0") top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) if category_id - return period if top_topics.count >= SiteSetting.topics_per_period_in_top_page + top_topics = top_topics.limit(SiteSetting.topics_per_period_in_top_page) + return period if top_topics.count == SiteSetting.topics_per_period_in_top_page end - # default period is yearly - SiteSetting.top_page_default_timeframe.to_sym + + false + end + + def self.best_period_for(previous_visit_at, category_id=nil) + best_period_with_topics_for(previous_visit_at, category_id) || + SiteSetting.top_page_default_timeframe.to_sym end def self.best_periods_for(date) diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 70b62602ee..ef88e14516 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -99,8 +99,8 @@ class SiteSetting < ActiveRecord::Base end def self.min_redirected_to_top_period(duration) - period = ListController.best_period_for(duration) - return period if TopTopic.topics_per_period(period) >= SiteSetting.topics_per_period_in_top_page + period = ListController.best_period_with_topics_for(duration) + return period if period # not enough topics nil diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index d0564c9f7e..6172f7cf0a 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -4,12 +4,6 @@ class TopTopic < ActiveRecord::Base belongs_to :topic - def self.topics_per_period(period) - DistributedMemoizer.memoize("#{Discourse.current_hostname}_topics_per_period_#{period}", 1.day) do - TopTopic.where("#{period}_score > 0").count - end.to_i - end - # The top topics we want to refresh often def self.refresh_daily! transaction do diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb index 78589dc4ad..d1905b2c08 100644 --- a/spec/models/site_setting_spec.rb +++ b/spec/models/site_setting_spec.rb @@ -76,7 +76,11 @@ describe SiteSetting do before do SiteSetting.topics_per_period_in_top_page = 2 SiteSetting.top_page_default_timeframe = 'daily' - TopTopic.stubs(:topics_per_period).with(:daily).returns(3) + + 2.times do + TopTopic.create!(daily_score: 2.5) + end + TopTopic.refresh! end @@ -91,7 +95,6 @@ describe SiteSetting do before do SiteSetting.topics_per_period_in_top_page = 20 SiteSetting.top_page_default_timeframe = 'daily' - TopTopic.stubs(:topics_per_period).with(:daily).returns(1) TopTopic.refresh! end From af0b6ce53d3000bc0d8a76853c16e725bb2e33bf Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 16:20:17 +0800 Subject: [PATCH 216/266] REFACTOR: `ajax` defaults to json data type for GET requests. --- .../javascripts/discourse/models/group.js.es6 | 18 +++++++++--------- config/routes.rb | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index 9980acc81e..12d352dcca 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -50,7 +50,7 @@ const Group = Discourse.Model.extend({ removeOwner(member) { var self = this; - return ajax('/admin/groups/' + this.get('id') + '/owners.json', { + return ajax(`/admin/groups/${this.get('id')}/owners`, { type: "DELETE", data: { user_id: member.get("id") } }).then(function() { @@ -61,7 +61,7 @@ const Group = Discourse.Model.extend({ removeMember(member) { var self = this; - return ajax('/groups/' + this.get('id') + '/members.json', { + return ajax(`/groups/${this.get('id')}/members`, { type: "DELETE", data: { user_id: member.get("id") } }).then(function() { @@ -72,7 +72,7 @@ const Group = Discourse.Model.extend({ addMembers(usernames) { var self = this; - return ajax('/groups/' + this.get('id') + '/members.json', { + return ajax(`/groups/${this.get('id')}/members`, { type: "PUT", data: { usernames: usernames } }).then(function() { @@ -82,7 +82,7 @@ const Group = Discourse.Model.extend({ addOwners(usernames) { var self = this; - return ajax('/admin/groups/' + this.get('id') + '/owners.json', { + return ajax(`/admin/groups/${this.get('id')}/owners`, { type: "PUT", data: { usernames: usernames } }).then(function() { @@ -141,7 +141,7 @@ const Group = Discourse.Model.extend({ var data = {}; if (opts.beforePostId) { data.before_post_id = opts.beforePostId; } - return ajax(`/groups/${this.get('name')}/${type}.json`, { data: data }).then(posts => { + return ajax(`/groups/${this.get('name')}/${type}`, { data: data }).then(posts => { return posts.map(p => { p.user = Discourse.User.create(p.user); p.topic = Discourse.Topic.create(p.topic); @@ -161,21 +161,21 @@ const Group = Discourse.Model.extend({ Group.reopenClass({ findAll(opts) { - return ajax("/admin/groups.json", { data: opts }).then(function (groups){ + return ajax("/admin/groups", { data: opts }).then(function (groups){ return groups.map(g => Group.create(g)); }); }, findGroupCounts(name) { - return ajax("/groups/" + name + "/counts.json").then(result => Em.Object.create(result.counts)); + return ajax(`/groups/${name}/counts`).then(result => Em.Object.create(result.counts)); }, find(name) { - return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group)); + return ajax(`/groups/${name}`).then(result => Group.create(result.basic_group)); }, loadMembers(name, offset, limit) { - return ajax('/groups/' + name + '/members.json', { + return ajax(`/groups/${name}/members`, { data: { limit: limit || 50, offset: offset || 0 diff --git a/config/routes.rb b/config/routes.rb index 35645a8fbc..8488ec3b19 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -397,8 +397,6 @@ Discourse::Application.routes.draw do get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT} get "posts/:username/flagged" => "posts#flagged_posts", constraints: {username: USERNAME_ROUTE_FORMAT} - get "groups/:id.json" => 'groups#show', constraints: {id: USERNAME_ROUTE_FORMAT}, defaults: {format: 'json'} - resources :groups, id: USERNAME_ROUTE_FORMAT do get "posts.rss" => "groups#posts_feed", format: :rss get "mentions.rss" => "groups#mentions_feed", format: :rss From 0b28075c000e13493a61165f382a42823a7d6da6 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 16:47:18 +0800 Subject: [PATCH 217/266] Revert "REFACTOR: `ajax` defaults to json data type for GET requests." This reverts commit af0b6ce53d3000bc0d8a76853c16e725bb2e33bf. --- .../javascripts/discourse/models/group.js.es6 | 18 +++++++++--------- config/routes.rb | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index 12d352dcca..9980acc81e 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -50,7 +50,7 @@ const Group = Discourse.Model.extend({ removeOwner(member) { var self = this; - return ajax(`/admin/groups/${this.get('id')}/owners`, { + return ajax('/admin/groups/' + this.get('id') + '/owners.json', { type: "DELETE", data: { user_id: member.get("id") } }).then(function() { @@ -61,7 +61,7 @@ const Group = Discourse.Model.extend({ removeMember(member) { var self = this; - return ajax(`/groups/${this.get('id')}/members`, { + return ajax('/groups/' + this.get('id') + '/members.json', { type: "DELETE", data: { user_id: member.get("id") } }).then(function() { @@ -72,7 +72,7 @@ const Group = Discourse.Model.extend({ addMembers(usernames) { var self = this; - return ajax(`/groups/${this.get('id')}/members`, { + return ajax('/groups/' + this.get('id') + '/members.json', { type: "PUT", data: { usernames: usernames } }).then(function() { @@ -82,7 +82,7 @@ const Group = Discourse.Model.extend({ addOwners(usernames) { var self = this; - return ajax(`/admin/groups/${this.get('id')}/owners`, { + return ajax('/admin/groups/' + this.get('id') + '/owners.json', { type: "PUT", data: { usernames: usernames } }).then(function() { @@ -141,7 +141,7 @@ const Group = Discourse.Model.extend({ var data = {}; if (opts.beforePostId) { data.before_post_id = opts.beforePostId; } - return ajax(`/groups/${this.get('name')}/${type}`, { data: data }).then(posts => { + return ajax(`/groups/${this.get('name')}/${type}.json`, { data: data }).then(posts => { return posts.map(p => { p.user = Discourse.User.create(p.user); p.topic = Discourse.Topic.create(p.topic); @@ -161,21 +161,21 @@ const Group = Discourse.Model.extend({ Group.reopenClass({ findAll(opts) { - return ajax("/admin/groups", { data: opts }).then(function (groups){ + return ajax("/admin/groups.json", { data: opts }).then(function (groups){ return groups.map(g => Group.create(g)); }); }, findGroupCounts(name) { - return ajax(`/groups/${name}/counts`).then(result => Em.Object.create(result.counts)); + return ajax("/groups/" + name + "/counts.json").then(result => Em.Object.create(result.counts)); }, find(name) { - return ajax(`/groups/${name}`).then(result => Group.create(result.basic_group)); + return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group)); }, loadMembers(name, offset, limit) { - return ajax(`/groups/${name}/members`, { + return ajax('/groups/' + name + '/members.json', { data: { limit: limit || 50, offset: offset || 0 diff --git a/config/routes.rb b/config/routes.rb index 8488ec3b19..35645a8fbc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -397,6 +397,8 @@ Discourse::Application.routes.draw do get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT} get "posts/:username/flagged" => "posts#flagged_posts", constraints: {username: USERNAME_ROUTE_FORMAT} + get "groups/:id.json" => 'groups#show', constraints: {id: USERNAME_ROUTE_FORMAT}, defaults: {format: 'json'} + resources :groups, id: USERNAME_ROUTE_FORMAT do get "posts.rss" => "groups#posts_feed", format: :rss get "mentions.rss" => "groups#mentions_feed", format: :rss From 84914c5e1f39ad39e93de627d1047783653d3c95 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Nov 2016 17:47:14 +0800 Subject: [PATCH 218/266] PERF: Fix N+1 query. --- app/controllers/admin/groups_controller.rb | 4 +++- app/serializers/basic_group_serializer.rb | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 94ef113634..f2ba6899aa 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -1,7 +1,9 @@ class Admin::GroupsController < Admin::AdminController def index - groups = Group.order(:name).where("id <> ?", Group::AUTO_GROUPS[:everyone]) + groups = Group.order(:name) + .where("id <> ?", Group::AUTO_GROUPS[:everyone]) + .includes(:group_users) if search = params[:search].to_s groups = groups.where("name ILIKE ?", "%#{search}%") diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb index decf144a83..92d06c4541 100644 --- a/app/serializers/basic_group_serializer.rb +++ b/app/serializers/basic_group_serializer.rb @@ -24,8 +24,7 @@ class BasicGroupSerializer < ApplicationSerializer end def notification_level - # TODO: fix this N+1 - GroupUser.where(group_id: object.id, user_id: scope.user.id).first.try(:notification_level) + fetch_group_user&.notification_level end def include_notification_level? @@ -37,11 +36,16 @@ class BasicGroupSerializer < ApplicationSerializer end def is_member - scope.is_admin? || GroupUser.where(group_id: object.id, user_id: scope.user.id).present? + scope.is_admin? || fetch_group_user.present? end def include_is_member? scope.authenticated? end + private + + def fetch_group_user + @group_user ||= (object.group_users & scope.user.group_users).first + end end From 66f68e8faf3fa466a431ebbff7af5c1c93b1c664 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Nov 2016 10:59:15 -0500 Subject: [PATCH 219/266] FIX: correctly bind `this` when sending a widget action --- app/assets/javascripts/discourse/widgets/widget.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index ddbc50c8e0..bb35076a5e 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -319,7 +319,7 @@ export default class Widget { return this.rerenderResult(() => { const widget = this._findAncestorWithProperty(name); if (widget) { - return widget[name](param); + return widget[name].call(widget, param); } return this._sendComponentAction(name, param || this.findAncestorModel()); From 5ba653d6046cd623216094ceac7a0720362c3568 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Nov 2016 11:24:06 -0500 Subject: [PATCH 220/266] Allow old plugins without `d-modal-body` to work --- app/assets/javascripts/discourse/lib/show-modal.js.es6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index e34d7398ef..c0a50a8304 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -21,6 +21,10 @@ export default function(name, opts) { const renderArgs = { into: 'modal', outlet: 'modalBody'}; if (controller) { renderArgs.controller = controllerName; } + if (opts.addModalBodyView) { + renderArgs.view = 'modal-body'; + } + const modalName = `modal/${templateName}`; const fullName = opts.admin ? `admin/templates/${modalName}` : modalName; route.render(fullName, renderArgs); From 054c428ba34ac2d575cfd688ac7e31a4af68ab86 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Nov 2016 11:34:14 -0500 Subject: [PATCH 221/266] FIX: Don't modify variables when rendering --- .../poll/assets/javascripts/components/poll-voters.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/poll/assets/javascripts/components/poll-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-voters.js.es6 index 7dcca87b86..ef756e20ac 100644 --- a/plugins/poll/assets/javascripts/components/poll-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-voters.js.es6 @@ -40,8 +40,10 @@ export default Ember.Component.extend({ didInsertElement() { this._super(); - this.set("numOfVotersToShow", Math.round(this.$().width() / 25) * 2); - if (this.get("voterIds").length > 0) this._fetchUsers(); + Ember.run.scheduleOnce('afterRender', () => { + this.set("numOfVotersToShow", Math.round(this.$().width() / 25) * 2); + if (this.get("voterIds").length > 0) this._fetchUsers(); + }); }, actions: { From af387edeb0908bd5282b92750809c754c7c05c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 24 Nov 2016 18:23:33 +0100 Subject: [PATCH 222/266] FIX: quote button issues - disappear when moving to another topic - disappears when clicking outside of the selection - works even when selecting the last paragraph of a post - works on all latest mobile OS --- .../discourse/components/quote-button.js.es6 | 190 ++++++------------ .../discourse/controllers/topic.js.es6 | 16 +- .../discourse/lib/utilities.js.es6 | 44 ++-- .../javascripts/discourse/templates/topic.hbs | 3 +- .../pretty-text/white-lister.js.es6 | 1 - 5 files changed, 87 insertions(+), 167 deletions(-) diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6 index 6e3ad3502a..f8aea968c8 100644 --- a/app/assets/javascripts/discourse/components/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/components/quote-button.js.es6 @@ -2,129 +2,53 @@ import computed from 'ember-addons/ember-computed-decorators'; import { selectedText } from 'discourse/lib/utilities'; // we don't want to deselect when we click on buttons that use it -function ignoreElements(e) { +function willQuote(e) { const $target = $(e.target); - return $target.hasClass('quote-button') || - $target.closest('.create').length || - $target.closest('.reply-new').length || - $target.closest('.share').length; + return $target.hasClass('quote-button') || $target.closest('.create, .share, .reply-new').length; } export default Ember.Component.extend({ classNames: ['quote-button'], classNameBindings: ['visible'], - isMouseDown: false, - _isTouchInProgress: false, @computed('quoteState.buffer') visible: buffer => buffer && buffer.length > 0, - /** - Binds to the following global events: - - `mousedown` to clear the quote button if they click elsewhere. - - `mouseup` to trigger the display of the quote button. - - `selectionchange` to make the selection work under iOS - - @method didInsertElement - **/ - didInsertElement() { - let onSelectionChanged = () => this._selectText(window.getSelection().anchorNode); - - // Windows Phone hack, it is not firing the touch events - // best we can do is debounce this so we dont keep locking up - // the selection when we add the caret to measure where we place - // the quote reply widget - // - // Same hack applied to Android cause it has unreliable touchend - const isAndroid = this.capabilities.isAndroid; - if (this.capabilities.isWinphone || isAndroid) { - onSelectionChanged = _.debounce(onSelectionChanged, 500); - } - - $(document).on("mousedown.quote-button", e => { - this.set('isMouseDown', true); - - if (ignoreElements(e)) { return; } - - // deselects only when the user left click - // (allows anyone to `extend` their selection using shift+click) - if (!window.getSelection().isCollapsed && - e.which === 1 && - !e.shiftKey) { - this.sendAction('deselectText'); - } - }).on('mouseup.quote-button', e => { - this.set('isMouseDown', false); - if (ignoreElements(e)) { return; } - - this._selectText(e.target); - }).on('selectionchange', () => { - // there is no need to handle this event when the mouse is down - // or if there a touch in progress - if (this.get('isMouseDown') || this._isTouchInProgress) { return; } - // `selection.anchorNode` is used as a target - onSelectionChanged(); - }); - - // Android is dodgy, touchend often will not fire - // https://code.google.com/p/android/issues/detail?id=19827 - if (!isAndroid) { - $(document).on('touchstart.quote-button', () => { - this._isTouchInProgress = true; - return true; - }); - - $(document).on('touchend.quote-button', () => { - this._isTouchInProgress = false; - return true; - }); - } - }, - - _selectText(target) { - // anonymous users cannot "quote-reply" - if (!this.currentUser) return; - - const quoteState = this.get('quoteState'); - - const $target = $(target); - const postId = $target.closest('.boxed, .reply').data('post-id'); - - const details = this.get('topic.details'); - if (!(details.get('can_reply_as_new_topic') || details.get('can_create_post'))) { - return; - } + _isMouseDown: false, + _selectionChanged() { const selection = window.getSelection(); - if (selection.isCollapsed) { - return; + if (selection.isCollapsed) { return; } + + // ensure we selected content inside 1 post + let firstRange, postId; + for (let r = 0; r < selection.rangeCount; r++) { + const range = selection.getRangeAt(r); + firstRange = firstRange || range; + + const $ancestor = $(range.commonAncestorContainer); + if ($ancestor.closest(".contents").length === 0) { return; } + + postId = postId || $ancestor.closest('.boxed, .reply').data('post-id'); + if (!postId) { return; } } - const range = selection.getRangeAt(0), - cloned = range.cloneRange(), - $ancestor = $(range.commonAncestorContainer); + this.get("quoteState").setProperties({ postId, buffer: selectedText() }); - if ($ancestor.closest('.cooked').length === 0) { - return this.sendAction('deselectText'); - } - - const selVal = selectedText(); - if (quoteState.get('buffer') === selVal) { return; } - quoteState.setProperties({ postId, buffer: selVal }); + // on Desktop, shows the button at the beginning of the selection + // on Mobile, shows the button at the end of the selection + const isMobileDevice = this.site.isMobileDevice; + const { isIOS, isAndroid } = this.capabilities; + const showAtEnd = isMobileDevice || isIOS || isAndroid; // create a marker element containing a single invisible character const markerElement = document.createElement("span"); markerElement.appendChild(document.createTextNode("\ufeff")); - const isMobileDevice = this.site.isMobileDevice; - const capabilities = this.capabilities; - const isIOS = capabilities.isIOS; - const isAndroid = capabilities.isAndroid; - - // collapse the range at the beginning/end of the selection - // and insert it at the start of our selection range - range.collapse(!isMobileDevice); - range.insertNode(markerElement); + // on mobile, collapse the range at the end of the selection + if (showAtEnd) { firstRange.collapse(); } + // insert the marker + firstRange.insertNode(markerElement); // retrieve the position of the marker const $markerElement = $(markerElement); @@ -135,41 +59,51 @@ export default Ember.Component.extend({ // remove the marker markerElement.parentNode.removeChild(markerElement); - // work around Chrome that would sometimes lose the selection - const sel = window.getSelection(); - sel.removeAllRanges(); - sel.addRange(cloned); + // change the position of the button + Ember.run.scheduleOnce("afterRender", () => { + let top = markerOffset.top; + let left = markerOffset.left + Math.max(0, parentScrollLeft); - Ember.run.scheduleOnce('afterRender', function() { - let topOff = markerOffset.top; - let leftOff = markerOffset.left; - - if (parentScrollLeft > 0) leftOff += parentScrollLeft; - - if (isMobileDevice || isIOS || isAndroid) { - topOff = topOff + 20; - leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth()); + if (showAtEnd) { + top = top + 20; + left = Math.min(left + 10, $(window).width() - $quoteButton.outerWidth()); } else { - topOff = topOff - $quoteButton.outerHeight() - 5; + top = top - $quoteButton.outerHeight() - 5; } - $quoteButton.offset({ top: topOff, left: leftOff }); + $quoteButton.offset({ top, left }); + }); + + }, + + didInsertElement() { + const { isWinphone, isAndroid } = this.capabilities; + const wait = (isWinphone || isAndroid) ? 250 : 25; + const onSelectionChanged = _.debounce(() => this._selectionChanged(), wait); + + $(document).on("mousedown.quote-button", (e) => { + this._isMouseDown = true; + if (!willQuote(e)) { + this.sendAction("deselectText"); + } + }).on("mouseup.quote-button", () => { + this._isMouseDown = false; + onSelectionChanged(); + }).on("selectionchange.quote-button", () => { + if (!this._isMouseDown) { + onSelectionChanged(); + } }); }, willDestroyElement() { - $(document) - .off("mousedown.quote-button") - .off("mouseup.quote-button") - .off("touchstart.quote-button") - .off("touchend.quote-button") - .off("selectionchange"); - - this.sendAction('deselectText'); + $(document).off("mousedown.quote-button") + .off("mouseup.quote-button") + .off("selectionchange.quote-button"); }, click(e) { - e.stopPropagation(); - this.sendAction('selectText'); + this.sendAction("selectText"); + return false; } }); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index f457bea90e..377aebd76d 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -168,23 +168,21 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { actions: { deselectText() { - const quoteState = this.get('quoteState'); - quoteState.setProperties({ buffer: null, postId: null }); + this.get('quoteState').setProperties({ buffer: null, postId: null }); }, selectText() { - const quoteState = this.get('quoteState'); - const postStream = this.get('model.postStream'); + const { postId, buffer } = this.get('quoteState'); - const postId = quoteState.get('postId'); - postStream.loadPost(postId).then(post => { + this.send('deselectText'); + + this.get('model.postStream').loadPost(postId).then(post => { // If we can't create a post, delegate to reply as new topic if (!this.get('model.details.can_create_post')) { this.send('replyAsNewTopic', post); return; } - const composer = this.get('composer'); const composerOpts = { action: Composer.REPLY, draftKey: post.get('topic.draft_key') @@ -197,19 +195,19 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } // If the composer is associated with a different post, we don't change it. + const composer = this.get('composer'); const composerPost = composer.get('content.post'); if (composerPost && (composerPost.get('id') !== this.get('post.id'))) { composerOpts.post = composerPost; } - const quotedText = Quote.build(post, quoteState.get('buffer')); + const quotedText = Quote.build(post, buffer); composerOpts.quote = quotedText; if (composer.get('content.viewOpen') || composer.get('content.viewDraft')) { this.appEvents.trigger('composer:insert-text', quotedText); } else { composer.open(composerOpts); } - this.send('deselectText'); }); }, diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index 0385fa6555..579e7dbc6d 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -85,37 +85,27 @@ export function extractDomainFromUrl(url) { } export function selectedText() { - var html = ''; + const selection = window.getSelection(); + if (selection.isCollapsed) { return ""; } - if (typeof window.getSelection !== "undefined") { - var sel = window.getSelection(); - if (sel.rangeCount) { - var container = document.createElement("div"); - for (var i = 0, len = sel.rangeCount; i < len; ++i) { - container.appendChild(sel.getRangeAt(i).cloneContents()); - } - html = container.innerHTML; - } - } else if (typeof document.selection !== "undefined") { - if (document.selection.type === "Text") { - html = document.selection.createRange().htmlText; - } + const $div = $("
    "); + for (let r = 0; r < selection.rangeCount; r++) { + const range = selection.getRangeAt(r); + const $ancestor = $(range.commonAncestorContainer); + + // ensure we never quote text in the post menu area + const $postMenuArea = $ancestor.find(".post-menu-area")[0]; + if ($postMenuArea) { range.setEndBefore($postMenuArea); } + + $div.append(range.cloneContents()); } - html = html.replace(/
    /g, "\n"); + // strip click counters + $div.find(".clicks").remove(); + // replace emojis + $div.find("img.emoji").replaceWith(function() { return this.title; }); - // Strip out any .click elements from the HTML before converting it to text - const div = document.createElement('div'); - div.innerHTML = html; - - const $div = $(div); - - // Find all emojis and replace with its title attribute. - $div.find('img.emoji').replaceWith(function() { return this.title; }); - $('.clicks', $div).remove(); - const text = div.textContent || div.innerText || ""; - - return String(text).trim(); + return String($div.text()).trim(); } // Determine the row and col of the caret in an element diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index dc30bd9395..65c0f3f6a8 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -225,8 +225,7 @@ {{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}} {{#if currentUser.enable_quoting}} - {{quote-button topic=model - quoteState=quoteState + {{quote-button quoteState=quoteState selectText="selectText" deselectText="deselectText"}} {{/if}} diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6 index bfe7b8a0b6..81956eb4cc 100644 --- a/app/assets/javascripts/pretty-text/white-lister.js.es6 +++ b/app/assets/javascripts/pretty-text/white-lister.js.es6 @@ -111,7 +111,6 @@ whiteListFeature('default', [ 'a.onebox', 'a[data-bbcode]', 'a[name]', - 'a[name]', 'a[rel=nofollow]', 'a[target=_blank]', 'a[title]', From bb0ab289b936ab0529ea01046ff9c7d6f7d01708 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Nov 2016 12:58:06 -0500 Subject: [PATCH 223/266] Migrate deprecated Ember.ListView to regular components. This is slower for scrolling but it actually feels reasonably fast to me? If we find it's a problem we can revisit once Ember 2.4 is fully in place. --- .../admin/components/permalinks-list.js.es6 | 8 - .../components/screened-emails-list.js.es6 | 8 - .../screened-ip-addresses-list.js.es6 | 8 - .../components/screened-urls-list.js.es6 | 8 - .../components/staff-action-logs-list.js.es6 | 8 - .../templates/components/permalinks-list.hbs | 0 .../logs/screened-emails-list-item.hbs | 10 - .../admin/templates/logs/screened-emails.hbs | 17 +- .../logs/screened-ip-addresses-list-item.hbs | 43 - .../templates/logs/screened-ip-addresses.hbs | 48 +- .../logs/screened-urls-list-item.hbs | 8 - .../admin/templates/logs/screened-urls.hbs | 13 +- .../logs/staff-action-logs-list-item.hbs | 28 - .../templates/logs/staff-action-logs.hbs | 35 +- .../admin/templates/permalinks-list-item.hbs | 23 - .../admin/templates/permalinks.hbs | 30 +- .../ember-addons/list-item-view-mixin.js.es6 | 45 - .../ember-addons/list-item-view.js.es6 | 57 -- .../ember-addons/list-view-helper.js.es6 | 94 -- .../ember-addons/list-view-mixin.js.es6 | 886 ------------------ .../javascripts/ember-addons/list-view.js.es6 | 167 ---- .../reusable-list-item-view.js.es6 | 38 - .../stylesheets/common/admin/admin_base.scss | 6 + 23 files changed, 142 insertions(+), 1446 deletions(-) delete mode 100644 app/assets/javascripts/admin/components/permalinks-list.js.es6 delete mode 100644 app/assets/javascripts/admin/components/screened-emails-list.js.es6 delete mode 100644 app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 delete mode 100644 app/assets/javascripts/admin/components/screened-urls-list.js.es6 delete mode 100644 app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 create mode 100644 app/assets/javascripts/admin/templates/components/permalinks-list.hbs delete mode 100644 app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs delete mode 100644 app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs delete mode 100644 app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs delete mode 100644 app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs delete mode 100644 app/assets/javascripts/admin/templates/permalinks-list-item.hbs delete mode 100644 app/assets/javascripts/ember-addons/list-item-view-mixin.js.es6 delete mode 100644 app/assets/javascripts/ember-addons/list-item-view.js.es6 delete mode 100644 app/assets/javascripts/ember-addons/list-view-helper.js.es6 delete mode 100644 app/assets/javascripts/ember-addons/list-view-mixin.js.es6 delete mode 100644 app/assets/javascripts/ember-addons/list-view.js.es6 delete mode 100644 app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6 diff --git a/app/assets/javascripts/admin/components/permalinks-list.js.es6 b/app/assets/javascripts/admin/components/permalinks-list.js.es6 deleted file mode 100644 index c5027fe8e7..0000000000 --- a/app/assets/javascripts/admin/components/permalinks-list.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import ListView from 'ember-addons/list-view'; -import ListItemView from 'ember-addons/list-item-view'; - -export default ListView.extend({ - height: 700, - rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks-list-item"}) -}); diff --git a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 b/app/assets/javascripts/admin/components/screened-emails-list.js.es6 deleted file mode 100644 index aaf883a3c9..0000000000 --- a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import ListView from 'ember-addons/list-view'; -import ListItemView from 'ember-addons/list-item-view'; - -export default ListView.extend({ - height: 700, - rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-emails-list-item"}) -}); diff --git a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 deleted file mode 100644 index 83abab4b8c..0000000000 --- a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import ListView from 'ember-addons/list-view'; -import ListItemView from 'ember-addons/list-item-view'; - -export default ListView.extend({ - height: 700, - rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-ip-addresses-list-item"}) -}); diff --git a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 b/app/assets/javascripts/admin/components/screened-urls-list.js.es6 deleted file mode 100644 index b34bc3fc51..0000000000 --- a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import ListView from 'ember-addons/list-view'; -import ListItemView from 'ember-addons/list-item-view'; - -export default ListView.extend({ - height: 700, - rowHeight: 32, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-urls-list-item"}) -}); diff --git a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 deleted file mode 100644 index bf68175563..0000000000 --- a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 +++ /dev/null @@ -1,8 +0,0 @@ -import ListView from 'ember-addons/list-view'; -import ListItemView from 'ember-addons/list-item-view'; - -export default ListView.extend({ - height: 700, - rowHeight: 75, - itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff-action-logs-list-item"}) -}); diff --git a/app/assets/javascripts/admin/templates/components/permalinks-list.hbs b/app/assets/javascripts/admin/templates/components/permalinks-list.hbs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs deleted file mode 100644 index 27cbf41985..0000000000 --- a/app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs +++ /dev/null @@ -1,10 +0,0 @@ - -
    {{actionName}}
    -
    {{match_count}}
    -
    {{age-with-tooltip last_match_at}}
    -
    {{age-with-tooltip created_at}}
    -
    {{ip_address}}
    -
    -
    diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs index b36d2a5688..685d8455c3 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs @@ -19,7 +19,22 @@
    - {{screened-emails-list content=model}} + {{#each model as |item|}} +
    + +
    {{item.actionName}}
    +
    {{item.match_count}}
    +
    {{age-with-tooltip item.last_match_at}}
    +
    {{age-with-tooltip item.created_at}}
    +
    {{item.ip_address}}
    +
    + {{d-button action="clearBlock" actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}} +
    +
    +
    + {{/each}} {{else}} diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs deleted file mode 100644 index 056b86f9e5..0000000000 --- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs +++ /dev/null @@ -1,43 +0,0 @@ -
    - {{#if editing}} - {{text-field value=ip_address autofocus="autofocus"}} - {{else}} - - {{#if isRange}} - {{ip_address}} - {{else}} - {{ip_address}} - {{/if}} - - {{/if}} -
    -
    - {{#if isBlocked}} - {{fa-icon "ban"}} - {{else}} - {{fa-icon "check"}} - {{/if}} - {{actionName}} -
    -
    {{match_count}}
    -
    - {{#if last_match_at}} - {{age-with-tooltip last_match_at}} - {{/if}} -
    -
    {{age-with-tooltip created_at}}
    -
    - {{#unless editing}} - {{d-button action="destroy" actionParam=this icon="trash-o" class="btn-danger"}} - {{d-button action="edit" actionParam=this icon="pencil"}} - {{#if isBlocked}} - {{d-button action="allow" actionParam=this icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} - {{else}} - {{d-button action="block" actionParam=this icon="ban" label="admin.logs.screened_ips.actions.block"}} - {{/if}} - {{else}} - {{d-button action="save" actionParam=this label="admin.logs.save"}} - {{i18n 'cancel'}} - {{/unless}} -
    -
    diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs index 82e4f88888..ca6c216f50 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs @@ -24,7 +24,53 @@
    - {{screened-ip-addresses-list content=model}} + {{#each model as |item|}} +
    +
    + {{#if item.editing}} + {{text-field value=item.ip_address autofocus="autofocus"}} + {{else}} + + {{#if item.isRange}} + {{item.ip_address}} + {{else}} + {{item.ip_address}} + {{/if}} + + {{/if}} +
    +
    + {{#if item.isBlocked}} + {{fa-icon "ban"}} + {{else}} + {{fa-icon "check"}} + {{/if}} + {{item.actionName}} +
    +
    {{item.match_count}}
    +
    + {{#if item.last_match_at}} + {{age-with-tooltip item.last_match_at}} + {{/if}} +
    +
    {{age-with-tooltip item.created_at}}
    +
    + {{#unless item.editing}} + {{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}} + {{d-button action="edit" actionParam=item icon="pencil"}} + {{#if isBlocked}} + {{d-button action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} + {{else}} + {{d-button action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}} + {{/if}} + {{else}} + {{d-button action="save" actionParam=item label="admin.logs.save"}} + {{i18n 'cancel'}} + {{/unless}} +
    +
    +
    + {{/each}} {{else}} diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs deleted file mode 100644 index 234f248129..0000000000 --- a/app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    {{domain}}
    -
    -
    {{actionName}}
    -
    {{match_count}}
    -
    {{age-with-tooltip last_match_at}}
    -
    {{age-with-tooltip created_at}}
    -
    diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs index 68071cb32d..40aaceba70 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs @@ -16,7 +16,18 @@
    - {{screened-urls-list content=model}} + {{#each model as |url|}} +
    +
    +
    {{url.domain}}
    +
    +
    {{url.actionName}}
    +
    {{url.match_count}}
    +
    {{age-with-tooltip url.last_match_at}}
    +
    {{age-with-tooltip url.created_at}}
    +
    +
    + {{/each}} {{else}} {{i18n 'search.no_results'}} diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs deleted file mode 100644 index 266c1be7eb..0000000000 --- a/app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs +++ /dev/null @@ -1,28 +0,0 @@ -
    - {{#link-to 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/link-to}} - {{acting_user.username}} -
    -
    - {{actionName}} -
    -
    - {{#if target_user}} - {{#link-to 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/link-to}} - {{target_user.username}} - {{/if}} - {{#if subject}} - {{subject}} - {{/if}} -
    -
    {{age-with-tooltip created_at}}
    -
    - {{{formattedDetails}}} - {{#if useCustomModalForDetails}} - {{i18n 'admin.logs.staff_actions.show'}} - {{/if}} - {{#if useModalForDetails}} - {{i18n 'admin.logs.staff_actions.show'}} - {{/if}} -
    -
    {{context}}
    -
    diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs index 4b2654eadd..18a622f958 100644 --- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs +++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs @@ -49,10 +49,39 @@ {{#conditional-loading-spinner condition=loading}} - {{#if model.length}} - {{staff-action-logs-list content=model}} + {{#each model as |item|}} +
    +
    + {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}} + {{item.acting_user.username}} +
    +
    + {{item.actionName}} +
    +
    + {{#if item.target_user}} + {{#link-to 'adminUser' item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}} + {{item.target_user.username}} + {{/if}} + {{#if item.subject}} + {{item.subject}} + {{/if}} +
    +
    {{age-with-tooltip item.created_at}}
    +
    + {{{item.formattedDetails}}} + {{#if item.useCustomModalForDetails}} + {{i18n 'admin.logs.staff_actions.show'}} + {{/if}} + {{#if item.useModalForDetails}} + {{i18n 'admin.logs.staff_actions.show'}} + {{/if}} +
    +
    {{item.context}}
    +
    +
    {{else}} {{i18n 'search.no_results'}} - {{/if}} + {{/each}} {{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/admin/templates/permalinks-list-item.hbs b/app/assets/javascripts/admin/templates/permalinks-list-item.hbs deleted file mode 100644 index 2a143e07ed..0000000000 --- a/app/assets/javascripts/admin/templates/permalinks-list-item.hbs +++ /dev/null @@ -1,23 +0,0 @@ -
    {{url}}
    -
    - {{#if topic_id}} - {{topic_title}} - {{/if}} -
    -
    - {{#if post_id}} - #{{post_number}} {{post_topic_title}} - {{/if}} -
    -
    - {{#if category_id}} - {{category_name}} - {{/if}} -
    -
    - {{#if external_url}} - {{external_url}} - {{/if}} -
    -
    -
    diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs index 17b33b0037..3ff0b00539 100644 --- a/app/assets/javascripts/admin/templates/permalinks.hbs +++ b/app/assets/javascripts/admin/templates/permalinks.hbs @@ -17,7 +17,35 @@
    - {{permalinks-list content=model}} + {{#each model as |pl|}} +
    +
    {{pl.url}}
    +
    + {{#if pl.topic_id}} + {{pl.topic_title}} + {{/if}} +
    +
    + {{#if pl.post_id}} + #{{pl.post_number}} {{pl.post_topic_title}} + {{/if}} +
    +
    + {{#if pl.category_id}} + {{pl.category_name}} + {{/if}} +
    +
    + {{#if pl.external_url}} + {{pl.external_url}} + {{/if}} +
    +
    + {{d-button action="destroy" actionParam=pl icon="trash-o" class="btn-danger"}} +
    +
    +
    + {{/each}} {{else}} {{i18n 'search.no_results'}} diff --git a/app/assets/javascripts/ember-addons/list-item-view-mixin.js.es6 b/app/assets/javascripts/ember-addons/list-item-view-mixin.js.es6 deleted file mode 100644 index a9faf184a7..0000000000 --- a/app/assets/javascripts/ember-addons/list-item-view-mixin.js.es6 +++ /dev/null @@ -1,45 +0,0 @@ -import Ember from 'ember'; - -function samePosition(a, b) { - return a && b && a.x === b.x && a.y === b.y; -} - -function positionElement() { - var element, position, _position; - - Ember.instrument('view.updateContext.positionElement', this, function() { - element = this.element; - position = this.position; - _position = this._position; - - if (!position || !element) { - return; - } - - // // TODO: avoid needing this by avoiding unnecessary - // // calls to this method in the first place - if (samePosition(position, _position)) { - return; - } - - Ember.run.schedule('render', this, this._parentView.applyTransform, this, position.x, position.y); - this._position = position; - }, this); -} - -export default Ember.Mixin.create({ - classNames: ['ember-list-item-view'], - style: Ember.String.htmlSafe(''), - attributeBindings: ['style'], - _position: null, - _positionElement: positionElement, - - positionElementWhenInserted: Ember.on('init', function(){ - this.one('didInsertElement', positionElement); - }), - - updatePosition: function(position) { - this.position = position; - this._positionElement(); - } -}); diff --git a/app/assets/javascripts/ember-addons/list-item-view.js.es6 b/app/assets/javascripts/ember-addons/list-item-view.js.es6 deleted file mode 100644 index bb24adc854..0000000000 --- a/app/assets/javascripts/ember-addons/list-item-view.js.es6 +++ /dev/null @@ -1,57 +0,0 @@ -import Ember from 'ember'; -import ListItemViewMixin from './list-item-view-mixin'; - -var get = Ember.get, set = Ember.set; - -/** - The `Ember.ListItemView` view class renders a - [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element - with `ember-list-item-view` class. It allows you to specify a custom item - handlebars template for `Ember.ListView`. - - Example: - - ```handlebars - - ``` - - ```javascript - App.ListView = Ember.ListView.extend({ - height: 500, - rowHeight: 20, - itemViewClass: Ember.ListItemView.extend({templateName: "row_item"}) - }); - ``` - - @extends Ember.View - @class ListItemView - @namespace Ember -*/ -export default Ember.View.extend(ListItemViewMixin, { - updateContext: function(newContext) { - var context = get(this, 'context'); - - Ember.instrument('view.updateContext.render', this, function() { - if (context !== newContext) { - set(this, 'context', newContext); - if (newContext && newContext.isController) { - set(this, 'controller', newContext); - } - } - }, this); - }, - - rerender: function () { - if (this.isDestroying || this.isDestroyed) { - return; - } - - return this._super.apply(this, arguments); - }, - - _contextDidChange: Ember.observer(function () { - Ember.run.once(this, this.rerender); - }, 'context', 'controller') -}); diff --git a/app/assets/javascripts/ember-addons/list-view-helper.js.es6 b/app/assets/javascripts/ember-addons/list-view-helper.js.es6 deleted file mode 100644 index 70053a194b..0000000000 --- a/app/assets/javascripts/ember-addons/list-view-helper.js.es6 +++ /dev/null @@ -1,94 +0,0 @@ -import Ember from 'ember'; - -// TODO - remove this! -var el = document.body || document.createElement('div'); -var style = el.style; -var set = Ember.set; - -function getElementStyle (prop) { - var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1); - - var props = [ - prop, - 'webkit' + prop, - 'webkit' + uppercaseProp, - 'Moz' + uppercaseProp, - 'moz' + uppercaseProp, - 'ms' + uppercaseProp, - 'ms' + prop - ]; - - for (var i=0; i < props.length; i++) { - var property = props[i]; - - if (property in style) { - return property; - } - } - - return null; -} - -function getCSSStyle (attr) { - var styleName = getElementStyle(attr); - var prefix = styleName.toLowerCase().replace(attr, ''); - - var dic = { - webkit: '-webkit-' + attr, - moz: '-moz-' + attr, - ms: '-ms-' + attr - }; - - if (prefix && dic[prefix]) { - return dic[prefix]; - } - - return styleName; -} - -var styleAttributeName = getElementStyle('transform'); -var transformProp = getCSSStyle('transform'); -var perspectiveProp = getElementStyle('perspective'); -var supports2D = !!transformProp; -var supports3D = !!perspectiveProp; - -function setStyle (optionalStyleString) { - return function (obj, x, y) { - var isElement = obj instanceof Element; - - if (optionalStyleString && (supports2D || supports3D)) { - var style = Ember.String.fmt(optionalStyleString, x, y); - - if (isElement) { - obj.style[styleAttributeName] = Ember.String.htmlSafe(style); - } else { - set(obj, 'style', Ember.String.htmlSafe(transformProp + ': ' + style)); - } - } else { - if (isElement) { - obj.style.top = y; - obj.style.left = x; - } - } - }; -} - -export default { - transformProp: transformProp, - applyTransform: (function () { - if (supports2D) { - return setStyle('translate(%@px, %@px)'); - } - - return setStyle(); - })(), - apply3DTransform: (function () { - if (supports3D) { - return setStyle('translate3d(%@px, %@px, 0)'); - } else if (supports2D) { - return setStyle('translate(%@px, %@px)'); - } - - return setStyle(); - })() -}; diff --git a/app/assets/javascripts/ember-addons/list-view-mixin.js.es6 b/app/assets/javascripts/ember-addons/list-view-mixin.js.es6 deleted file mode 100644 index bcc0a44449..0000000000 --- a/app/assets/javascripts/ember-addons/list-view-mixin.js.es6 +++ /dev/null @@ -1,886 +0,0 @@ -// TODO: remove unused: false -/* jshint unused: false*/ -import Ember from 'ember'; -import ReusableListItemView from './reusable-list-item-view'; - -var get = Ember.get; -var set = Ember.set; -var min = Math.min; -var max = Math.max; -var floor = Math.floor; -var ceil = Math.ceil; -var forEach = Ember.ArrayPolyfills.forEach; - -function addContentArrayObserver() { - var content = get(this, 'content'); - if (content) { - content.addArrayObserver(this); - } -} - -function removeAndDestroy(object) { - this.removeObject(object); - object.destroy(); -} - -function syncChildViews() { - Ember.run.once(this, '_syncChildViews'); -} - -function sortByContentIndex (viewOne, viewTwo) { - return get(viewOne, 'contentIndex') - get(viewTwo, 'contentIndex'); -} - -function removeEmptyView() { - var emptyView = get(this, 'emptyView'); - if (emptyView && emptyView instanceof Ember.View) { - emptyView.removeFromParent(); - if (this.totalHeightDidChange !== undefined) { - this.totalHeightDidChange(); - } - } -} - -function addEmptyView() { - var emptyView = get(this, 'emptyView'); - - if (!emptyView) { - return; - } - - if ('string' === typeof emptyView) { - emptyView = get(emptyView) || emptyView; - } - - emptyView = this.createChildView(emptyView); - set(this, 'emptyView', emptyView); - - if (Ember.CoreView.detect(emptyView)) { - this._createdEmptyView = emptyView; - } - - this.unshiftObject(emptyView); -} - -function enableProfilingOutput() { - function before(name, time/*, payload*/) { - console.time(name); - } - - function after (name, time/*, payload*/) { - console.timeEnd(name); - } - - if (Ember.ENABLE_PROFILING) { - Ember.subscribe('view._scrollContentTo', { - before: before, - after: after - }); - Ember.subscribe('view.updateContext', { - before: before, - after: after - }); - } -} - -/** - @class Ember.ListViewMixin - @namespace Ember -*/ -export default Ember.Mixin.create({ - itemViewClass: ReusableListItemView, - emptyViewClass: Ember.View, - classNames: ['ember-list-view'], - attributeBindings: ['style'], - classNameBindings: ['_isGrid:ember-list-view-grid:ember-list-view-list'], - scrollTop: 0, - bottomPadding: 0, // TODO: maybe this can go away - _lastEndingIndex: 0, - paddingCount: 1, - _cachedPos: 0, - - _isGrid: Ember.computed.gt('columnCount', 1).readOnly(), - - /** - @private - - Setup a mixin. - - adding observer to content array - - creating child views based on height and length of the content array - - @method init - */ - init: function() { - this._super(); - this._cachedHeights = [0]; - this.on('didInsertElement', this._syncListContainerWidth); - this.columnCountDidChange(); - this._syncChildViews(); - this._addContentArrayObserver(); - }, - - _addContentArrayObserver: Ember.beforeObserver(function() { - addContentArrayObserver.call(this); - }, 'content'), - - /** - Called on your view when it should push strings of HTML into a - `Ember.RenderBuffer`. - - Adds a [div](https://developer.mozilla.org/en-US/docs/HTML/Element/div) - with a required `ember-list-container` class. - - @method render - @param {Ember.RenderBuffer} buffer The render buffer - */ - render: function (buffer) { - var element = buffer.element(); - var dom = buffer.dom; - var container = dom.createElement('div'); - container.className = 'ember-list-container'; - element.appendChild(container); - - this._childViewsMorph = dom.appendMorph(container, container, null); - - return container; - }, - - createChildViewsMorph: function (element) { - this._childViewsMorph = this._renderer._dom.createMorph(element.lastChild, element.lastChild, null); - return element; - }, - - willInsertElement: function() { - if (!this.get('height') || !this.get('rowHeight')) { - throw new Error('A ListView must be created with a height and a rowHeight.'); - } - this._super(); - }, - - /** - @private - - Sets inline styles of the view: - - height - - width - - position - - overflow - - -webkit-overflow - - overflow-scrolling - - Called while attributes binding. - - @property {Ember.ComputedProperty} style - */ - style: Ember.computed('height', 'width', function() { - var height, width, style, css; - - height = get(this, 'height'); - width = get(this, 'width'); - css = get(this, 'css'); - - style = ''; - - if (height) { - style += 'height:' + height + 'px;'; - } - - if (width) { - style += 'width:' + width + 'px;'; - } - - for ( var rule in css ) { - if (css.hasOwnProperty(rule)) { - style += rule + ':' + css[rule] + ';'; - } - } - - return Ember.String.htmlSafe(style); - }), - - /** - @private - - Performs visual scrolling. Is overridden in Ember.ListView. - - @method scrollTo - */ - scrollTo: function(y) { - throw new Error('must override to perform the visual scroll and effectively delegate to _scrollContentTo'); - }, - - /** - @private - - Internal method used to force scroll position - - @method scrollTo - */ - _scrollTo: Ember.K, - - /** - @private - @method _scrollContentTo - */ - _scrollContentTo: function(y) { - var startingIndex, endingIndex, - contentIndex, visibleEndingIndex, maxContentIndex, - contentIndexEnd, contentLength, scrollTop, content; - - scrollTop = max(0, y); - - if (this.scrollTop === scrollTop) { - return; - } - - // allow a visual overscroll, but don't scroll the content. As we are doing needless - // recycyling, and adding unexpected nodes to the DOM. - var maxScrollTop = max(0, get(this, 'totalHeight') - get(this, 'height')); - scrollTop = min(scrollTop, maxScrollTop); - - content = get(this, 'content'); - contentLength = get(content, 'length'); - startingIndex = this._startingIndex(contentLength); - - Ember.instrument('view._scrollContentTo', { - scrollTop: scrollTop, - content: content, - startingIndex: startingIndex, - endingIndex: min(max(contentLength - 1, 0), startingIndex + this._numChildViewsForViewport()) - }, function () { - this.scrollTop = scrollTop; - - maxContentIndex = max(contentLength - 1, 0); - - startingIndex = this._startingIndex(); - visibleEndingIndex = startingIndex + this._numChildViewsForViewport(); - - endingIndex = min(maxContentIndex, visibleEndingIndex); - - if (startingIndex === this._lastStartingIndex && - endingIndex === this._lastEndingIndex) { - - this.trigger('scrollYChanged', y); - return; - } else { - - Ember.run(this, function() { - this._reuseChildren(); - - this._lastStartingIndex = startingIndex; - this._lastEndingIndex = endingIndex; - this.trigger('scrollYChanged', y); - }); - } - }, this); - - }, - - /** - @private - - Computes the height for a `Ember.ListView` scrollable container div. - You must specify `rowHeight` parameter for the height to be computed properly. - - @property {Ember.ComputedProperty} totalHeight - */ - totalHeight: Ember.computed('content.length', - 'rowHeight', - 'columnCount', - 'bottomPadding', function() { - if (typeof this.heightForIndex === 'function') { - return this._totalHeightWithHeightForIndex(); - } else { - return this._totalHeightWithStaticRowHeight(); - } - }), - - _doRowHeightDidChange: function() { - this._cachedHeights = [0]; - this._cachedPos = 0; - this._syncChildViews(); - }, - - _rowHeightDidChange: Ember.observer('rowHeight', function() { - Ember.run.once(this, this._doRowHeightDidChange); - }), - - _totalHeightWithHeightForIndex: function() { - var length = this.get('content.length'); - return this._cachedHeightLookup(length); - }, - - _totalHeightWithStaticRowHeight: function() { - var contentLength, rowHeight, columnCount, bottomPadding; - - contentLength = get(this, 'content.length'); - rowHeight = get(this, 'rowHeight'); - columnCount = get(this, 'columnCount'); - bottomPadding = get(this, 'bottomPadding'); - - return ((ceil(contentLength / columnCount)) * rowHeight) + bottomPadding; - }, - - /** - @private - @method _prepareChildForReuse - */ - _prepareChildForReuse: function(childView) { - childView.prepareForReuse(); - }, - - createChildView: function (_view) { - return this._super(_view, this._itemViewProps || {}); - }, - - /** - @private - @method _reuseChildForContentIndex - */ - _reuseChildForContentIndex: function(childView, contentIndex) { - var content, context, newContext, childsCurrentContentIndex, position, enableProfiling, oldChildView; - - var contentViewClass = this.itemViewForIndex(contentIndex); - - if (childView.constructor !== contentViewClass) { - // rather then associative arrays, lets move childView + contentEntry maping to a Map - var i = this._childViews.indexOf(childView); - childView.destroy(); - childView = this.createChildView(contentViewClass); - this.insertAt(i, childView); - } - - content = get(this, 'content'); - enableProfiling = get(this, 'enableProfiling'); - position = this.positionForIndex(contentIndex); - childView.updatePosition(position); - - set(childView, 'contentIndex', contentIndex); - - if (enableProfiling) { - Ember.instrument('view._reuseChildForContentIndex', position, function() { - - }, this); - } - - newContext = content.objectAt(contentIndex); - childView.updateContext(newContext); - }, - - /** - @private - @method positionForIndex - */ - positionForIndex: function(index) { - if (typeof this.heightForIndex !== 'function') { - return this._singleHeightPosForIndex(index); - } - else { - return this._multiHeightPosForIndex(index); - } - }, - - _singleHeightPosForIndex: function(index) { - var elementWidth, width, columnCount, rowHeight, y, x; - - elementWidth = get(this, 'elementWidth') || 1; - width = get(this, 'width') || 1; - columnCount = get(this, 'columnCount'); - rowHeight = get(this, 'rowHeight'); - - y = (rowHeight * floor(index/columnCount)); - x = (index % columnCount) * elementWidth; - - return { - y: y, - x: x - }; - }, - - // 0 maps to 0, 1 maps to heightForIndex(i) - _multiHeightPosForIndex: function(index) { - var elementWidth, width, columnCount, rowHeight, y, x; - - elementWidth = get(this, 'elementWidth') || 1; - width = get(this, 'width') || 1; - columnCount = get(this, 'columnCount'); - - x = (index % columnCount) * elementWidth; - y = this._cachedHeightLookup(index); - - return { - x: x, - y: y - }; - }, - - _cachedHeightLookup: function(index) { - for (var i = this._cachedPos; i < index; i++) { - this._cachedHeights[i + 1] = this._cachedHeights[i] + this.heightForIndex(i); - } - this._cachedPos = i; - return this._cachedHeights[index]; - }, - - /** - @private - @method _childViewCount - */ - _childViewCount: function() { - var contentLength, childViewCountForHeight; - - contentLength = get(this, 'content.length'); - childViewCountForHeight = this._numChildViewsForViewport(); - - return min(contentLength, childViewCountForHeight); - }, - - /** - @private - - Returns a number of columns in the Ember.ListView (for grid layout). - - If you want to have a multi column layout, you need to specify both - `width` and `elementWidth`. - - If no `elementWidth` is specified, it returns `1`. Otherwise, it will - try to fit as many columns as possible for a given `width`. - - @property {Ember.ComputedProperty} columnCount - */ - columnCount: Ember.computed('width', 'elementWidth', function() { - var elementWidth, width, count; - - elementWidth = get(this, 'elementWidth'); - width = get(this, 'width'); - - if (elementWidth && width > elementWidth) { - count = floor(width / elementWidth); - } else { - count = 1; - } - - return count; - }), - - /** - @private - - Fires every time column count is changed. - - @event columnCountDidChange - */ - columnCountDidChange: Ember.observer(function() { - var ratio, currentScrollTop, proposedScrollTop, maxScrollTop, - scrollTop, lastColumnCount, newColumnCount, element; - - lastColumnCount = this._lastColumnCount; - - currentScrollTop = this.scrollTop; - newColumnCount = get(this, 'columnCount'); - maxScrollTop = get(this, 'maxScrollTop'); - element = this.element; - - this._lastColumnCount = newColumnCount; - - if (lastColumnCount) { - ratio = (lastColumnCount / newColumnCount); - proposedScrollTop = currentScrollTop * ratio; - scrollTop = min(maxScrollTop, proposedScrollTop); - - this._scrollTo(scrollTop); - this.scrollTop = scrollTop; - } - - if (arguments.length > 0) { - // invoked by observer - Ember.run.schedule('afterRender', this, this._syncListContainerWidth); - } - }, 'columnCount'), - - /** - @private - - Computes max possible scrollTop value given the visible viewport - and scrollable container div height. - - @property {Ember.ComputedProperty} maxScrollTop - */ - maxScrollTop: Ember.computed('height', 'totalHeight', function(){ - var totalHeight, viewportHeight; - - totalHeight = get(this, 'totalHeight'); - viewportHeight = get(this, 'height'); - - return max(0, totalHeight - viewportHeight); - }), - - /** - @private - - Determines whether the emptyView is the current childView. - - @method _isChildEmptyView - */ - _isChildEmptyView: function() { - var emptyView = get(this, 'emptyView'); - - return emptyView && emptyView instanceof Ember.View && - this._childViews.length === 1 && this._childViews.indexOf(emptyView) === 0; - }, - - /** - @private - - Computes the number of views that would fit in the viewport area. - You must specify `height` and `rowHeight` parameters for the number of - views to be computed properly. - - @method _numChildViewsForViewport - */ - _numChildViewsForViewport: function() { - - if (this.heightForIndex) { - return this._numChildViewsForViewportWithMultiHeight(); - } else { - return this._numChildViewsForViewportWithoutMultiHeight(); - } - }, - - _numChildViewsForViewportWithoutMultiHeight: function() { - var height, rowHeight, paddingCount, columnCount; - - height = get(this, 'height'); - rowHeight = get(this, 'rowHeight'); - paddingCount = get(this, 'paddingCount'); - columnCount = get(this, 'columnCount'); - - return (ceil(height / rowHeight) * columnCount) + (paddingCount * columnCount); - }, - - _numChildViewsForViewportWithMultiHeight: function() { - var rowHeight, paddingCount, columnCount; - var scrollTop = this.scrollTop; - var viewportHeight = this.get('height'); - var length = this.get('content.length'); - var heightfromTop = 0; - var padding = get(this, 'paddingCount'); - - var startingIndex = this._calculatedStartingIndex(); - var currentHeight = 0; - - var offsetHeight = this._cachedHeightLookup(startingIndex); - for (var i = 0; i < length; i++) { - if (this._cachedHeightLookup(startingIndex + i + 1) - offsetHeight > viewportHeight) { - break; - } - } - - return i + padding + 1; - }, - - - /** - @private - - Computes the starting index of the item views array. - Takes `scrollTop` property of the element into account. - - Is used in `_syncChildViews`. - - @method _startingIndex - */ - _startingIndex: function(_contentLength) { - var scrollTop, rowHeight, columnCount, calculatedStartingIndex, - contentLength; - - if (_contentLength === undefined) { - contentLength = get(this, 'content.length'); - } else { - contentLength = _contentLength; - } - - scrollTop = this.scrollTop; - rowHeight = get(this, 'rowHeight'); - columnCount = get(this, 'columnCount'); - - if (this.heightForIndex) { - calculatedStartingIndex = this._calculatedStartingIndex(); - } else { - calculatedStartingIndex = floor(scrollTop / rowHeight) * columnCount; - } - - var viewsNeededForViewport = this._numChildViewsForViewport(); - var paddingCount = (1 * columnCount); - var largestStartingIndex = max(contentLength - viewsNeededForViewport, 0); - - return min(calculatedStartingIndex, largestStartingIndex); - }, - - _calculatedStartingIndex: function() { - var rowHeight, paddingCount, columnCount; - var scrollTop = this.scrollTop; - var viewportHeight = this.get('height'); - var length = this.get('content.length'); - var heightfromTop = 0; - var padding = get(this, 'paddingCount'); - - for (var i = 0; i < length; i++) { - if (this._cachedHeightLookup(i + 1) >= scrollTop) { - break; - } - } - - return i; - }, - - /** - @private - @event contentWillChange - */ - contentWillChange: Ember.beforeObserver(function() { - var content = get(this, 'content'); - - if (content) { - content.removeArrayObserver(this); - } - }, 'content'), - - /**), - @private - @event contentDidChange - */ - contentDidChange: Ember.observer(function() { - addContentArrayObserver.call(this); - syncChildViews.call(this); - }, 'content'), - - /** - @private - @property {Function} needsSyncChildViews - */ - needsSyncChildViews: Ember.observer(syncChildViews, 'height', 'width', 'columnCount'), - - /** - @private - - Returns a new item view. Takes `contentIndex` to set the context - of the returned view properly. - - @param {Number} contentIndex item index in the content array - @method _addItemView - */ - _addItemView: function (contentIndex) { - var itemViewClass, childView; - - itemViewClass = this.itemViewForIndex(contentIndex); - childView = this.createChildView(itemViewClass); - this.pushObject(childView); - }, - - /** - @public - - Returns a view class for the provided contentIndex. If the view is - different then the one currently present it will remove the existing view - and replace it with an instance of the class provided - - @param {Number} contentIndex item index in the content array - @method _addItemView - @returns {Ember.View} ember view class for this index - */ - itemViewForIndex: function(contentIndex) { - return get(this, 'itemViewClass'); - }, - - /** - @public - - Returns a view class for the provided contentIndex. If the view is - different then the one currently present it will remove the existing view - and replace it with an instance of the class provided - - @param {Number} contentIndex item index in the content array - @method _addItemView - @returns {Ember.View} ember view class for this index - */ - heightForIndex: null, - - /** - @private - - Intelligently manages the number of childviews. - - @method _syncChildViews - **/ - _syncChildViews: function () { - var childViews, childViewCount, - numberOfChildViews, numberOfChildViewsNeeded, - contentIndex, startingIndex, endingIndex, - contentLength, emptyView, count, delta; - - if (this.isDestroyed || this.isDestroying) { - return; - } - - contentLength = get(this, 'content.length'); - emptyView = get(this, 'emptyView'); - - childViewCount = this._childViewCount(); - childViews = this.positionOrderedChildViews(); - - if (this._isChildEmptyView()) { - removeEmptyView.call(this); - } - - startingIndex = this._startingIndex(); - endingIndex = startingIndex + childViewCount; - - numberOfChildViewsNeeded = childViewCount; - numberOfChildViews = childViews.length; - - delta = numberOfChildViewsNeeded - numberOfChildViews; - - if (delta === 0) { - // no change - } else if (delta > 0) { - // more views are needed - contentIndex = this._lastEndingIndex; - - for (count = 0; count < delta; count++, contentIndex++) { - this._addItemView(contentIndex); - } - } else { - // less views are needed - forEach.call( - childViews.splice(numberOfChildViewsNeeded, numberOfChildViews), - removeAndDestroy, - this - ); - } - - this._reuseChildren(); - - this._lastStartingIndex = startingIndex; - this._lastEndingIndex = this._lastEndingIndex + delta; - - if (contentLength === 0 || contentLength === undefined) { - addEmptyView.call(this); - } - }, - - /** - @private - - Applies an inline width style to the list container. - - @method _syncListContainerWidth - **/ - _syncListContainerWidth: function() { - var elementWidth, columnCount, containerWidth, element; - - elementWidth = get(this, 'elementWidth'); - columnCount = get(this, 'columnCount'); - containerWidth = elementWidth * columnCount; - element = this.$('.ember-list-container'); - - if (containerWidth && element) { - element.css('width', containerWidth); - } - }, - - /** - @private - @method _reuseChildren - */ - _reuseChildren: function(){ - var contentLength, childViews, childViewsLength, - startingIndex, endingIndex, childView, attrs, - contentIndex, visibleEndingIndex, maxContentIndex, - contentIndexEnd, scrollTop; - - scrollTop = this.scrollTop; - contentLength = get(this, 'content.length'); - maxContentIndex = max(contentLength - 1, 0); - childViews = this.getReusableChildViews(); - childViewsLength = childViews.length; - - startingIndex = this._startingIndex(); - visibleEndingIndex = startingIndex + this._numChildViewsForViewport(); - - endingIndex = min(maxContentIndex, visibleEndingIndex); - - contentIndexEnd = min(visibleEndingIndex, startingIndex + childViewsLength); - - for (contentIndex = startingIndex; contentIndex < contentIndexEnd; contentIndex++) { - childView = childViews[contentIndex % childViewsLength]; - this._reuseChildForContentIndex(childView, contentIndex); - } - }, - - /** - @private - @method getReusableChildViews - */ - getReusableChildViews: function() { - return this._childViews; - }, - - /** - @private - @method positionOrderedChildViews - */ - positionOrderedChildViews: function() { - return this.getReusableChildViews().sort(sortByContentIndex); - }, - - arrayWillChange: Ember.K, - - /** - @private - @event arrayDidChange - */ - // TODO: refactor - arrayDidChange: function(content, start, removedCount, addedCount) { - var index, contentIndex, state; - - if (this._isChildEmptyView()) { - removeEmptyView.call(this); - } - - // Support old and new Ember versions - state = this._state || this.state; - - if (state === 'inDOM') { - // ignore if all changes are out of the visible change - if (start >= this._lastStartingIndex || start < this._lastEndingIndex) { - index = 0; - // ignore all changes not in the visible range - // this can re-position many, rather then causing a cascade of re-renders - forEach.call( - this.positionOrderedChildViews(), - function(childView) { - contentIndex = this._lastStartingIndex + index; - this._reuseChildForContentIndex(childView, contentIndex); - index++; - }, - this - ); - } - - syncChildViews.call(this); - } - }, - - destroy: function () { - if (!this._super()) { - return; - } - - if (this._createdEmptyView) { - this._createdEmptyView.destroy(); - } - - return this; - } -}); diff --git a/app/assets/javascripts/ember-addons/list-view.js.es6 b/app/assets/javascripts/ember-addons/list-view.js.es6 deleted file mode 100644 index d931babeb0..0000000000 --- a/app/assets/javascripts/ember-addons/list-view.js.es6 +++ /dev/null @@ -1,167 +0,0 @@ -import Ember from 'ember'; -import ListViewHelper from './list-view-helper'; -import ListViewMixin from './list-view-mixin'; - -var get = Ember.get; - -/** - The `Ember.ListView` view class renders a - [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element, - with `ember-list-view` class. - - The context of each item element within the `Ember.ListView` are populated - from the objects in the `ListView`'s `content` property. - - ### `content` as an Array of Objects - - The simplest version of an `Ember.ListView` takes an array of object as its - `content` property. The object will be used as the `context` each item element - inside the rendered `div`. - - Example: - - ```javascript - App.ContributorsRoute = Ember.Route.extend({ - model: function () { - return [ - { name: 'Stefan Penner' }, - { name: 'Alex Navasardyan' }, - { name: 'Ray Cohen'} - ]; - } - }); - ``` - - ```handlebars - {{#ember-list items=contributors height=500 rowHeight=50}} - {{name}} - {{/ember-list}} - ``` - - Would result in the following HTML: - - ```html -
    -
    -
    - Stefan Penner -
    -
    - Alex Navasardyan -
    -
    - Ray Cohen -
    -
    -
    - ``` - - By default `Ember.ListView` provides support for `height`, - `rowHeight`, `width`, `elementWidth`, `scrollTop` parameters. - - Note, that `height` and `rowHeight` are required parameters. - - ```handlebars - {{#ember-list items=this height=500 rowHeight=50}} - {{name}} - {{/ember-list}} - ``` - - If you would like to have multiple columns in your view layout, you can - set `width` and `elementWidth` parameters respectively. - - ```handlebars - {{#ember-list items=this height=500 rowHeight=50 width=500 elementWidth=80}} - {{name}} - {{/ember-list}} - ``` - - ### Extending `Ember.ListView` - - Example: - - ```handlebars - {{view 'list-view' content=content}} - - - ``` - - ```javascript - App.ListView = Ember.ListView.extend({ - height: 500, - width: 500, - elementWidth: 80, - rowHeight: 20, - itemViewClass: Ember.ListItemView.extend({templateName: "row_item"}) - }); - ``` - - @extends Ember.ContainerView - @class ListView - @namespace Ember -*/ -export default Ember.ContainerView.extend(ListViewMixin, { - css: { - position: 'relative', - overflow: 'auto', - '-webkit-overflow-scrolling': 'touch', - 'overflow-scrolling': 'touch' - }, - - applyTransform: ListViewHelper.applyTransform, - - _scrollTo: function(scrollTop) { - var element = this.element; - - if (element) { element.scrollTop = scrollTop; } - }, - - didInsertElement: function() { - var that = this; - - this._updateScrollableHeight(); - - this._scroll = function(e) { that.scroll(e); }; - - Ember.$(this.element).on('scroll', this._scroll); - }, - - willDestroyElement: function() { - Ember.$(this.element).off('scroll', this._scroll); - }, - - scroll: function(e) { - this.scrollTo(e.target.scrollTop); - }, - - scrollTo: function(y) { - this._scrollTo(y); - this._scrollContentTo(y); - }, - - totalHeightDidChange: Ember.observer(function () { - Ember.run.scheduleOnce('afterRender', this, this._updateScrollableHeight); - }, 'totalHeight'), - - _updateScrollableHeight: function () { - var height, state; - - // Support old and new Ember versions - state = this._state || this.state; - - if (state === 'inDOM') { - // if the list is currently displaying the emptyView, remove the height - if (this._isChildEmptyView()) { - height = ''; - } else { - height = get(this, 'totalHeight'); - } - - this.$('.ember-list-container').css({ - height: height - }); - } - } -}); diff --git a/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6 b/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6 deleted file mode 100644 index e2ca3a0f4c..0000000000 --- a/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6 +++ /dev/null @@ -1,38 +0,0 @@ -import Ember from 'ember'; -import ListItemViewMixin from './list-item-view-mixin'; - -var get = Ember.get, set = Ember.set; - -export default Ember.View.extend(ListItemViewMixin, { - prepareForReuse: Ember.K, - - init: function () { - this._super(); - var context = Ember.ObjectProxy.create(); - this.set('context', context); - this._proxyContext = context; - }, - - isVisible: Ember.computed('context.content', function () { - return !!this.get('context.content'); - }), - - updateContext: function (newContext) { - var context = get(this._proxyContext, 'content'); - - // Support old and new Ember versions - var state = this._state || this.state; - - if (context !== newContext) { - if (state === 'inDOM') { - this.prepareForReuse(newContext); - } - - set(this._proxyContext, 'content', newContext); - - if (newContext && newContext.isController) { - set(this, 'controller', newContext); - } - } - } -}); diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index afb5705366..92e4fb820c 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1832,6 +1832,12 @@ table#user-badges { } } +.admin-list-item { + width: 100%; + border-top: 1px solid #e9e9e9; + padding: 0.25em 0; +} + // Webhook .web-hook-container { From 676d585abb85bd2d3ec3a7054d2185e4b1bac631 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Nov 2016 13:17:07 -0500 Subject: [PATCH 224/266] FIX: ESLint --- app/assets/javascripts/discourse/components/quote-button.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6 index f8aea968c8..dd1fea1d70 100644 --- a/app/assets/javascripts/discourse/components/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/components/quote-button.js.es6 @@ -102,7 +102,7 @@ export default Ember.Component.extend({ .off("selectionchange.quote-button"); }, - click(e) { + click() { this.sendAction("selectText"); return false; } From 6168b2c57af3db858a0613db3da097526396a125 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 25 Nov 2016 00:37:51 +0530 Subject: [PATCH 225/266] Update Translations --- config/locales/client.ar.yml | 1 - config/locales/client.cs.yml | 1 - config/locales/client.da.yml | 1 - config/locales/client.de.yml | 1 - config/locales/client.es.yml | 9 +- config/locales/client.et.yml | 3 +- config/locales/client.fa_IR.yml | 1 - config/locales/client.fi.yml | 7 +- config/locales/client.fr.yml | 8 +- config/locales/client.gl.yml | 1 - config/locales/client.he.yml | 8 +- config/locales/client.it.yml | 134 +++++++++- config/locales/client.ko.yml | 1 - config/locales/client.nl.yml | 1 - config/locales/client.pl_PL.yml | 1 - config/locales/client.pt.yml | 24 +- config/locales/client.pt_BR.yml | 116 ++++++++- config/locales/client.ro.yml | 8 +- config/locales/client.ru.yml | 1 - config/locales/client.sk.yml | 1 - config/locales/client.sq.yml | 1 - config/locales/client.sv.yml | 1 - config/locales/client.tr_TR.yml | 6 +- config/locales/client.vi.yml | 1 - config/locales/client.zh_CN.yml | 2 +- config/locales/server.fa_IR.yml | 16 ++ config/locales/server.fr.yml | 4 +- config/locales/server.he.yml | 2 + config/locales/server.it.yml | 19 ++ config/locales/server.pt.yml | 257 ++++++++++++------- config/locales/server.pt_BR.yml | 231 ++++++++++++++--- config/locales/server.ro.yml | 2 + config/locales/server.tr_TR.yml | 1 + config/locales/server.zh_CN.yml | 2 +- plugins/poll/config/locales/client.et.yml | 2 +- plugins/poll/config/locales/server.zh_CN.yml | 5 + public/500.zh_TW.html | 2 +- 37 files changed, 723 insertions(+), 159 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index d0cfcf516d..e127c1fc85 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -812,7 +812,6 @@ ar: account_age_days: "عمر الحساب بالأيام" create: "أرسل دعوة" generate_link: "انسخ رابط الدعوة" - generated_link_message: '

    رابط الدعوة منح بنجاح!

    رابط الدعوة صالح فقط لعنوان البريد الإلكتروني هذا: %{invitedEmail}

    ' bulk_invite: none: "لم تقم بدعوة اي احد حتى الان. تستطيع ارسال دعوة , أو ارسال عدة دعوات عن طريقuploading a bulk invite file." text: "الدعوة من ملف" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 582e308ba8..fab4537254 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -716,7 +716,6 @@ cs: account_age_days: "Stáří účtu ve dnech" create: "Poslat pozvánku" generate_link: "Zkopírovat odkaz na pozvánku" - generated_link_message: '

    Odkaz na poznámku byl úspěšně vygenerován!

    Odkaz na pozvánku je platný jen pro tuto e-mailovou adresu: %{invitedEmail}

    ' bulk_invite: none: "Zatím jste nikoho nepozval. Můžete poslat individuální pozvánku nebo pozvat skupinu lidí naráz pomocí nahrání souboru." text: "Hromadné pozvání s pomocí souboru" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index ec8f3150c3..da38abfdfa 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -683,7 +683,6 @@ da: account_age_days: "Kontoens alder i dage" create: "Send en invitation" generate_link: "Kopier invitations-link" - generated_link_message: '

    Invitationslink genereret!

    Invitationslinket er kun gyldigt for denne email-adresse: %{invitedEmail}

    ' bulk_invite: none: "Du har ikke inviteret nogen her endnu. Du kan sende individuelle invitationer eller invitere en masse mennesker på én gang ved at uploade en samlet liste over invitationer." text: "Masse invitering fra en fil" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index a6023e1430..545d67d3a9 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -685,7 +685,6 @@ de: account_age_days: "Konto-Alter in Tagen" create: "Einladung versenden" generate_link: "Einladungslink kopieren" - generated_link_message: '

    Einladungslink erfolgreich generiert!

    Der Einladungslink ist nur für folgende E-Mail-Adresse gültig: %{invitedEmail}

    ' bulk_invite: none: "Du hast noch niemanden hierher eingeladen. Du kannst individuelle Einladungen verschicken oder eine Masseneinladung an eine Gruppe von Leuten verschicken indem du eine Datei für Masseneinladung hochlädst." text: "Masseneinladung aus Datei" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 2e1e9eddab..e56f979411 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -429,6 +429,7 @@ es: mute: "Silenciar" edit: "Editar Preferencias" download_archive: "Descargar mis posts" + download_archive_confirm: "¿Seguro que quieres descargar tus posts?" new_private_message: "Nuevo mensaje" private_message: "Mensaje" private_messages: "Mensajes" @@ -452,6 +453,7 @@ es: each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses." dismiss_notifications: "Descartar todos" dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas" + first_notification: "¡Tu primera notificación! Selecciónala para comenzar." disable_jump_reply: "No dirigirme a mi post cuando responda" dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon" external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña" @@ -474,6 +476,7 @@ es: Los temas y categorías silenciadas no se incluyen en estos emails. daily: "Enviar actualizaciones diariamente" individual: "Enviar un email por cada nuevo post" + individual_no_echo: "Envíame un email por cada nuevo post excepto los publicados por mí" many_per_day: "Enviarme un email por cada nuevo post (unos {{dailyEmailEstimate}} por día)" few_per_day: "Enviarme un email por cada nuevo post (unos 2 por día)" tag_settings: "Etiquetas" @@ -686,7 +689,8 @@ es: account_age_days: "Antigüedad de la cuenta en días" create: "Enviar una Invitación" generate_link: "Copiar Enlace de Invitación" - generated_link_message: '

    ¡Enlace de Invitación generado con éxito!

    Este enlace de Invitación es sólo válido para la siguiente dirección de email: %{invitedEmail}

    ' + link_generated: "¡Enlace de invitación generado satisfactoriamente!" + valid_for: "El enlace de invitación sólo es válido para esta dirección: %{email}" bulk_invite: none: "No has invitado a nadie todavía. Puedes enviar invitaciones individuales o invitar a un grupo de personas a la vez subiendo un archivo para invitaciones en masa." text: "Archivo de Invitación en Masa" @@ -844,6 +848,7 @@ es: trust_level: 'Nivel de Confianza' search_hint: 'usuario, email o dirección IP' create_account: + disclaimer: "Al registrarte, aceptas la política de privacidad y los términos de servicio." title: "Crear nueva cuenta" failed: "Algo ha salido mal, tal vez este e-mail ya fue registrado, intenta con el enlace 'olvidé la contraseña'" forgot_password: @@ -934,6 +939,8 @@ es: group_mentioned: one: "Al mencionar a {{group}}, estás a punto de notificar a 1 persona – ¿seguro que quieres hacerlo?" other: "Al mencionar a {{group}}, estás a punto de notificar a {{count}} personas – ¿seguro que quieres hacerlo?" + cannot_see_mention: + category: "Mencionaste a {{username}} pero no será notificado porque no tiene acceso a esta categoría. Necesitarás añadirlo a un grupo para que tenga acceso a esta categoría." duplicate_link: "Parece que tu enlace a {{domain}} ha sido ya publicado en el tema por @{{username}} en un post {{ago}} – ¿seguro que quieres publicarlo de nuevo?" error: title_missing: "Es necesario un título" diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index 6b4dbf2e63..0f94d3398f 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -683,7 +683,6 @@ et: account_age_days: "Konto vanus päevades" create: "Saada kutse" generate_link: "Kopeeri viide kutsele" - generated_link_message: '

    Kutse viide edukalt genereeritud!

    Kutse viide on kehtiv vaid selle meiliaadressi jaoks: %{invitedEmail}

    ' bulk_invite: none: "Sa ei ole veel kedagi siia kutsunud. Võid saata kutseid individuaalselt, või korraga tervele grupile kui laed üles masskutsete faili." text: "Masskutse Failist" @@ -1234,7 +1233,7 @@ et: toggle_information: "lülita teema üksikasjad ümber" read_more_in_category: "Soovid veel lugeda? Vaata teisi teemasid {{catLink}} või {{latestLink}}." read_more: "Soovid veel lugeda? {{catLink}} või {{latestLink}}." - read_more_MF: "Sul on { UNREAD, plural, =0 {} one { is 1 lugemata } other { are # lugemata } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 uus teema} other { {BOTH, select, true{and } false {are } other{}} # uut teemat} } jäänud, või {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}\nby priit.varik, a month ago" + read_more_MF: "Sul on { UNREAD, plural, =0 {} one { is 1 lugemata } other { are # lugemata } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 uus teema} other { {BOTH, select, true{and } false {are } other{}} # uut teemat} } jäänud või {CATEGORY, select, true {loe teisi teemasid {catLink} alafoorumis} false {{latestLink}} other {}}" browse_all_categories: Vaata kõiki foorumeid view_latest_topics: vaata värskeid teemasid suggest_create_topic: Teeks äkki teema? diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 6a71eacecd..d7d8af9aab 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -559,7 +559,6 @@ fa_IR: account_age_days: "عمر حساب بر اساس روز" create: "فرستادن یک دعوتنامه" generate_link: "کپی لینک دعوت" - generated_link_message: '

    لینک دعوت با موفقیت تولید شد!

    لینک دعوت فقط برای این ایمیل آدرس معتبر است: %{invitedEmail}

    ' bulk_invite: none: "شما هنوز کسی را اینجا دعوت نکرده اید. می توانید بصورت تکی یا گروهی یکجا دعوتنامه را بفرستید از طریق بارگذار فراخوانه فله ای ." text: "دعوت گروهی از طریق فایل" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index c3e12cd11f..b2272756c2 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -453,6 +453,7 @@ fi: each_browser_note: "Huom: Sinun täytyy vaihtaa tämä asetus kaikissa selaimista, joita käytät." dismiss_notifications: "Unohda kaikki" dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi" + first_notification: "Ensimmäinen ilmoitus sinulle! Valitse se niin aloitetaan." disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen" dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa" external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä" @@ -689,7 +690,6 @@ fi: account_age_days: "Tilin ikä päivissä" create: "Lähetä kutsu" generate_link: "Kopioi kutsulinkki" - generated_link_message: '

    Kutsulinkin kopiointi onnistui!

    Kutsulinkki kelpaa vain tällä sähköpostiosoitteella: %{invitedEmail}

    ' bulk_invite: none: "Et ole kutsunut vielä ketään. Voit lähettää yksittäisiä kutsuja tai kutsua useita ihmisiä kerralla lähettämällä massakutsun tiedostosta." text: "Lähetä massakutsu tiedostosta" @@ -935,6 +935,9 @@ fi: group_mentioned: one: "Jos viittaat ryhmään {{group}}, 1 käyttäjä saa ilmoituksen – oletko varma?" other: "Jos viittaat ryhmään {{group}}, {{count}} käyttäjää saa ilmoituksen – oletko varma?" + cannot_see_mention: + category: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle." + private: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun." duplicate_link: "Näyttää siltä, että @{{username}} on jo lähettänyt saman linkin kohteeseen {{domain}} ketjun aiemmassa viestissä {{ago}} – oletko varma, että haluat lähettää sen uudestaan?" error: title_missing: "Otsikko on pakollinen" @@ -1704,7 +1707,7 @@ fi: edit_permissions: "Muokkaa oikeuksia" add_permission: "Lisää oikeus" this_year: "tänä vuonna" - position: "arvo" + position: "sijainti" default_position: "Oletuspaikka" position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä," position_disabled_click: 'ota käyttöön "pysyvä aluejärjestys" asetuksista.' diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 4eeb35c282..48515b9c3c 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -453,6 +453,7 @@ fr: each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez." dismiss_notifications: "Tout ignorer" dismiss_notifications_tooltip: "Marquer les notifications comme lues" + first_notification: "Votre première notification ! Cliquez-la pour démarrer." disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu" dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur" external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet" @@ -688,7 +689,8 @@ fr: account_age_days: "Âge du compte en jours" create: "Envoyer une invitation" generate_link: "Copier le lien d'invitation" - generated_link_message: '

    Le lien d''invitation a été généré avec succès !

    Le lien d''invitation est valide uniquement pour cette adresse : %{invitedEmail}

    ' + link_generated: "Lien d'invitation généré avec succés !" + valid_for: "Le lien d'invitation est seulement valide pour cette adresse courriel : %{email}" bulk_invite: none: "Vous n'avez encore invité personne. Vous pouvez envoyé des invitations individuelles, ou en masse en envoyant un fichier d'invitation contenant la liste des courriels." text: "Invitation massive depuis un fichier" @@ -846,6 +848,7 @@ fr: trust_level: 'Niveau de confiance' search_hint: 'pseudo, courriel ou adresse IP' create_account: + disclaimer: "En vous s'inscrivant, vous acceptez la politique de confidentialité et les conditions générales d'utilisation." title: "Créer un nouveau compte" failed: "Quelque chose s'est mal passé, peut-être que cette adresse de courriel est déjà enregistrée, essayez le lien Mot de passe oublié." forgot_password: @@ -936,6 +939,9 @@ fr: group_mentioned: one: "En mentionnant {{group}}, vous êtes sur le point de notifier 1 personne – êtes-vous sûr ?" other: "En mentionnant {{group}}, vous êtes sur le point de notifier {{count}} personnes – êtes-vous sûr ?" + cannot_see_mention: + category: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie." + private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message privé. Vous devez inviter cet utilisateur à la discussion." duplicate_link: "Il semblerait que votre lien vers {{domain}} a déjà été partagé par @{{username}} dans une réponse {{ago}} – êtes vous sûr de vouloir le partager à nouveau ?" error: title_missing: "Le titre est obligatoire." diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index ca2e1529cb..787ba5e28c 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -626,7 +626,6 @@ gl: account_age_days: "Tempo da conta en días" create: "Enviar un convite" generate_link: "Copiar a ligazón do convite" - generated_link_message: '

    A ligazón do convite xerouse correctamente.

    A ligazón do convite só é válida para este enderezo de correo-e: %{invitedEmail}

    ' bulk_invite: none: "Aínda non convidaches a ninguén. Podes enviar convites individuais ou en grupo se subes un ficheiro para convites múltiples." text: "Convidar en grupo desde un ficheiro" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 91d41bd8ae..5de4d91f8c 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -453,6 +453,7 @@ he: each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד." dismiss_notifications: "בטלו הכל" dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו" + first_notification: "התראה ראשונה! בחרו אותה כדי להתחיל." disable_jump_reply: "אל תקפצו לפוסטים שלי לאחר שאני משיב/ה" dynamic_favicon: "הצגת מספר נושאים חדשים/מעודכנים על האייקון של הדפדפן" external_links_in_new_tab: "פתח את כל הקישורים החיצוניים בעמוד חדש" @@ -688,7 +689,8 @@ he: account_age_days: "גיל החשבון בימים" create: "שליחת הזמנה" generate_link: "העתקת קישור הזמנה" - generated_link_message: '

    הזמנה נוצרה בהצלחה

    לינק ההזמנה תקף רק למייל הזה: %{invitedEmail}

    ' + link_generated: "קישור הזמנה יוצר בהצלחה!" + valid_for: "קישור הזמנה תקף רק לכתובת המייל הזו: %{email}" bulk_invite: none: "נכון לעכשיו לא הזמנת לכאן אף אחד. תוכלו לשלוח הזמנות אישיות, או להזמין כמה אנשים בבת אחת באמצעות העלאת קובץ הזמנה קבוצתית." text: "הזמנה קבוצתית מקובץ" @@ -846,6 +848,7 @@ he: trust_level: 'רמת אמון' search_hint: 'שם משתמש/ת, דוא"ל או כתובת IP' create_account: + disclaimer: "כשאתם נרשמים, אתם מסכימים למדיניות הפרטיות ותנאי השירות." title: "יצירת חשבון חדש" failed: "משהו לא בסדר, אולי כבר קיימת כתובת דואר אלקטרוני כזו. נסו את קישור שכחתי סיסמה." forgot_password: @@ -936,6 +939,9 @@ he: group_mentioned: one: "על ידי אזכור {{group}}, אתם עומדים ליידע אדם אחד – אתם בטוחים?" other: "על ידי אזכור {{group}}, אתם עומדים ליידע {{count}} אנשים – אתם בטוחים?" + cannot_see_mention: + category: "הזכרתם את {{username}} אבל הוא/היא לא יקבלו התראה כיוון שאין להם גישה לקטגוריה זו. תצטרכו להוסיף אותם לקבוצה שיש לה גישה לקטגוריה הזו." + private: "הזכרתם את {{username}} אבל הוא/היא לא יקבלו התראה כיוון שהם לא יכולים לראות את ההודעה הפרטית הזו. תצטרכו להזמין אותם להודעה פרטית זו." duplicate_link: "נראה שהקישור שלכם ל {{domain}} כבר פורסם בנושא זה על ידי @{{username}} ב תגובה {{ago}} - האם אתם בטוחים שאתם מעוניינים לפרסם אותו שוב?" error: title_missing: "יש להזין כותרת." diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index f902733878..1925eafa52 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -429,6 +429,7 @@ it: mute: "Ignora" edit: "Modifica opzioni" download_archive: "Scarica i miei messaggi" + download_archive_confirm: "Sei sicuro di voler scaricare i tuoi messaggi?" new_private_message: "Nuovo Messaggio" private_message: "Messaggio" private_messages: "Messaggi" @@ -452,6 +453,7 @@ it: each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi." dismiss_notifications: "Chiudi Tutti" dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette " + first_notification: "La tua prima notifica! Selezionala per iniziare." disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta" dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser" external_links_in_new_tab: "Apri tutti i link esterni in nuove schede" @@ -465,8 +467,16 @@ it: suspended_notice: "Questo utente è sospeso fino al {{date}}." suspended_reason: "Motivo: " github_profile: "Github" + email_activity_summary: "Riassunto Attività" mailing_list_mode: + label: "Modalità Mailing list" + enabled: "Abilita la modalità Mailing list" + instructions: | + Questa impostazione modifica il riassunto attività.
    + Gli argomenti e le categorie silenziate non sono incluse in queste email. + daily: "Invia aggiornamenti giornalieri" individual: "Invia una email per ogni nuovo messaggio" + individual_no_echo: "Invia una email per ogni nuovo messaggio, eccetto per i miei" many_per_day: "Inviamo una email per ogni nuovo messaggio (circa {{dailyEmailEstimate}} al giorno)" few_per_day: "Inviami una email per ogni nuovo messaggio (circa 2 al giorno)" tag_settings: "Etichette" @@ -481,7 +491,9 @@ it: tracked_categories: "Seguite" tracked_categories_instructions: "Seguirai automaticamente tutti gli argomenti appartenenti a queste categorie. Accanto all'argomento comparirà il conteggio dei nuovi messaggi." watched_first_post_categories: "Osservando Primo Messaggio" + watched_first_post_categories_instructions: "Riceverai solo la notifica per il primo messaggio di ogni nuovo argomento in queste categorie." watched_first_post_tags: "Osservando Primo Messaggio" + watched_first_post_tags_instructions: "Riceverai solo la notifica per il primo messaggio di ogni nuovo argomento con queste etichette." muted_categories: "Silenziate" muted_categories_instructions: "Non ti verrà notificato nulla sui nuovi argomenti in queste categorie, e non compariranno nell'elenco Ultimi." delete_account: "Cancella il mio account" @@ -496,7 +508,9 @@ it: muted_topics_link: "Mostra argomenti silenziati" watched_topics_link: "Mostra argomenti osservati" automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo." + apps: "Applicazioni" revoke_access: "Revoca Accesso" + undo_revoke_access: "Annullare Revoca Accesso" api_approved: "Approvato:" staff_counters: flags_given: "segnalazioni utili" @@ -586,6 +600,7 @@ it: title: "Lingua dell'interfaccia" instructions: "Lingua dell'interfaccia utente. Cambierà quando aggiornerai la pagina." default: "(default)" + any: "qualunque" password_confirmation: title: "Ripeti la password" last_posted: "Ultimo Messaggio" @@ -610,12 +625,14 @@ it: always: "sempre" never: "mai" email_digests: + title: "Se non dovessi visitare questo sito, inviami un riassunto via email degli argomenti più discussi e delle risposte" every_30_minutes: "ogni 30 minuti" every_hour: "ogni ora" daily: "ogni giorno" every_three_days: "ogni tre giorni" weekly: "ogni settimana" every_two_weeks: "ogni due settimane" + include_tl0_in_digests: "Includi contenuti dei nuovi utenti nelle email di riepilogo" email_in_reply_to: "Nelle email includi un estratto delle risposte al messaggio" email_direct: "Inviami un'email quando qualcuno mi cita, risponde a un mio messaggio, menziona il mio @nome o mi invita ad un argomento" email_private_messages: "Inviami una email quando qualcuno mi scrive un messaggio" @@ -641,6 +658,7 @@ it: after_4_minutes: "dopo 4 minuti" after_5_minutes: "dopo 5 minuti" after_10_minutes: "dopo 10 minuti" + notification_level_when_replying: "Quando scrivo in un argomento, modifica il titolo dell'argomento a" invited: search: "digita per cercare inviti..." title: "Inviti" @@ -671,7 +689,8 @@ it: account_age_days: "Età dell'utente in giorni" create: "Invia un Invito" generate_link: "Copia il collegamento di invito" - generated_link_message: '

    Il collegamento di invito è stato generato con successo!

    Il collegamento sarà valido solo per la seguente email: %{invitedEmail}

    ' + link_generated: "Link di invito generato con successo!" + valid_for: "Questo link di invito è valido solamente per questo indirizzo email: %{email}" bulk_invite: none: "Non hai ancora invitato nessuno qui. Puoi inviare inviti individuali, o invitare un gruppo di persone caricando un file di invito di massa." text: "Invito di Massa da File" @@ -722,6 +741,9 @@ it: more_badges: "Altri Distintivi" top_links: "Migliori Collegamenti" no_links: "Ancora nessun collegamento." + most_liked_by: "Ricevuto più \"Mi Piace\" da" + most_liked_users: "Con più \"Mi Piace\"" + most_replied_to_users: "Più Risposte A" no_likes: "Ancora nessun \"Mi piace\"." associated_accounts: "Connessioni" ip_address: @@ -771,7 +793,15 @@ it: too_few_topics_and_posts_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti e %{currentPosts} / %{requiredPosts} messaggi. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." too_few_topics_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." too_few_posts_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti e %{currentPosts} / %{requiredPosts} messaggi. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." + logs_error_rate_notice: + reached: "%{relativeAge} – %{rate} ha raggiunto i limiti impostati di %{siteSettingRate}." + exceeded: "%{relativeAge} – %{rate} ha ecceduto i limiti impostati di %{siteSettingRate}." + rate: + one: "1 errore/%{duration}" + other: "%{count} errori/%{duration}" learn_more: "per saperne di più..." + all_time: 'totale' + all_time_desc: 'numero totale di argomenti creati' year: 'all''anno' year_desc: 'argomenti creati negli ultimi 365 giorni' month: 'al mese' @@ -809,6 +839,7 @@ it: title: "Messaggio" invite: "Invita altri utenti..." remove_allowed_user: "Davvero vuoi rimuovere {{name}} da questo messaggio?" + remove_allowed_group: "Vuoi veramente rimuovere {{name}} da questo messaggio?" email: 'Email' username: 'Nome utente' last_seen: 'Ultima visita' @@ -817,6 +848,7 @@ it: trust_level: 'Livello Esperienza' search_hint: 'nome utente, email o indirizzo IP' create_account: + disclaimer: "Registrandoti, accetti la privacy policy e i termini di servizio." title: "Crea Nuovo Account" failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password" forgot_password: @@ -875,6 +907,16 @@ it: github: title: "con GitHub" message: "Autenticazione con GitHub (assicurati che il blocco pop up non sia attivo)" + emoji_set: + apple_international: "Apple/International" + google: "Google" + twitter: "Twitter" + emoji_one: "Emoji One" + win10: "Win10" + category_page_style: + categories_only: "Solo Categorie" + categories_with_featured_topics: "Categorie con argomenti in evidenza" + categories_and_latest_topics: "Categorie e ultimi argomenti" shortcut_modifier_key: shift: 'Maiusc' ctrl: 'Ctrl' @@ -884,14 +926,23 @@ it: more_emoji: "altro..." options: "Opzioni" whisper: "sussurra" + unlist: "invisibile" add_warning: "Questo è un avvertimento ufficiale." toggle_whisper: "Attiva/Disattiva Sussurri" + toggle_unlisted: "Attiva/Disattiva Invisibili" posting_not_on_topic: "A quale argomento vuoi rispondere?" saving_draft_tip: "salvataggio..." saved_draft_tip: "salvato" saved_local_draft_tip: "salvato in locale" similar_topics: "Il tuo argomento è simile a..." drafts_offline: "bozze offline" + group_mentioned: + one: "Menzionando {{group}}, stai per notificare 1 persona – sei sicuro?" + other: "Menzionando {{group}}, stai per notificare {{count}} persone – sei sicuro?" + cannot_see_mention: + category: "Hai menzionato {{username}} ma non saranno notificati perché non hanno accesso a questa categoria. Dovrai aggiungerli ad un gruppo che ha accesso a questa categoria." + private: "Hai menzionato {{username}} ma non saranno notificati perché non hanno accesso a questo messaggio personale. Dovrai invitarli a questo MP." + duplicate_link: "Sembra che il tuo link a {{domain}} sia già stato pubblicato nell'argomento di @{{username}} una risposta {{ago}} – sei sicuro di volerlo pubblicare ancora?" error: title_missing: "Il titolo è richiesto" title_too_short: "Il titolo deve essere lungo almeno {{min}} caratteri" @@ -921,8 +972,10 @@ it: show_preview: 'visualizza anteprima »' hide_preview: '« nascondi anteprima' quote_post_title: "Cita l'intero messaggio" + bold_label: "G" bold_title: "Grassetto" bold_text: "testo in grassetto" + italic_label: "I" italic_title: "Italic" italic_text: "testo italic" link_title: "Collegamento" @@ -940,6 +993,7 @@ it: olist_title: "Elenco Numerato" ulist_title: "Elenco Puntato" list_item: "Elemento lista" + heading_label: "T" heading_title: "Intestazione" heading_text: "Intestazione" hr_title: "Linea Orizzontale" @@ -948,6 +1002,9 @@ it: modal_ok: "OK" modal_cancel: "Annulla" cant_send_pm: "Spiacenti, non puoi inviare un messaggio a %{username}." + yourself_confirm: + title: "Hai dimenticato di aggiungere i destinatari?" + body: "In questo momento questo messaggio è visibile solo a te!" admin_options_title: "Impostazioni dello staff opzionali per l'argomento" auto_close: label: "Tempo per auto-chiusura argomento:" @@ -961,20 +1018,31 @@ it: notifications: title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc." none: "Impossibile caricare le notifiche al momento." + empty: "Nessuna notifica trovata." more: "visualizza le notifiche precedenti" total_flagged: "totale argomenti segnalati" mentioned: "

    {{username}} {{description}}

    " group_mentioned: "

    {{username}} {{description}}

    " quoted: "

    {{username}} {{description}}

    " replied: "

    {{username}} {{description}}

    " + posted: "

    {{username}} {{description}}

    " edited: "

    {{username}} {{description}}

    " liked: "

    {{username}} {{description}}

    " + liked_2: "

    {{username}}, {{username2}} {{description}}

    " + liked_many: + one: "

    {{username}}, {{username2}} e 1 altro {{description}}

    " + other: "

    {{username}}, {{username2}} e {{count}} altri {{description}}

    " private_message: "

    {{username}} {{description}}

    " invited_to_private_message: "

    {{username}} {{description}}

    " invited_to_topic: "

    {{username}} {{description}}

    " invitee_accepted: "

    {{username}}ha accettato il tuo invito

    " moved_post: "

    {{username}} ha spostato {{description}}

    " + linked: "

    {{username}} {{description}}

    " granted_badge: "

    Guadagnato '{{description}}'

    " + watching_first_post: "

    Nuovo Argomento {{description}}

    " + group_message_summary: + one: "

    {{count}} messaggio nella tua casella {{group_name}}

    " + other: "

    {{count}} messaggi nella tua casella {{group_name}}

    " alt: mentioned: "Menzionato da" quoted: "Citato da" @@ -1031,8 +1099,47 @@ it: post_format: "#{{post_number}} da {{username}}" context: user: "Cerca messaggi di @{{username}}" + category: "Cerca nella categoria #{{category}}" topic: "Cerca in questo argomento" private_messages: "Cerca messaggi" + advanced: + title: Ricerca Avanzata + posted_by: + label: Pubblicato da + in_category: + label: In Categoria + in_group: + label: In Gruppo + with_badge: + label: Con Distintivo + with_tags: + label: Con Etichette + filters: + label: Mostra solamente argomenti/post che... + likes: Ho messo "Mi Piace" + posted: Ho pubblicato in + watching: Sto' osservando + tracking: Sto' seguendo + private: sono nei miei messaggi + bookmarks: Ho aggiunto ai segnalibri + first: sono il primissimo post + pinned: sono appuntati + unpinned: non sono appuntati + wiki: sono wiki + statuses: + label: Dove gli argomenti + open: sono aperti + closed: sono chiusi + archived: sono archiviati + noreplies: hanno zero risposte + single_user: contengono un singolo utente + post: + count: + label: Conteggio Messaggi Minimo + time: + label: Pubblicato + before: prima + after: dopo hamburger_menu: "vai ad un'altra lista di argomenti o categoria" new_item: "nuovo" go_back: 'indietro' @@ -1092,6 +1199,9 @@ it: unsubscribe: stop_notifications: "Da ora riceverai meno notifiche per {{title}}" change_notification_state: "Lo stato delle tue notifiche è" + filter_to: + one: "1 messaggio in questo argomento" + other: "{{count}} messaggi in questo argomento" create: 'Nuovo Argomento' create_long: 'Crea un nuovo Argomento' private_message: 'Inizia a scrivere un messaggio' @@ -1151,6 +1261,9 @@ it: auto_close_title: 'Impostazioni di auto-chiusura' auto_close_save: "Salva" auto_close_remove: "Non chiudere automaticamente questo argomento" + auto_close_immediate: + one: "L'ultimo messaggio nell'argomento è già vecchio di 1 ora, per cui l'argomento verrà chiuso immediatamente." + other: "L'ultimo messaggio nell'argomento è già vecchio di %{count} ore, per cui l'argomento verrà chiuso immediatamente." timeline: back: "Indietro" back_description: "Torna indietro al tuo ultimo messaggio non letto" @@ -1169,6 +1282,8 @@ it: notifications: title: cambia la frequenza con cui sarai avvertito su questo argomento reasons: + mailing_list_mode: "Hai la modalità mailing list abilitata, verrai notificato delle risposte a questo argomento via email." + '3_10': 'Riceverai notifiche perché stai osservando una etichetta in questo argomento.' '3_6': 'Riceverai notifiche perché stai osservando questa categoria.' '3_5': 'Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente.' '3_2': 'Riceverai notifiche perché stai osservando questo argomento.' @@ -1221,6 +1336,8 @@ it: invisible: "Rendi Invisibile" visible: "Rendi Visibile" reset_read: "Reimposta Dati Letti" + make_public: "Rendi Pubblico questo Argomento" + make_private: "Rendi un Messaggio Privato" feature: pin: "Appunta Argomento" unpin: "Spunta Argomento" @@ -1236,6 +1353,9 @@ it: share: title: 'Condividi' help: 'condividi un collegamento a questo argomento' + print: + title: 'Stampa' + help: 'Apri una versione da stampa di questo argomento' flag_topic: title: 'Segnala' help: 'segnala questo argomento o invia una notifica privata' @@ -1267,12 +1387,14 @@ it: no_banner_exists: "Non c'è alcun argomento annuncio." banner_exists: "C'è attualmente un argomento annuncio." inviting: "Sto invitando..." + automatically_add_to_groups: "Questo invito include anche l'accesso ai seguenti gruppi:" invite_private: title: 'Invita al Messaggio' email_or_username: "Email o Utente di chi invita" email_or_username_placeholder: "indirizzo email o nome utente" action: "Invita" success: "Abbiamo invitato l'utente a partecipare a questo messaggio." + success_group: "Abbiamo invitato quel gruppo a partecipare a questo messaggio." error: "Spiacenti, si è verificato un errore durante l'invito dell'utente." group_name: "nome gruppo" controls: "Impostazioni Argomento" @@ -1381,6 +1503,7 @@ it: create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo." edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo." upload: "Spiacenti, si è verificato un errore durante il caricamento del file. Prova di nuovo." + file_too_large: "Spiacente, questo file è troppo grande (la grandezza massima è {{max_size_kb}}kb). Perché non carichi il tuo file in un servizio di cloud sharing e poi condividi il link?" too_many_uploads: "Spiacenti, puoi caricare un solo file per volta." too_many_dragged_and_dropped_files: "Spiacenti, puoi caricare solo 10 file alla volta." upload_not_authorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: {{authorized_extensions}})." @@ -1392,6 +1515,7 @@ it: no_value: "No, mantienilo" yes_value: "Si, abbandona" via_email: "questo messaggio è arrivato via email" + via_auto_generated_email: "questo post è arrivato tramite una mail auto generata" whisper: "questo messaggio è un sussurro privato per i moderatori" wiki: about: "questo messaggio è una guida" @@ -1545,6 +1669,7 @@ it: topic_template: "Modello di Argomento" tags: "Etichette" tags_allowed_tags: "Etichette che si possono usare soltanto in questa categoria:" + tags_allowed_tag_groups: "Aggiungi etichette ai gruppi che possono essere utilizzati unicamente in questa categoria:" tags_placeholder: "Elenco (opzionale) delle etichette permesse" tag_groups_placeholder: "Elenco (opzionale) dei gruppi di etichette permessi" delete: 'Elimina Categoria' @@ -1581,6 +1706,7 @@ it: email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email," email_in_disabled_click: 'abilita l''impostazione "email entrante".' suppress_from_homepage: "Elimina questa categoria dalla homepage." + sort_order: "Ordinamento di Default:" allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria" edit_permissions: "Modifica Permessi" add_permission: "Aggiungi Permesso" @@ -1601,6 +1727,12 @@ it: muted: title: "Silenziato" description: "Non ti verrà mai notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nell'elenco dei Non letti." + sort_options: + default: "predefinito" + likes: "Mi piace" + op_likes: "\"Mi Piace\" del Post Originale" + views: "Visualizzazioni" + posts: "Messaggi" flagging: title: 'Grazie per aiutarci a mantenere la nostra comunità civile!' action: 'Segnala Messaggio' diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 248363a683..21b7a0ce96 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -624,7 +624,6 @@ ko: account_age_days: "일일 계정 나이" create: "이 포럼에 친구를 초대하기" generate_link: "초대 링크 복사" - generated_link_message: '

    초대 링크가 성공적으로 생성되었습니다!

    초대 링크는 다음 이메일에 한해 유효합니다: %{invitedEmail}

    ' bulk_invite: none: "아직 아무도 초대하지 않았습니다. 초대장을 각각 보내거나, uploading a bulk invite file을 이용하여 단체 초대를 보낼 수 있습니다." text: "파일로 대량 초대하기" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 16b9c40875..5a16582266 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -686,7 +686,6 @@ nl: account_age_days: "leeftijd van account in dagen" create: "Stuur een uitnodiging" generate_link: "Kopieer uitnodigingslink" - generated_link_message: '

    Uitnodigingslink succesvol aangemaakt!

    Uitnodigingslink is alleen geldig voor dit e-mailadres: %{invitedEmail}

    ' bulk_invite: none: "Je hebt nog niemand uitgenodigd. Je kan individueel uitnodigen of een groep mensen tegelijk door een groepsuitnodiging-bestand te uploaden" text: "Groepsuitnodiging via bestand" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index af9e27fd67..8c2fdb1ff6 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -700,7 +700,6 @@ pl_PL: account_age_days: "Wiek konta w dniach" create: "Wyślij zaproszenie" generate_link: "Skopiuj link z zaproszeniem" - generated_link_message: '

    Link z zaproszeniem został wygenerowany pomyślnie!

    Link zaproszenia jest ważny jedynie dla tego adresu e-mail: %{invitedEmail}

    ' bulk_invite: none: "Jeszcze nikogo nie zaproszono. Możesz wysłać pojedyncze zaproszenie lub zaprosić wiele osób na raz wysyłając odpowiedni plik." text: "Zaproszenia hurtowe z pliku" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 0d11e85142..1d60f903fa 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -429,6 +429,7 @@ pt: mute: "Silenciar" edit: "Editar Preferências" download_archive: "Descarregar As Minhas Publicações" + download_archive_confirm: "Tem a certeza que deseja descarregar as suas publicações?" new_private_message: "Nova Mensagem" private_message: "Mensagem" private_messages: "Mensagens" @@ -452,6 +453,7 @@ pt: each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza." dismiss_notifications: "Marcar Visto Tudo" dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler" + first_notification: "A sua primeira notificação! Seleccione-a para começar." disable_jump_reply: "Não voltar para a minha publicação após eu ter respondido" dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser." external_links_in_new_tab: "Abrir todas as hiperligações externas num novo separador" @@ -687,7 +689,8 @@ pt: account_age_days: "Idade da conta, em dias" create: "Enviar um Convite" generate_link: "Copiar Hiperligação do Convite" - generated_link_message: '

    Hiperligação do Convite gerada corretamente!

    A hiperligação do convite é válida apenas para este endereço de email: %{invitedEmail}

    ' + link_generated: "Ligação de convite gerada com sucesso!" + valid_for: "Ligação de convite é válida apenas para este endereço de email: %{email}" bulk_invite: none: "Ainda não convidou ninguém. Pode enviar convites individuais, ou convidar um grupo de pessoas de uma única vez carregando um ficheiro com convites em massa." text: "Convite em massa a partir de ficheiro" @@ -845,6 +848,7 @@ pt: trust_level: 'Nível de Confiança' search_hint: 'nome de utilizador, email ou endereço de IP' create_account: + disclaimer: "Ao registrar-se, aceita a política de privacidade e os termos de serviço." title: "Criar Nova Conta" failed: "Ocorreu um erro, talvez este email já esteja registado, tente usar a hiperligação \"Esqueci-me da Palavra-passe\"." forgot_password: @@ -935,6 +939,9 @@ pt: group_mentioned: one: "Ao usar {{group}}, estará a notificar 1 pessoa – tem a certeza?" other: "Ao usar {{group}}, estará a notificar {{count}} pessoas – tem a certeza?" + cannot_see_mention: + category: "Mencionou {{username}} mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenho acesso a esta categoria." + private: "Mencionou {{username}} mas estes não serão notificados porque não conseguem ver esta mensagem privada. Terá de os convidar para esta MP." duplicate_link: "Parce que a tua ligação a {{domain}} já foi publicada neste tópico por @{{username}} nesta resposta {{ago}} – tens a certeza de que a queres publicar outra vez?" error: title_missing: "O título é obrigatório" @@ -1275,7 +1282,7 @@ pt: notifications: title: mudar quão frequentemente é notificado sobre este tópico reasons: - mailing_list_mode: "Tem o modo de lista de mailing activado, por isso será notificado de respostas a este tópico por email." + mailing_list_mode: "Tem o modo de lista de distribuição activado, por isso será notificado de respostas a este tópico por email." '3_10': 'Receberá notificações porque está a vigiar uma etiqueta neste tópico.' '3_6': 'Receberá notificações porque está a vigiar esta categoria.' '3_5': 'Receberá notificações porque começou a vigiar automaticamente este tópico.' @@ -1699,6 +1706,7 @@ pt: email_in_disabled: "Publicar novos tópicos através do email está desactivado nas Configurações do Sítio. Para permitir a publicação de novos tópicos através do email," email_in_disabled_click: 'ative a definição "email em".' suppress_from_homepage: "Suprimir esta categoria da página principal." + sort_order: "Ordenação Predefinida:" allow_badges_label: "Permitir a atribuição de distintivos nesta categoria" edit_permissions: "Editar Permissões" add_permission: "Adicionar Permissões" @@ -1724,6 +1732,18 @@ pt: muted: title: "Silenciado" description: "Nunca será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes." + sort_options: + default: "predefinida" + likes: "Gostos" + op_likes: "Gostos à Publicação Original" + views: "Visualizações" + posts: "Publicações" + activity: "Actividade" + posters: "Autores" + category: "Categoria" + created: "Criado" + sort_ascending: 'Ascendente' + sort_descending: 'Descendente' flagging: title: 'Obrigado por ajudar a manter a nossa comunidade cívica!' action: 'Denunciar Mensagem' diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 6f7aef4e76..4678c373d0 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -136,8 +136,9 @@ pt_BR: enabled: 'listou %{when}' disabled: 'desalistou %{when}' topic_admin_menu: "ações administrativas do tópico" + wizard_required: "Chegou a hora de configurar seu fórum! Começar o Assistente de Configuração!" emails_are_disabled: "Todo o envio de email foi globalmente desabilitado por algum administrador. Nenhum email de notificações de qualquer tipo será enviado." - bootstrap_mode_enabled: "Para fazer o lançamento do seu novo site mais fácil, você está no modo de inicialização. A todos os novos usuários será concedido nível de confiança 1 e terão o resumo diário das atualizações ativado. Isso será automaticamente desativado quando a contagem total de usuários exceder %{min_users} usuários." + bootstrap_mode_enabled: "Para facilitar o lançamento do seu novo site, você esta no modo de inicialização. A todos os novos usuários, será concedido o nível de confiança 1 e eles terão o resumo diário de atualizações por email ativado. Isso será automaticamente desativado quando a contagem total de usuários exceder %{min_users} usuários." bootstrap_mode_disabled: "O modo de inicialização será desativado nas próximas 24 horas." s3: regions: @@ -428,6 +429,7 @@ pt_BR: mute: "Silenciar" edit: "Editar Preferências" download_archive: "Fazer Download dos Meus Posts" + download_archive_confirm: "Você tem certeza que deseja baixar as suas postagens?" new_private_message: "Nova Mensagem" private_message: "Mensagem" private_messages: "Mensagens" @@ -451,6 +453,7 @@ pt_BR: each_browser_note: "Nota: Você deve modificar essa configuração em todos navegadores que você usa." dismiss_notifications: "Descartar tudo" dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos" + first_notification: "Sua primeira notificação! Selecione-a para começar." disable_jump_reply: "Não pular para o meu tópico depois que eu respondo" dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados." external_links_in_new_tab: "Abrir todos os links externos em uma nova aba" @@ -473,6 +476,7 @@ pt_BR: Tópicos e categorias silenciados não são incluídos nesses emails. daily: "Enviar atualizações diárias" individual: "Enviar email para cada postagem nova" + individual_no_echo: "Mande um email para todas as novas publicações, exceto as minhas" many_per_day: "Me envie um email para cada nova postagem (aproximadamente {{dailyEmailEstimate}} por dia)" few_per_day: "Me envie um email para cada nova postagem (aproximadamente 2 por dia)" tag_settings: "Etiquetas" @@ -506,6 +510,7 @@ pt_BR: automatically_unpin_topics: "Desafixar automaticamente os tópicos quando eu chegar ao fundo." apps: "Aplicativos" revoke_access: "Revogar Acesso" + undo_revoke_access: "Desfazer a Revogação de Acesso" api_approved: "Aprovada:" staff_counters: flags_given: "sinalizadas úteis" @@ -595,6 +600,7 @@ pt_BR: title: "idioma de interface" instructions: "Idioma de interface do usuário. Será alterado quando você atualizar a página." default: "(padrão)" + any: "qualquer" password_confirmation: title: "Senha novamente" last_posted: "Última resposta" @@ -652,6 +658,7 @@ pt_BR: after_4_minutes: "depois de 4 minutos" after_5_minutes: "depois de 5 minutos" after_10_minutes: "depois de 10 minutos" + notification_level_when_replying: "Quando eu publicar um tópico, definir o tópico como" invited: search: "digite para pesquisar convites..." title: "Convites" @@ -682,7 +689,8 @@ pt_BR: account_age_days: "Idade da conta em dias" create: "Enviar um convite" generate_link: "Copiar Link do Convite" - generated_link_message: '

    Link do convite gerado com sucesso!

    Link do convite válido apenas para este endereço de email: %{invitedEmail}

    ' + link_generated: "Link de convite gerado com sucesso!" + valid_for: "Link de convite é válido apenas para esse endereço de email: %{email}" bulk_invite: none: "Você ainda não convidou ninguém. Você pode enviar convites individuais, ou enviar vários de uma vez através da ferramenta de enviar em massa." text: "Convidar em massa a partir de arquivo" @@ -793,6 +801,7 @@ pt_BR: other: "%{count} erros/%{duration}" learn_more: "aprenda mais..." all_time: 'total' + all_time_desc: 'total de tópicos criados' year: 'ano' year_desc: 'tópicos criados nos últimos 365 dias' month: 'mês' @@ -839,6 +848,7 @@ pt_BR: trust_level: 'Nível de confiança' search_hint: 'nome de usuário, email ou endereço de IP' create_account: + disclaimer: "Ao se registrar, você concorda com a política de privacidade e os termos de serviço." title: "Criar nova conta" failed: "Alguma coisa deu errado, talvez este email já esteja registrado, tente usar o Esqueci a Senha." forgot_password: @@ -926,6 +936,12 @@ pt_BR: saved_local_draft_tip: "salvo localmente" similar_topics: "Seu tópico é parecido com..." drafts_offline: "rascunhos offline" + group_mentioned: + one: "Ao mencionar {{group}}, você está prester a notifcar 1 pessoa – tem certeza?" + other: "Ao mencionar {{group}}, você está prestes a notificar {{count}} pessoas – tem certeza?" + cannot_see_mention: + category: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não tem acesso a essa categoria. Você deverá adicioná-lo(a) ao grupo que tem acesso à categoria." + private: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não pode ver essa mensagem pessoal. Você deverá convidá-lo(a) para essa MP." duplicate_link: "Parece que o seu link para {{domain}} já foi postado no tópico por @{{username}} em uma resposta {{ago}} – tem certeza que deseja postá-lo novamente?" error: title_missing: "Título é obrigatório" @@ -959,6 +975,7 @@ pt_BR: bold_label: "B" bold_title: "Negrito" bold_text: "texto em negrito" + italic_label: "I" italic_title: "Itálico" italic_text: "texto em itálico" link_title: "Link" @@ -976,6 +993,7 @@ pt_BR: olist_title: "Lista numerada" ulist_title: "Lista de itens" list_item: "Item da lista" + heading_label: "H" heading_title: "Título" heading_text: "Título" hr_title: "Barra horizontal" @@ -1113,6 +1131,8 @@ pt_BR: noreplies: tem zero respostas single_user: contém um único usuário post: + count: + label: Contagem de Publicação Mínima time: label: Publicado before: antes @@ -1176,6 +1196,9 @@ pt_BR: unsubscribe: stop_notifications: "Você agora vai receber menos notificações de {{title}}" change_notification_state: "Seu estado de notificação atual é" + filter_to: + one: "1 publicação no tópico" + other: "{{count}} publicações no tópico" create: 'Novo tópico' create_long: 'Criar um novo tópico' private_message: 'Iniciar uma mensagem' @@ -1235,6 +1258,9 @@ pt_BR: auto_close_title: 'Configurações para fechar automaticamente' auto_close_save: "Salvar" auto_close_remove: "Não fechar automaticamente este tópico" + auto_close_immediate: + one: "A última publicação no tópico já tem 1 hora, portanto ele será fechado imediatamente." + other: "A última publicação no tópico já tem %{count} horas, portanto ele será fechado imediatamente." timeline: back: "Voltar" back_description: "Volte para a sua última postagem não lida" @@ -1324,6 +1350,9 @@ pt_BR: share: title: 'Compartilhar' help: 'compartilhar um link deste tópico' + print: + title: 'Imprimir' + help: 'Abrir uma versão imprimível deste tópico' flag_topic: title: 'Sinalizar' help: 'sinaliza privativamente este tópico para chamar atenção ou notificar privativamente sobre isso' @@ -1674,6 +1703,7 @@ pt_BR: email_in_disabled: "Postar novos tópicos via email está desabilitado nas Configurações do Site. Para habilitar respostas em novos tópicos via email," email_in_disabled_click: 'habilitar a configuração de "email em".' suppress_from_homepage: "Suprimir esta categoria da página inicial." + sort_order: "Ordenação Padrão:" allow_badges_label: "Permitir a concessão de emblemas nessa categoria" edit_permissions: "Editar Permissões" add_permission: "Adicionar Permissões" @@ -1699,6 +1729,18 @@ pt_BR: muted: title: "Silenciar" description: "Você nunca será notificado sobre novos tópicos nessas categorias, e não aparecerão no Recentes." + sort_options: + default: "padrão" + likes: "Curtidas" + op_likes: "Curtidas da Publicação Original" + views: "Visualizações" + posts: "Postagens" + activity: "Atividade" + posters: "Participantes" + category: "Categoria" + created: "Criado" + sort_ascending: 'Ascendente' + sort_descending: 'Descendente' flagging: title: 'Obrigado por ajudar a manter a civilidade da nossa comunidade!' action: 'Sinalizar resposta' @@ -1719,6 +1761,16 @@ pt_BR: spam: "É spam" custom_placeholder_notify_user: "Seja específico, construtivo e sempre seja gentil." custom_placeholder_notify_moderators: "Deixe-nos saber especificamente com o que você está preocupado, e nos forneça links relevantes e exemplos quando possível." + custom_message: + at_least: + one: "insira pelo menos 1 caractere" + other: "insira pelo menos {{count}} caracteres" + more: + one: "Falta apenas 1..." + other: "Faltam {{count}}..." + left: + one: "1 restante" + other: "{{count}} restantes" flagging_topic: title: "Obrigado por ajudar a manter a civilidade da nossa comunidade!" action: "Sinalizar Tópico" @@ -1923,6 +1975,7 @@ pt_BR: mark_regular: 'm, r Tópico regular (padrão)' mark_tracking: 'm, t Monitorar o tópico' mark_watching: 'm, w Observar o tópico' + print: 'ctrl+p Imprimir tópico' badges: earned_n_times: one: "Emblema adquirido 1 vez" @@ -2190,6 +2243,9 @@ pt_BR: add_owners: Adicionar proprietários incoming_email: "Endereço de email de entrada personalizado" incoming_email_placeholder: "Insira um endereço de email" + flair_url_placeholder: "(Opcional) URL de imagem ou classe Font Awesome" + flair_bg_color_placeholder: "(Opcional) Valor em hexadecimal da cor" + flair_color_placeholder: "(Opcional) Valor em hexadecimal da cor" flair_preview: "Pré-visualizar" api: generate_master: "Gerar chave Mestra de API" @@ -2206,29 +2262,73 @@ pt_BR: all_users: "Todos os Usuários" note_html: "Guarde esta chave secretamente, todos usuários que tiverem acesso a ela poderão criar posts arbritários no forum como qualquer usuário." web_hooks: + title: "Webhooks" + none: "Não existem webhooks no momento." + instruction: "Webhooks permitem que o Discourse notifique serviços externos quando certos eventos acontecem em seu site. Quando o webhook é desencadeado, uma requisição POST é enviada às URLs fornecidas." + detailed_instruction: "Uma requisição POST será enviada à URL fornecida quando o evento escolhido acontecer." + new: "Novo Webhook" create: "Criar" save: "Salvar" destroy: "Excluir" description: "Descrição" controls: "Controles" go_back: "Volta à lista" + payload_url: "URL do Payload" payload_url_placeholder: "https://example.com/postreceive" + warn_local_payload_url: "Parece que você está tentando configurar um webhook para uma URL local. Eventos entregues a endereços locais podem causar efeitos colaterais ou comportamentos inesperados. Continuar?" + secret_invalid: "O segredo não deve conter caracteres em branco." + secret_too_short: "O segredo deve ter pelo menos 12 caracteres." + secret_placeholder: "Uma string opcional, usada para gerar assinaturas" + event_type_missing: "Você deve configurar apenas um tipo de evento." + content_type: "Tipo de Conteúdo" secret: "Segredo" + event_chooser: "Que eventos devem desencadear esse webhook?" wildcard_event: "Envie-me tudo." individual_event: "Selecionar eventos individuais." + verify_certificate: "Verificar o certificado TLS da URL do payload" active: "Ativo" + active_notice: "Entregaremos detalhes do evento quando ele acontecer." + categories_filter_instructions: "Os webhooks aplicáveis serão desencadeados apenas se o evento estiver relacionado às categorias especificadas. Deixe em branco para desencadear webhooks para todas as categorias." + categories_filter: "Categorias Desencadeadas" + groups_filter_instructions: "Webhooks aplicáveis serão desencadeados apenas se o evento estiver relacionado aos grupos especificados. Deixe em branco para desencadear webhooks para todos os grupos." + groups_filter: "Grupos Desencadeados" + delete_confirm: "Deletar esse webhook?" + topic_event: + details: "Quando existir um tópico novo, revisado, modificado ou deletado." post_event: name: "Publicar Evento" + details: "Quando existir uma nova resposta, edição, deleção ou recuperação." + user_event: + name: "Evento de Usuário" + details: "When um usuário é criado ou aprovado." delivery_status: title: "Status de Entrega" inactive: "Inativo" failed: "Falhou" successful: "Sucesso" events: + none: "Não existem eventos relacionados." + redeliver: "Entregar novamente" + incoming: + one: "Existe um novo evento." + other: "Existem {{count}} novos eventos." + completed_in: + one: "Completado em 1 segundo." + other: "Completado em {{count}} segundos." + request: "Requisição" response: "Resposta" + redeliver_confirm: "Tem certeza que deseja enviar o mesmo payload novamente?" headers: "Cabeçalhos" + payload: "Payload" body: "Corpo" + go_list: "Ir para lista" + go_details: "Editar webhook" + go_events: "Ir para eventos" + ping: "Latência" + status: "Código de Status" + event_id: "ID" timestamp: "Criado" + completion: "Tempo de Conclusão" actions: "Ações" plugins: title: "Plugins" @@ -2612,6 +2712,7 @@ pt_BR: suspend_reason: "Motivo" suspended_by: "Suspenso por" delete_all_posts: "Apagar todas mensagens" + delete_all_posts_confirm_MF: "Você está prestes a apagar {POSTS, plural, one {1 publicação} other {# publicações}} and {TOPICS, plural, one {1 tópico} other {# tópicos}}. Você tem certeza?" suspend: "Suspender" unsuspend: "Readmitir" suspended: "Suspenso?" @@ -2707,6 +2808,9 @@ pt_BR: unlock_trust_level: "Destravar Nível de Confiança" tl3_requirements: title: "Requisitos para o Nível de Confiança 3" + table_title: + one: "No último dia:" + other: "Nos últimos %{count} dias:" value_heading: "Valor" requirement_heading: "Requisito" visits: "Visitas" @@ -2806,6 +2910,7 @@ pt_BR: developer: 'Desenvolvedor' embedding: "Incorporação" legal: "Jurídico" + user_api: 'API de Usuário' uncategorized: 'Outros' backups: "Backups" login: "Entrar" @@ -2894,6 +2999,7 @@ pt_BR: sample: "Use o seguinte código HTML no seu site para criar e incorporar tópicos do Discourse. Troque REPLACE_ME com a URL canônica da página na qual você está incorporando." title: "Incorporar" host: "Hosts Permitidos" + path_whitelist: "Lista de Caminhos Permitidos " edit: "editar" category: "Postar na Categoria" add_host: "Adicionar Host" @@ -2905,6 +3011,7 @@ pt_BR: embed_by_username: "Nome de usuário para criação do tópico" embed_post_limit: "Número máximo de postagens para incorporar" embed_username_key_from_feed: "Chave para obter o nome de usuário no discourse do feed" + embed_title_scrubber: "Expressão regular usada para higienizar o título das publicações" embed_truncate: "Truncar as postagens incorporadas" embed_whitelist_selector: "Seletor de CSS para elementos que são permitidos na incorporação" embed_blacklist_selector: "Seletor de CSS para elementos que são removidos da incorporação" @@ -2932,11 +3039,16 @@ pt_BR: done: "Feito" back: "Voltar" next: "Próximo" + step: "%{current} de %{total}" upload: "Enviar" uploading: "Enviando..." quit: "Talvez Depois" + staff_count: + one: "Sua comunidade tem 1 membro na equipe." + other: "Sua comunidade tem %{count} membros na equipe." invites: add_user: "adicionar" + none_added: "Você ainda não convidou ninguém para a equipe. Tem certeza que deseja continuar?" roles: admin: "Admin" moderator: "Moderador" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 6beda05022..9a247540b4 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -482,6 +482,7 @@ ro: each_browser_note: "Observație: Setările trebuie modificate pe fiecare browser utilizat." dismiss_notifications: "Elimină tot" dismiss_notifications_tooltip: "Marchează toate notificările ca citite" + first_notification: "Prima notificare pe care ai primit-o! Selectează-o ca să continui. " disable_jump_reply: "Nu sări la postarea mea după ce răspund" dynamic_favicon: "Arată subiectele noi/actualizate în pictograma browserului." external_links_in_new_tab: "Deschide toate adresele externe într-un tab nou" @@ -719,7 +720,8 @@ ro: account_age_days: "Vârsta contului în zile" create: "Trimite o invitație" generate_link: "Copiază link-ul de invitație" - generated_link_message: '

    Link-ul de invitație a fost generat cu succes!

    Linkul de invitație e valabil doar pentru această adresă de email: %{invitedEmail}

    ' + link_generated: "Link de invitare generat cu succes!" + valid_for: "Link-ul de invitare este valid doar pentru următoarele adrese de email: %{email}" bulk_invite: none: "Nu ai invitat încă pe nimeni. Poți trimite invitații individuale sau mai multor oameni deodată prin încărcarea fișierului de invitații multiple." text: "Invitație multiplă din fișier" @@ -886,6 +888,7 @@ ro: trust_level: 'Nivel de încredere' search_hint: 'Numele de utilizator, email sau adresă IP' create_account: + disclaimer: "Înregistrându-te, ești de acord cu politica de confidențialitate și termenii de utilizare." title: "Creează cont" failed: "Ceva s-a întâmplat, poate că acest email este deja înregistrat, încearcă să-ți resetezi parola la link-ul respectiv." forgot_password: @@ -977,6 +980,9 @@ ro: one: "Prin menționarea {{group}}, urmează să notifici o persoană – ești sigur?" few: "Prin menționarea {{group}}, urmează să notifici {{count}} persoane – ești sigur?" other: "Prin menționarea {{group}}, urmează să notifici {{count}} de persoane – ești sigur?" + cannot_see_mention: + category: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor notificați pentru că nu au acces la această categorie. Va trebui să îi adaugi la într-un grup care are acces la aceasta categorie." + private: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor fi notificați pentru că nu au posibilitatea să vadă acest mesaj personal. Va trebui să îi inviți la acest MP. " duplicate_link: "Se pare că link-ul tău către {{domain}} a fost deja postat în cadrul subiectului de către @{{username}} în un răspuns {{ago}} în urmă – eși sigur că vrei să îl postezi din nou?" error: title_missing: "Trebuie un titlu" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index f0af5ef310..3c1b7fd4fc 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -748,7 +748,6 @@ ru: account_age_days: "Дней с момента регистрации" create: "Отправить приглашение" generate_link: "Скопировать ссылку для приглашений" - generated_link_message: '

    Пригласительная ссылка сгенерирована!

    Эта ссылка действует только для следующего e-mail:%{invitedEmail}

    ' bulk_invite: none: "Вы еще никого не приглашали на этот форум. Можно отправить индивидуальные приглашения по одному, или же пригласить сразу несколько людей из файла." text: "Пригласить всех из файла" diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index b2826e798f..bc7a3a8c3c 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -695,7 +695,6 @@ sk: account_age_days: "Vek účtu v dňoch" create: "Poslať Pozvánku" generate_link: "Kopírovať Odkaz Pozvánky" - generated_link_message: '

    Odkaz pre pozvánku bol úspešne vytvorený!

    Odkaz je platný iba pre túto adresu: %{invitedEmail}

    ' bulk_invite: none: "Zatiaľ ste tu nikoho nepozvali. Môžete odosielať pozvánky individuálne alebo pozvať skupinu ľudí naraz pomocou nahratia súboru." text: "Hromadná pozvánka zo súboru" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 439d8fd67c..9d2f1bf28c 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -676,7 +676,6 @@ sq: account_age_days: "Jetëgjatësia e llogarisë (ditë)" create: "Dërgo një ftesë" generate_link: "Kopjo lidhjen e ftesës" - generated_link_message: '

    Lidhja e ftesës u krijua!

    Kjo ftesë është e vlefshme veto për adresën email: %{invitedEmail}

    ' bulk_invite: none: "Ju nuk keni ftuar askënd deri tani. Mund të dërgoni ftesa individuale ose mund të ftoni një grup personash duke ngarkuar skedarin." text: "Skedari për ftesat në grup" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 70e9ae0507..49264622e4 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -684,7 +684,6 @@ sv: account_age_days: "Kontoålder i dagar" create: "Skicka en inbjudan" generate_link: "Kopiera inbjudningslänken" - generated_link_message: '

    Inbjudningslänken genererades utan problem!

    Inbjudningslänken är endast giltig för den här e-postadressen: %{invitedEmail}

    ' bulk_invite: none: "Du har inte skickat några inbjudningar. Du kan skicka individuella inbjudningar, eller så kan du bjuda in flera på en gång genom att ladda upp en bulkfil." text: "Massinbjudan från fil" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 19016e276c..01bc29da4a 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -655,7 +655,6 @@ tr_TR: account_age_days: "Hesabın gün olarak yaşı" create: "Davet Yolla" generate_link: "Davet bağlantısını kopyala" - generated_link_message: '

    Davet bağlantısı başarılı bir şekilde oluşturuldu!

    Davet bağlantısı sadece bu e-posta adresi için geçerlidir: %{invitedEmail}

    ' bulk_invite: none: "Henüz kimseyi buraya davet etmediniz. Tek tek davetiye gönderebilirsiniz, ya da toplu bir davetiye dosyası yükleyerek birçok kişiyi aynı anda davet edebilirsiniz. " text: "Dosyadan Toplu Davet Gönder" @@ -1634,6 +1633,11 @@ tr_TR: muted: title: "Susturuldu" description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde gözükmeyecekler. " + sort_options: + default: "öntanımlı" + likes: "Beğeniler" + posts: "Gönderiler" + category: "Kategori" flagging: title: 'Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!' action: 'Gönderiyi Bildir' diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index 56940d66f5..8126b417c4 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -620,7 +620,6 @@ vi: account_age_days: "Thời gian của tài khoản theo ngày" create: "Gửi một lời mời" generate_link: "Chép liên kết Mời" - generated_link_message: '

    Liên kết thư mời được tạo thành công!

    Liên kết thư mời chỉ hợp lệ cho email này: %{invitedEmail}

    ' bulk_invite: none: "Bạn đã mời ai ở đây chưa. Bạn có thể mời một hoặc một nhóm bằng tải lên hàng loạt file mời." text: "Mời hàng loạt bằng file" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index be95fad58e..18a9cd58f6 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -422,6 +422,7 @@ zh_CN: each_browser_note: "注意：你必须在你使用的所用浏览器中更改这项设置。" dismiss_notifications: "忽略所有" dismiss_notifications_tooltip: "标记所有未读通知为已读" + first_notification: "你的头一个通知！选中它开始。" disable_jump_reply: "回复后不跳转至新帖子" dynamic_favicon: "在浏览器图标中显示主题更新数量" external_links_in_new_tab: "在新标签页打开外部链接" @@ -648,7 +649,6 @@ zh_CN: account_age_days: "账号建立天数" create: "发送邀请" generate_link: "复制邀请链接" - generated_link_message: '

    邀请链接成功生成！

    邀请链接仅对下列邮件地址有效：%{invitedEmail}

    ' bulk_invite: none: "你从未邀请过他人。你可以发送单个邀请，或者上传批量邀请文件一次邀请多人。" text: "通过文件批量邀请" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index a688e85d34..5d716b66ff 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -21,8 +21,21 @@ fa_IR: loading: "بارگذاری..." powered_by_html: 'قدرت گرفته ازدیسکورسفارسی سازی دیسکورس فارسی, برای نمایش بهتر جاوا اسکریپت را فعال کنید.' log_in: "ورود" + purge_reason: "حساب کاربری غیرفعال. حذف شده به صورت خودکار به علت عدم استفاده." disable_remote_images_download_reason: "عکس های ریموت دانلود شده غیرفعال شدند زیرا آنجا فضای کافی در دیسک وجود نداشت" anonymous: "ناشناس" + emails: + incoming: + default_subject: "ایمیل دریافتی از %{email}" + show_trimmed_content: "نمایش محتوای پنهان شده." + maximum_staged_user_per_email_reached: "تکمیل ظرفیت تعداد حساب های کاربری با هر ایمیل." + errors: + empty_email_error: "رخ دادن در هنگامی که ایمیل خام دریافتی خالی باشد." + inactive_user_error: "رخ دادن در هنگامی که ارسال کننده فعال نباشد." + blocked_user_error: "رخ دادن در هنگامی که که ارسال کننده مسدود شده باشد." + strangers_not_allowed_error: "رخ دادن در هنگامی که که کاربر سعی در ایجاد مبحث در دسته بندی می کند که در آن عضو نیست." + reply_user_not_matching_error: "رخ دادن در هنگامی که پاسخ از ایمیل متفاوتی از آنچه که ما اطلاع رسانی را به آن ارسال کرده ایم، دریافت شده باشد." + topic_not_found_error: "رخ دادن در هنگامی که پاسخ دریافت شده باشد، اما مبحث مربوطه حذف شده باشد." errors: &errors format: '%{attribute} %{message}' messages: @@ -873,6 +886,9 @@ fa_IR: emoji_set: "می‌خواهید ایموجی شما چطور باشد؟" enforce_square_emoji: "تحمیل نسبت ابعاد مربع به تمام شکلک ها emojis . " approve_unless_trust_level: "نوشته ها برای کاربران پایین ت از این سطح اعتماد نیاز به تایید دارد. " + default_other_external_links_in_new_tab: "باز کردن لینک های ارجاع به بیرون در یک تب جدید به صورت پیشفرض." + default_other_enable_quoting: "فعال کردن پاسخ به صورت نقل قول برای نوشته های هایلایت شده به صورت پیشفرض." + default_other_dynamic_favicon: "نمایش تعداد مباحث جدید/آپدیت شده در آیکن مرورگر به صورت پیشفرض" errors: invalid_email: "آدرس ایمیل نامعتبر" invalid_username: "هیچ کاربری با این نام کاربری وجود ندارد." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 7180735674..d885349a92 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -1095,6 +1095,7 @@ fr: manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel." pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel." pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)" + pop3_polling_openssl_verify: "Vérifier le certificat TLS du serveur (activé par défaut)" pop3_polling_period_mins: "La période en minute entre chaque vérification du compte POP3 des courriels.\nNote: nécessite un redémarrage de la machine." pop3_polling_port: "Le port pour le pooling des courriels via POP3." pop3_polling_host: "L'hôte pour le pooling des courriels via POP3." @@ -1205,6 +1206,7 @@ fr: default_categories_watching: "Liste de catégories surveillées par défaut." default_categories_tracking: "Liste de catégories suivies par défaut." default_categories_muted: "Liste de catégories silencées par défaut." + default_categories_watching_first_post: "Liste des catégories dont le premier message de chaque nouveau sujet sera surveillé par défaut." max_user_api_reqs_per_day: "Nombre maximum de requêtes de l'API utilisateur par clé et par jour" max_user_api_reqs_per_minute: "Nombre maximum de requêtes de l'API utilisateur par clé et par minute" allow_user_api_keys: "Autoriser la génération des clés de l'API utilisateur" @@ -2211,7 +2213,7 @@ fr: base_theme_name: "Base" about: "À propos" guidelines: "Charte" - privacy: "Protection des données" + privacy: "Confidentialité" edit_this_page: "Modifier cette page" csv_export: boolean_yes: "Oui" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 1cb570d3d5..2446775c3a 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -1092,6 +1092,7 @@ he: manual_polling_enabled: "דחיפת מיילים באמצעות ה API לתגובות מייל." pop3_polling_enabled: "משיכה דרך POP3 לתגובות דוא\"ל." pop3_polling_ssl: "שימוש ב-SSL בעת חיבור לשרת POP3. (מומלץ)" + pop3_polling_openssl_verify: "וידוא סרטיפיקט TLS של השרת (ברירת מחדל: מאופשר)" pop3_polling_period_mins: "משך הזמן בדקות בין בדיקת הדוא\"ל בחשבון ה-POP3. הערה: דורש אתחול." pop3_polling_port: "החיבור (Port) ממנו יש למשוך נתונים מחשבון POP3." pop3_polling_host: "השרת המארח (Host) למשיכת דוא\"ל דרך POP3." @@ -1202,6 +1203,7 @@ he: default_categories_watching: "רשימת קטגוריות שנצפית כברירת מחדל." default_categories_tracking: "רשימת קטגוריות שנעקבת כברירת מחדל." default_categories_muted: "רשימת קטגוריות שמושתקות כברירת מחדל." + default_categories_watching_first_post: "רשימת קטגוריות שבה הפוסט הראשון בכל נושא ייצפה אוטומטית." max_user_api_reqs_per_day: "המספר המקסימלי של בקשות API של משתמש ליום" max_user_api_reqs_per_minute: "המספר המקסימלי של בקשות API של משתמש לדקה" allow_user_api_keys: "איפשור יצירת מפתחות API למשתמשים" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 66be532913..fba3daacfc 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -71,6 +71,7 @@ it: has_already_been_used: "è già stato usato" inclusion: non è incluso nella lista invalid: non è valido + is_invalid: "sembra poco chiaro, è una frase completa?" less_than: deve essere minore di %{count} less_than_or_equal_to: deve essere minore o uguale a %{count} not_a_number: non è un numero @@ -158,6 +159,7 @@ it: topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi." just_posted_that: "è troppo simile a ciò che hai appena pubblicato" invalid_characters: "contiene caratteri non validi" + is_invalid: "sembra poco chiaro, è una frase completa?" next_page: "pagina seguente →" prev_page: "← pagina precedente" page_num: "Pagina %{num}" @@ -556,9 +558,21 @@ it: stop_watching_topic: "Smetti di osservare questo argomento, %{link}" mute_topic: "Silenziare tutte le notifiche per questo argomento, %{link}" unwatch_category: "Smetti di osservare tutti gli argomenti in %{category}" + mailing_list_mode: "Disabilita la modalità Mailing list" + disable_digest_emails: "Smetti di inviarmi email ripielogative" all: "Non inviare alcuna email da %{sitename}" different_user_description: "Sei attualmente connesso con un utente diverso da quello a cui abbiamo scritto. Per favore disconnettiti, oppure attiva la modalità anonima, e riprova." log_out: "Disconnetti" + user_api_key: + title: "Autorizza accesso dell'applicazione" + authorize: "Autorizza" + read: "lettura" + read_write: "lettura/scrittura" + scopes: + message_bus: "Aggiornamenti in Tempo Reale" + notifications: "Leggi e elimina tutte le notifiche" + read: "Leggi tutto" + write: "Scrivi tutto" reports: visits: title: "Visite Utente" @@ -642,6 +656,7 @@ it: page_view_anon_reqs: title: "Anonimo" xaxis: "Giorno" + yaxis: "Visualizzazioni pagina da visitatori Anonimi" page_view_logged_in_reqs: title: "Connesso" xaxis: "Giorno" @@ -649,15 +664,19 @@ it: page_view_crawler_reqs: title: "Web Crawler" xaxis: "Giorno" + yaxis: "Visualizzazioni pagina da Spider web" page_view_total_reqs: title: "Totali" xaxis: "Giorno" + yaxis: "Visualizzazioni pagina totali" page_view_logged_in_mobile_reqs: title: "Pagine viste da utenti connessi" xaxis: "Giorno" yaxis: "Pagine viste da utenti connessi su mobile" page_view_anon_mobile_reqs: + title: "Visualizzazioni pagina da visitatori Anonimi" xaxis: "Giorno" + yaxis: "Visualizzazioni pagina da visitatori Anonimi su dispositivi mobili" http_background_reqs: title: "Background" xaxis: "Giorno" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 95c2bd37a2..36183c67d2 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -50,7 +50,7 @@ pt: reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação." topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado." topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado." - bounced_email_error: "O email é um relatório devolvido." + bounced_email_error: "O email é um relatório de email redirecionado." screened_email_error: "Acontece quando a morada de email da pessoa que o enviou já foi confirmada." errors: &errors format: '%{attribute} %{message}' @@ -71,6 +71,7 @@ pt: has_already_been_used: "já foi usado" inclusion: não está incluído na lista invalid: é inválido + is_invalid: "parece pouco claro, é uma frase completa?" less_than: tem que ser menos que %{count} less_than_or_equal_to: tem que ser menos ou igual a %{count} not_a_number: não é um número @@ -110,6 +111,7 @@ pt: operation_already_running: "Existe atualmente uma operação em execução. Neste momento não é possível iniciar um novo trabalho. " backup_file_should_be_tar_gz: "O ficheiro da cópia de segurança deve ser um arquivo .tar.gz" not_enough_space_on_disk: "Não existe espaço suficiente no disco para carregar esta cópia de segurança." + invalid_filename: "O nome da cópia de segurança contém carácteres inválidos. Cáracteres válidos são a-z 0-9 . - _." not_logged_in: "Necessita de ter sessão iniciada para fazer isso." not_found: "O URL ou recurso pedido não foi encontrado." invalid_access: "Não tem permissões para visualizar o recurso pedido." @@ -157,6 +159,7 @@ pt: topic_not_found: "Algo de errado ocorreu. Talvez este tópico tenha sido fechado ou eliminado enquanto olhava para ele?" just_posted_that: "é demasiado semelhante ao que publicaste recentemente" invalid_characters: "contem caracteres inválidos" + is_invalid: "parece pouco claro, é uma frase completa?" next_page: "próxima página →" prev_page: "← página anterior" page_num: "Página %{num}" @@ -174,14 +177,14 @@ pt: hot: "Tópicos quentes" top: "Melhores tópicos" posts: "Últimas mensagens" - private_posts: "Últimas mensagens privadas" - group_posts: "Últimas mensagens em %{group_name}" - group_mentions: "Últimas menções em %{group_name}" - user_posts: "Mensagens mais recentes criadas por @%{username}" - user_topics: "Tópicos mais recentes criados por @%{username}" + private_posts: "Mensagens privadas recentes" + group_posts: "Mensagens recentes em %{group_name}" + group_mentions: "Menções recentes em %{group_name}" + user_posts: "Mensagens recentes criadas por @%{username}" + user_topics: "Tópicos recentes criados por @%{username}" tag: "Tópicos etiquetados" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." - revert_version_same: "A versão actual é o mesma versão para a qual está tentando reverter." + revert_version_same: "A versão actual é o mesma versão para a qual está a tentar reverter." excerpt_image: "imagem" queue: delete_reason: "Eliminado através da fila de moderação de mensagens" @@ -288,12 +291,20 @@ pt: common: "é uma das 10000 palavras-passe mais comuns. Por favor use uma palavra-passe mais segura." same_as_username: "é a mesma que o seu nome de utilizador. Por favor utilize uma palavra-passe mais segura." same_as_email: "é a mesma que o seu email. Por favor utilize uma palavra-passe mais segura." + same_as_current: "é a mesma que a sua palavra-passe atual." ip_address: signup_not_allowed: "A inscrição não é permitida através desta conta." color_scheme_color: attributes: hex: invalid: "não é uma cor válida" + post_reply: + base: + different_topic: "Publicação e resposta devem pertencer ao mesmo tópico." + web_hook: + attributes: + payload_url: + invalid: "URL inválido. O URL deve incluir http:// ou https://. E espaços não são permitidos." <<: *errors user_profile: no_info_me: "
    o campo Sobre Mim do seu perfil está em branco, quer preenchê-lo?
    " @@ -368,13 +379,13 @@ pt: first_day_topics_per_day: "Atingiu o número máximo de tópicos que um novo utilizador pode criar no seu primeiro dia. Por favor espere %{time_left} antes de tentar novamente." create_topic: "Está a criar tópicos demasiado rápido. Por favor espere %{time_left} antes de tentar novamente." create_post: "Está a responder demasiado rápido. Por favor espere %{time_left} antes de tentar novamente." - delete_post: "Está a apagar mensagens a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar novamente." + delete_post: "Está a apagar publicações a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar novamente." topics_per_day: "Atingiu o número máximo de novos tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente." pms_per_day: "Atingiu o número máximo de mensagens de hoje. Por favor espere %{time_left} antes de tentar novamente." create_like: "Atingiu o número máximo de gostos de hoje. Por favor espere %{time_left} antes de tentar novamente." create_bookmark: "Atingiu o número máximo de marcações de hoje. Por favor espere %{time_left} antes de tentar novamente." edit_post: "Atingiu o número máximo de edições de hoje. Por favor espere %{time_left} antes de tentar novamente." - live_post_counts: "Está a pedir por contagens de mensagens em tempo real a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar outra vez." + live_post_counts: "Está a pedir por contagens de publicações em tempo real a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar outra vez." unsubscribe_via_email: "Atingiu o número máximo de cancelamentos de subscrições por email de hoje. Por favor espere %{time_left} antes de tentar novamente." topic_invitations_per_day: "Atingiu o número máximo de convites para tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente." hours: @@ -475,7 +486,7 @@ pt: already_done: "Pedimos desculpa, mas esta hiperligação de confirmação já não é valida. Talvez o seu email já tenha sido alterado?" authorizing_old: title: "Obrigado por confirmar o seu endereço de email actual." - description: "Estamos a enviar um email para o seu novo endereço de email, para confirmação." + description: "Estamos a enviar um email para o seu novo endereço para confirmação." activation: action: "Clique aqui para ativar a sua conta" already_done: "Pedimos desculpa, esta hiperligação de confirmação já não está válida. Talvez a sua conta já esteja ativa?" @@ -552,13 +563,33 @@ pt: unsubscribed: title: "Subscrição cancelada!" description: "A sua subscrição foi cancelada. Para mudar as suas definições de email visite as suas preferências de utilizador." + topic_description: "Para re-subscrever a %{link}, use o controle de notificação no fundo ou à direita do tópico." unsubscribe: title: "Cancelar subscrição" + stop_watching_topic: "Parar de vigiar este tópico, %{link}" mute_topic: "Silenciar todas as notificações para este tópico, %{link}" unwatch_category: "Deixar de seguir todos os tópicos em %{category}" mailing_list_mode: "Desligar modo de lista de distribuição" disable_digest_emails: "Parar envio de emails de resumo" + all: "Não me mandar email de %{sitename}" + different_user_description: "Está ligado como um utilizador diferente do que aquele para o qual enviamos email. Por favor saia, ou entre em modo anónimo, e tente novamente." + not_found_description: "Pedimos desculpa, não conseguimos cancelar a sua subscrição. É possível que a ligação no seu email tenha expirado?" log_out: "Sair" + user_api_key: + title: "Autorizar o acesso da aplicação" + authorize: "Autorizar" + read: "ler" + read_write: "ler/escrever" + description: "\"%{application_name}\" está a requerer o seguinte acesso à sua conta:" + no_trust_level: "Desculpe, não tem o nível de confiança requerido para aceder à API de utilizador" + generic_error: "Desculpe, não somos capazes de gerar chaves API de uitlizador, esta funcionalidade poderá estar desactivada pela administração do site" + scopes: + message_bus: "Actualizações ao vivo" + notifications: "Ler e remover notificações" + push: "Enviar notificações para serviços externos" + session_info: "Ler info da sessão de utilizador" + read: "Ler todos" + write: "Escrever todos" reports: visits: title: "Visitas do Utilizador" @@ -646,7 +677,7 @@ pt: page_view_logged_in_reqs: title: "Com Sessão Iniciada" xaxis: "Dia" - yaxis: "Visualizações com Login" + yaxis: "Visualizações Ligadas" page_view_crawler_reqs: title: "Rastreador Web" xaxis: "Dia" @@ -656,13 +687,13 @@ pt: xaxis: "Dia" yaxis: "Total de Visualizações" page_view_logged_in_mobile_reqs: - title: "Visualizações com Login" + title: "Visualizações Ligadas" xaxis: "Dia" - yaxis: "Visualizações com Login Móvel" + yaxis: "Visualizações Ligadas Móveis" page_view_anon_mobile_reqs: title: "Visualizações Anónimas" xaxis: "Dia" - yaxis: "Visualizações Anónimas em Móvel" + yaxis: "Visualizações Anónimas Móveis" http_background_reqs: title: "Fundo" xaxis: "Dia" @@ -718,11 +749,13 @@ pt: email_polling_errored_recently: one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em os registos para mais detalhes." other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em os registos para mais detalhes." + missing_mailgun_api_key: "O servidor está configurado para enviar email via mailgun mas você não forneceu uma chave de API para verificar as mensagens de webhook." bad_favicon_url: "Não estamos a conseguir carregar o favicon. Por favor, confirme a sua configuração favicon_url nas Configurações do sítio." poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. O email da caixa de entrada não pôde ser obtido. Por favor verifique a sua configuração de POP3 e fornecedor de serviço internet." poll_pop3_auth_error: "A tentativa de ligação ao servidor POP3 está a falhar por motivos de erro de autenticação. Por favor verifique a sua configuração de POP3." site_settings: censored_words: "Palavras que serão automaticamente substituídas por ■■■■" + censored_pattern: "Expressão regular que será automaticamente substituída por ■■■■" delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias." default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)" allow_user_locale: "Permitir aos utilizadores escolherem a sua própria língua preferencial para a interface." @@ -736,6 +769,8 @@ pt: min_private_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres" min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres" search_tokenize_chinese_japanese_korean: "Forçar pesquisa para atomizar Chinês/Japonês/Coreano mesmo em sites que não sejam CJC" + search_prefer_recent_posts: "Se pesquisar no seu fórum vasto é lento, esta opção tenta usar um índex de publicações recentes primeiro" + search_recent_posts_size: "Quantas publicações recentes a manter no índex" allow_uncategorized_topics: "Permitir a criação de tópicos sem categoria. AVISO: Se houver quaisquer tópicos não categorizados, tem que re-categorizá-los antes de desligar isto." allow_duplicate_topic_titles: "Permitir tópicos com títulos idênticos e duplicados." unique_posts_mins: "Quantos minutos antes que um utilizador possa criar uma mensagem com o mesmo conteúdo outra vez?" @@ -748,6 +783,7 @@ pt: crawl_images: "Recuperar imagens de URLs remotos para inserir o comprimento e largura corretos." download_remote_images_to_local: "Converter imagens remotas em imagens locais ao descarregá-las; isto previne imagens corrompidas." download_remote_images_threshold: "Espaço mínimo necessário em disco para descarregar imagens remotas localmente (em percentagem)" + download_remote_images_max_days_old: "Não descarregar imagens remotas para publicações que têm mais de n dias de idade." disabled_image_download_domains: "Imagens remotas não serão descarregadas destes domínios. " editing_grace_period: "Por (n) segundos após publicar, a edição não irá criar uma nova versão no histórico da mensagem." post_edit_time_limit: "O autor pode editar ou eliminar a sua mensagem por um período de (n) minutos após a publicação da mesma. Definir a 0 para ser para sempre." @@ -762,8 +798,13 @@ pt: add_rel_nofollow_to_user_content: "Adicionar a etiqueta rel nofollow em todos os conteúdos submetidos pelo utilizador, excepto para hiperligações internas (incluindo domínios pai). Se mudar isto, terá que atualizar todas as suas mensagens com: \"rake posts:rebake\"" exclude_rel_nofollow_domains: "Uma lista de domínios em que nofollow não deve ser adicionado a linkls.tld.com irá permitir automaticamente sub.tld.com. Como mínimo, deve adicionar o domínio de alto nível deste sítio para ajudar os rastreadores da internet a encontrarem todo o conteúdo. Se outras partes do seu sítio estão em outros domínicios, adicione-os também." post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem." + show_pinned_excerpt_mobile: "Mostrar excerto em publicações afixadas na vista móvel." + show_pinned_excerpt_desktop: "Mostar excerto em publicações afixadas na vista de desktop." post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres." + onebox_domains_blacklist: "Uma lista de domínios para a qual nunca serão geradas pré-visualizações." + max_oneboxes_per_post: "Número máximo de pré-visualizações numa publicação." logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma retangular. Quando deixada em branco, o texto do título do sítio será exibido." + digest_logo_url: "A imagem de logo alternativa usada no topo dos emails de sumário do seu site. Deverá ser um rectângulo largo. Não deve ser uma imagem SVG. Se deixado vazio 'logo_url' será usado." logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido." favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png" mobile_logo_url: "A imagem do logótipo com posição fixa utilizada no canto superior esquerdo do seu sítio móvel deve ter uma forma quadrada. Quando deixado em branco, `logo_url` será utilizado. ex: http://exemplo.com/uploads/default/logo.png" @@ -771,22 +812,30 @@ pt: notification_email: "Para: endereço de email usado ao enviar emails essenciais do sistema. O domínio especificado aqui deverá ter SPF, DKIM e registos PTR inversos configurados corretamente para a chegada do email." email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados" email_subject: "Formato de assunto personalizável para emails padrão. Veja https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" + force_https: "Forçar o site a usar apenas HTTPS. ALERTA: NÃO active esta opção enquanto não verificar que o HTTPS está completamente configurado e funcional absolutamente em todo o lado! Verificou a sua CDN, todos os logins por rede social, e quaisquer logos ou outras dependências externas para garantir que também são compatíveis com HTTPS?" summary_score_threshold: "Pontuação mínima necessária para que uma mensagem seja incluída em 'Resumir Este Tópico'" summary_posts_required: "Número mínimo de mensagens num tópico antes que 'Resumir Este Tópico' seja ativo." summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo." summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores % de mensagens" summary_max_results: "Número máximo de mensagens devolvidas por 'Resumo deste Tópico'" + enable_private_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira." enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas" long_polling_base_url: "URL base usada para solicitação ao servidor (quando um CDN serve conteúdo dinâmico, certifique-se de configurá-lo para a 'pull' original) ex: http://origem.sítio.com" long_polling_interval: "Quantidade de tempo que um servidor deve esperar antes de notificar os clientes quando não há dados para serem enviados (apenas utilizadores ligados)" polling_interval: "Quando não está a ocorrer uma solicitação ao servidor, com que frequência devem os clientes ligados requerer uma atualização, em milissegundos" anon_polling_interval: "Com que frequência os clientes não registados podem fazer solicitações ao servidor, em milisegundos" background_polling_interval: "Com que frequência deverão os clientes solicitar o servidor, em milissegundos (quando a janela está em plano de fundo)" - flags_required_to_hide_post: "Número de bandeiras que fazem com que uma mensagem seja automaticamente escondida e uma mensagem enviada ao utilizador (0 se nunca)" + flags_required_to_hide_post: "Número de denúncias que fazem com que uma mensagem seja automaticamente escondida e uma mensagem enviada ao utilizador (0 se nunca)" cooldown_minutes_after_hiding_posts: "Número de minutos que o utilizador deve esperar antes de poder editar uma mensagem oculta devido a sinalizações por parte da comunidade" + max_topics_in_first_day: "O número máximo de tópicos que o utilizador pode criar no período de 24 horas após criar a sua primeira publicação" + max_replies_in_first_day: "O número máximo de respostas que um utilizador pode criar no período de 24 horas após criar a sua primeira publicação" tl2_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc2 (membro) ao multiplicar por este número" tl3_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc3 (habitual) ao multiplicar por este número" tl4_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc4 (líder) ao multiplicar por este número" + num_spam_flags_to_block_new_user: "Se as publicações de um novo utilizador receberem estas tantas denúncias de num_users_to_block_new_user diferentes utilizadores, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar." + num_users_to_block_new_user: "Se as publicações de um novo utilizador receberem num_spam_flags_to_block_new_user denúncias de spam de estes tantos diferentes utilizadores, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar." + num_tl3_flags_to_block_new_user: "Se as publicações de um novo utilizador receberem estas tantas denúncias de num_tl3_users_to_block_new_user diferentes utilizadores de nível de confiança 3, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar." + num_tl3_users_to_block_new_user: "Se as publicações de um novo utilizador receberem num_tl3_flags_to_block_new_user denúncias de estes tantos diferentes utilizadores de nível de confiança 3, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar." notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores." flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam." traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha." @@ -794,8 +843,12 @@ pt: post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)." must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!" pending_users_reminder_delay: "Notificar moderadores se novos utilizadores estiverem à espera de aprovação por mais que esta quantidade de horas. Configurar com -1 para desativar notificações." + maximum_session_age: "Utilizador permanecerá ligado durante n horas desde a última visita" + ga_tracking_code: "OBSOLETO: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" + ga_domain_name: "OBSOLETO: Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Código de acompanhamento do Google Universal Analytics (analytics.js), ex: UA-12345678-9; ver http://google.com/analytics" ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: omeusitio.com; ver http://google.com/analytics" + gtm_container_id: "id de contentor do Google Tag Manager. eg: GTM-ABCDEF" enable_escaped_fragments: "Reverter para a Google Ajax-Crawling API se nenhum webcrawler for detectado. Ver https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" enable_noscript_support: "Ativar o suporte básico para pesquisas em motores de pesquisa através da etiqueta noscript" allow_moderators_to_create_categories: "Permitir que os moderadores criem novas categorias" @@ -817,6 +870,7 @@ pt: redirect_users_to_top_page: "Redirecionar automaticamente os utilizadores novos e ausentes por períodos longos para o topo da página." top_page_default_timeframe: "Intervalo de tempo por defeito para a página de visualizações do topo." show_email_on_profile: "Mostrar o email do utilizador no seu perfil (apenas visível para si próprio e para o pessoal)" + prioritize_username_in_ux: "Mostrar o nome de utilizador primeiro na página de utilizador, cartão de utilizador e publicações (quando o nome desactivado é mostrado primeiro)" email_token_valid_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por (n) horas." email_token_grace_period_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por um período de carência de (n) horas após serem recuperados" enable_badges: "Ativar o sistema de distintivos" @@ -824,6 +878,7 @@ pt: allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa." email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!" + forgot_password_strict: "Não informar utilizadores da existência de uma conta quando estes usam o diálogo de palavra-passe esquecida. " log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos" version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel de administração" new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível." @@ -844,6 +899,7 @@ pt: enable_sso_provider: "Implementar o protocolo do provedor SSO do Discourse no caminho /session/sso_provider, requer que sso_secret seja configurado" sso_url: "URL da terminação de single-sign-on (tem de incluir http:// ou https://)" sso_secret: "String secreta usada para autenticar criptograficamente informação SSO, garanta que tem 10 ou mais caracteres" + sso_overrides_bio: "Sobrepõe-se à biografia do utilizador e previne o utilizador de a mudar" sso_overrides_email: "Substitui o email local por um email de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido à normalização de emails locais) " sso_overrides_username: "Substitui nomes de utilizadores locais por nomes de utilizadores de sítios externos a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido a diferenças no comprimento/requisitos do nome de utilizador)" sso_overrides_name: "Substitui o nome completo local por um nome completo de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais." @@ -860,14 +916,16 @@ pt: twitter_consumer_key: "Chave de consumidor para autenticação pelo Twitter, registada em http://dev.twitter.com" twitter_consumer_secret: "Chave do Consumidor para a autenticação pelo Twitter, registada em http://dev.twitter.com" enable_instagram_logins: "Activar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret" - instagram_consumer_key: "Chave de cliente para a autenticação via Instagram" - instagram_consumer_secret: "Segredo de cliente para a autenticação via Instagram" + instagram_consumer_key: "Chave de consumidor para a autenticação via Instagram" + instagram_consumer_secret: "Segredo de consumidor para a autenticação via Instagram" enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret" facebook_app_id: "Id App usado para autenticação pelo Facebook, registado em https://developers.facebook.com/apps" facebook_app_secret: "Chave da App para autenticação com o Facebook, registado em https://developers.facebook.com/apps" + facebook_request_extra_profile_details: "Requerer informação sobre mim, localização e website do facebook. (requer que sua aplicação de autenticação esteja autorizada pelo facebook)" enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret" github_client_id: "Id do cliente para autenticação pelo Github, registado em https://github.com/settings/applications" github_client_secret: "Chave do Cliente para autenticação pelo Github, registado em https://github.com/settings/applications" + readonly_mode_during_backup: "Activar modo de leitura penas durante a realização de uma cópia de segurança" allow_restore: "Permitir o restauro, que pode substituir TODOS os dados do sítio. Deixar a falso a menos que planeie restaurar uma cópia de segurança" maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas." automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança" @@ -881,8 +939,9 @@ pt: verbose_localization: "Mostrar extensas dicas de localização na IU" previous_visit_timeout_hours: "Quanto tempo dura uma visita antes de a considerarmos como 'visita anterior', em horas." top_topics_formula_log_views_multiplier: "fórmula do multiplicador (n) de visualizações logarítmica nos melhores tópicos: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" - top_topics_formula_first_post_likes_multiplier: "fórmula do multiplicador (n) de primeiros gostos nos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" - top_topics_formula_least_likes_per_post_multiplier: "fórmula do multiplicador (n) de menos gostos nos melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`" + top_topics_formula_first_post_likes_multiplier: "valor do multiplicador (n) de gostos da primeira publicação na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador (n) de menos gostos por publicação na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`" + rebake_old_posts_count: "Número de publicações antigas a serem re-cozidos cada 15 minutos." rate_limit_create_topic: "Após a criação de um tópico, os utilizadores devem esperar (n) segundos antes de criarem um novo tópico." rate_limit_create_post: "Após a publicação, os utilizadores devem esperar (n) segundos antes de criarem outra mensagem." rate_limit_new_user_create_topic: "Após a criação de um tópico, os novos utilizadores devem esperar (n) segundos antes de criarem um novo tópico." @@ -897,8 +956,10 @@ pt: max_topic_invitations_per_day: "Número máximo de convites para tópicos que um utilizador pode enviar por dia." alert_admins_if_errors_per_minute: "Número de erros por minuto necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício." alert_admins_if_errors_per_hour: "Número de erros por hora necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício." + categories_topics: "Número de tópicos a serem mostrados na página /categories ." suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico." limit_suggested_to_category: "Apenas mostrar tópicos da categoria atual nos tópicos sugeridos." + suggested_topics_max_days_old: "Tópicos sugeridos não devem ter mais de n dias de idade." clean_up_uploads: "Remover carregamentos orfãos não referenciados para prevenir alojamento ilegal. AVISO: poderá querer criar uma cópia de segurança da diretoria /uploads antes de ativar esta configuração." clean_orphan_uploads_grace_period_hours: "Período de carência (em horas) antes de um carregamento orfão ser removido." purge_deleted_uploads_grace_period_days: "Período de carência (em dias) antes de um carregamento eliminado ser apagado." @@ -912,8 +973,12 @@ pt: s3_cdn_url: "O URL CDN a ser usado para todos os recursos s3 (por exemplo: https://cdn.somewhere.com). AVISO: após alterar esta configuração deve refazer as últimas mensagens." avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente." external_system_avatars_enabled: "Utilize o serviço do sistema externo de avatars." + external_system_avatars_url: "URL do serviço de avatares externo do sistema. Substituições permitidas são {username} {first_letter} {color} {size}" default_opengraph_image_url: "URL da imagem opengraph por defeito." + twitter_summary_large_image_url: "URL da imagem do cartão de sumário de defeito do Twitter (deverá ser pelo menos 280px em largura, e pelo menos 150px em altura)." allow_all_attachments_for_group_messages: "Permitir qualquer anexo de email nas mensagens de grupo." + convert_pasted_images_to_hq_jpg: "Converter imagens coladas para ficheiros JPG de alta qualidade." + convert_pasted_images_quality: "Qualidade dos ficheiros JPG convertidos (1 é a qualidade menor, 100 é a melhor qualidade)." enable_flash_video_onebox: "Ativar a incorporação de hiperligações swf e flv (Adobe Flash) em caixas únicas. AVISO: pode introduzir riscos de segurança." default_invitee_trust_level: "Nível de Confiança padrão (0-4) para utilizadores convidados." default_trust_level: "Nível de Confiança padrão (0-4) para todos os novos utilizadores. AVISO! Alterar isto irá colocá-lo em sério risco de spam." @@ -929,19 +994,22 @@ pt: tl2_requires_topic_reply_count: "Quantos tópicos um utilizador deve responder antes de ser promovido para o Nível de Confiança 2." tl3_time_period: "Período de tempo (em dias) dos requisitos do nível de confiança 3" tl3_requires_days_visited: "Número mínimo de dias que o utilizador necessita de ter visitado o sítio nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3. Configure um período de tempo maior que nc3 para desativar promoções para nc3. (0 ou maior)" - tl3_requires_topics_replied_to: "Número mínimo de tópicos que o utilizador necessita de ter respondido nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3. (0 ou mais)" - tl3_requires_topics_viewed: "Percentagem de tópicos criados nos últimos dias (perídio nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)" - tl3_requires_posts_read: "Percentagem de mensagens criadas nos últimos dias (perídio nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)" + tl3_requires_topics_replied_to: "Número mínimo de tópicos que o utilizador necessita de ter respondido nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3. (0 ou maior)" + tl3_requires_topics_viewed: "Percentagem de tópicos criados nos últimos dias (período nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)" + tl3_requires_topics_viewed_cap: "O número máximo requerido de tópicos vistos nos últimos (tl3 time period) dias." + tl3_requires_posts_read: "Percentagem de publicações criadas nos últimos dias (período nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)" + tl3_requires_posts_read_cap: "O número máximo requerido de publicações lidas nos últimos (tl3 time period) dias." tl3_requires_topics_viewed_all_time: "Número mínimo total de tópicos que o utilizador deve ter visto para se qualificar ao Nível de Confiança 3." tl3_requires_posts_read_all_time: "Número mínimo total de mensagens que o utilizador deve ter lido para se qualificar ao Nível de Confiança 3." - tl3_requires_max_flagged: "O utilizador não deverá ter mais do que x mensagens marcadas por x diferentes utilizadores nos últimos dias (período nc3) para se qualificar à promoção para o nível de confiança 3, onde x é o valor definido. (0 ou superior)" + tl3_requires_max_flagged: "O utilizador não deverá ter mais do que x publicações marcadas por x diferentes utilizadores nos últimos dias (período nc3) para se qualificar à promoção para o nível de confiança 3, onde x é o valor definido. (0 ou superior)" tl3_promotion_min_duration: "Número mínimo de dias em que a promoção para Nível de Confiança 3 dura antes que o utilizador possa ser despromovido para o Nível de Confiança 2." tl3_requires_likes_given: "Número mínimo de gostos que o utilizador deve ter atribuído nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3." tl3_requires_likes_received: "Número mínimo de gostos que o utilizador deve ter recebido nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3." tl3_links_no_follow: "Não remover rel=nofollow das hiperligações publicadas por utilizadores com Nível de Confiança 3." min_trust_to_create_topic: "O Nível de Confiança mínimo necessário para criar um novo tópico." min_trust_to_edit_wiki_post: "O nível mínimo de confiança necessário para editar mensagens marcadas como wiki." - min_trust_to_allow_self_wiki: "O nível mínimo de confiança necessário para criar mensagens wiki próprias." + min_trust_to_edit_post: "O nível mínimo de confiança necessário para editar publicações." + min_trust_to_allow_self_wiki: "O nível mínimo de confiança necessário para o utilizador criar as suas publicações wiki." min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar mensagens privadas." newuser_max_links: "Quantas hiperligações um novo utilizador pode adicionar a uma mensagem." newuser_max_images: "Quantas imagens um novo utilizador pode adicionar a uma mensagem." @@ -949,6 +1017,7 @@ pt: newuser_max_mentions_per_post: "Número máximo de notificações @nome que um novo utilizador pode usar numa mensagem." newuser_max_replies_per_topic: "Número máximo de respostas que um novo utilizador pode fazer num único tópico até alguém lhe responder." max_mentions_per_post: "Número máximo de notificações @nome que qualquer pessoa pode usar numa mensagem." + max_users_notified_per_group_mention: "Número máximo de utilizadores que podem receber uma notificação se um grupo é mencionado (se o limite é atingido nenhuma notificação será levantada)" create_thumbnails: "Criar imagens miniatura e lightbox que são demasiado largas para caber numa mensagem." email_time_window_mins: "Esperar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos utilizadores a hipótese de editarem e finalizarem as suas mensagens." private_email_time_window_seconds: "Espere (n) segundos antes de enviar emails de notificação privados, para dar aos utilizadores a oportunidade de editar e finalizar as suas mensagens." @@ -961,6 +1030,7 @@ pt: title_fancy_entities: "Converter caracteres ASCII comuns em entidades HTML nos títulos dos tópicos, ala SmartyPants http://daringfireball.net/projects/smartypants/" min_title_similar_length: "Tamanho mínimo do título antes de ser verificado por tópicos semelhantes." min_body_similar_length: "Tamanho mínimo do corpo de uma mensagem antes de ser verificado por tópicos semelhantes." + desktop_category_page_style: "Estilo visual para a página de categorias." category_colors: "Lista de valores hexadecimais das cores permitidas nas categorias." category_style: "Estilo visível para distintivos de categorias." max_image_size_kb: "Tamanho máximo da imagem carregada em kB. Este deverá ser configurado em nginx (client_max_body_size) / apache ou também proxy." @@ -983,7 +1053,7 @@ pt: faq_url: "Se possui uma FAQ alojada noutro local e que queira usar, forneça a URL completa aqui." tos_url: "Se tem um documento de Termos de Serviço alojado noutro local e que queira usar, forneça a URL completa aqui." privacy_policy_url: "Se tem um documento de Política de Privacidade alojado noutro local e que queira usar, forneça a URL completa aqui." - newuser_spam_host_threshold: "Quantas vezes um novo utilizador pode colocar um link para o mesmo endereço dentro do número de respostas `newuser_spam_host_threshold` , antes de ser considerado spam." + newuser_spam_host_threshold: "Quantas vezes um novo utilizador pode colocar um link para o mesmo endereço dentro do número de publicações `newuser_spam_host_threshold` , antes de ser considerado spam." white_listed_spam_host_domains: "Lista de domínios excluídos dos testes de spam. Novos utilizadores nunca irão ser restritos da criação de mensagens com hiperligações a esses domínios." staff_like_weight: "Quanto é o fator de ponderação extra a dar aos gostos provenientes do pessoal." topic_view_duration_hours: "Contar uma nova visualização do tópico uma vez por IP/Utilizador a cada N horas" @@ -1002,13 +1072,19 @@ pt: auto_block_first_post_regex: "Expressão regular sensível a maiúsculas e minúsculas que se passar irá fazer com que a primeira mensagem do utilizador seja bloqueada e enviada para a fila de aprovação. Exemplo: raging|a[bc]a, irá fazer com que todas as mensagens que contenham raging ou aba ou aca sejam bloqueadas primeiro. Aplicável apenas à primeira mensagem." reply_by_email_enabled: "Ativar respostas aos tópicos por email." reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com" + alternative_reply_by_email_addresses: "Lista de modelos alternativos para respostas via email. Exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com" + incoming_email_prefer_html: "Usar o HTML em vez de texto para email recebido. Poderá causar problemas de formatação!" disable_emails: "Impedir que Discourse envie qualquer tipo de emails" strip_images_from_short_emails: "Remover imagens de emails cujo tamanho seja inferior a 2800 Bytes" short_email_length: "Comprimento de email curto, em Bytes" display_name_on_email_from: "Exibir nomes completos em campos do formulário de email" unsubscribe_via_email: "Permitir aos utilizadores cancelar a subscrição de emails enviando um email com \"unsubscribe\" no assunto ou no corpo do email" + unsubscribe_via_email_footer: "Anexar um cancelamento de subscrição por email via um link mailto: no rodapé de emails enviados" delete_email_logs_after_days: "Apagar registos de email após (N) dias. 0 para os manter indefinidamente" - max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores. 0 para desligar o limite" + max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores por dia. 0 para desativar o limite" + enable_staged_users: "Automaticamente criar utilizadores temporários ao processar emails recebidos." + maximum_staged_users_per_email: "Número máximo de utilizadores temporários criados ao processar um email recebido." + auto_generated_whitelist: "Lista de endereços de email que não serão verificados para conteúdo gerado automaticamente. Exemplo: foo@bar.com|discourse@bar.com" block_auto_generated_emails: "Bloquear emails recebidos que sejam identificados como tendo sido gerados automaticamente." ignore_by_title: "Ignorar emails recebidos com base no seu título." manual_polling_enabled: "Enviar emails utilizando a API de resposta por email." @@ -1050,7 +1126,7 @@ pt: dominating_topic_minimum_percent: "Que percentagem de mensagens um utilizador tem que fazer num tópico antes de ser relembrado sobre dominar demasiado um tópico." disable_avatar_education_message: "Desativar mensagem educativa para alteração de avatar." suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos." - permalink_normalizations: "Aplicar a seguinte expressão regular antes de igualar hiperligações permanentes, por exemplo: /(topic.*)\\?.*/\\1 irá remover parâmetros de roteamento para tópicos. O formato é regex+sequência utilize \\1 etc. para aceder a capturas.O formato é regex+string utilize \\1 etc. para aceder a capturas." + permalink_normalizations: "Aplicar a seguinte expressão regular antes de igualar ligações permanentes, por exemplo: /(topic.*)\\?.*/\\1 irá remover rotas de tópico. O formato é regex+string utilize \\1 etc. para aceder a capturas" global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)." disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo." automatically_unpin_topics: "Desafixar tópicos automaticamente quando um utilizador chega ao final." @@ -1078,26 +1154,26 @@ pt: enable_cdn_js_debugging: "Permitir que /logs exiba erros próprios ao adicionar permissões de origem-cruzada em todos os js incluídos." show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos." delete_drafts_older_than_n_days: Eliminar rascunhos mais antigos que (n) days. - bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de bootstrap (coloque 0 para desactivar)" + bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de inicialização (coloque 0 para desactivar)" vacuum_db_days: "Executar VACUUM ANALYZE para reclamar espaço na BD após as migrações (configurar a 0 para desativar)" prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem." slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo." enable_emoji: "Ativar emoji" emoji_set: "Como gostaria de ter o seu emoji?" enforce_square_emoji: "Forçar uma relação de aspecto quadrado para todos os emojis." - approve_post_count: "A quantidade de mensagens de um novo utilizador ou utilizador básico que devem ser aprovadas" + approve_post_count: "A quantidade de publicações de um novo utilizador ou utilizador básico que devem ser aprovadas" approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados" - notify_about_queued_posts_after: "Se houver mensagens a aguardar revisão após tantas horas, enviar email para `contact_email`. Configurar a 0 para desactivar." - auto_close_messages_post_count: "Número máximo de respostas numa mensagem antes de a fechar automáticamente (configurar a 0 para desactivar)" - auto_close_topics_post_count: "Número máximo de mensagens num tópico antes de o fechar automáticamente (configurar a 0 para desactivar)" + notify_about_queued_posts_after: "Se houver publicações a aguardar revisão após tantas horas, enviar email para `contact_email`. Configurar a 0 para desactivar." + auto_close_messages_post_count: "Número máximo de publicações numa mensagem antes de a fechar automáticamente (configurar a 0 para desactivar)" + auto_close_topics_post_count: "Número máximo de publicações num tópico antes de o fechar automáticamente (configurar a 0 para desactivar)" default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador." default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador." default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem." - default_email_mailing_list_mode_frequency: "Utilizadores que activem o mode de mailing list receberão, por omissão, emails com esta frequência." + default_email_mailing_list_mode_frequency: "Utilizadores que activem o modo de lista de distribuição receberão, por omissão, emails com esta frequência." disable_mailing_list_mode: "Não permitir aos utilizadores habilitar o modo de lista de distribuição." default_email_always: "Por defeito, enviar notificações por email mesmo quando o utilizador está ativo." default_email_previous_replies: "Incluir, por omissão, respostas prévias nos emails." - default_email_in_reply_to: "Incluir, por omissão, um excerto da mensagem de resposta nos emails." + default_email_in_reply_to: "Incluir, por omissão, um excerto da publicação respondida nos emails." default_other_new_topic_duration_minutes: "Condição global por defeito para o qual um tópico é considerado novo." default_other_auto_track_topics_after_msecs: "Tempo global por defeito antes de um tópico ser automaticamente acompanhado." default_other_external_links_in_new_tab: "Por defeito, abrir hiperligações externas num novo separador." @@ -1137,8 +1213,8 @@ pt: pop3_polling_username_is_empty: "Deve configurar um 'nome de utilizador de polling pop3' antes de ativar o polling POP3." pop3_polling_password_is_empty: "Deve configurar uma 'palavra-passe de polling pop3' antes de ativar o polling POP3." pop3_polling_authentication_failed: "Autenticação POP3 falhada. Por favor verifique as suas credenciais pop3." - reply_by_email_address_is_empty: "É necessário definir uma 'resposta por endereço de email' antes de ligar a reposta por email." - email_polling_disabled: "Tem de ligar a consulta manual ou automática de emails via POP3 antes de ligar a reposta por email." + reply_by_email_address_is_empty: "É necessário definir um email para 'resposta por endereço de email' antes de ligar a resposta por email." + email_polling_disabled: "Tem de ligar a consulta manual ou automática de emails via POP3 antes de ligar a resposta por email." user_locale_not_enabled: "Tem de ligar 'permitir definições regionais do utilizador' antes de ligar esta configuração." search: within_post: "#%{post_number} por %{username}" @@ -1148,9 +1224,9 @@ pt: user: 'Utilizadores' sso: not_found: "A sua conta não foi encontrada. Por favor contacte o administrador do site." - account_not_approved: "A sua conta ainda não foi aprovada por um membro da equipa. Receberá uma notificação por email quando a sua conta for aprovada." + account_not_approved: "A sua conta ainda não foi aprovada. Receberá uma notificação por email quando a sua conta for aprovada." unknown_error: "Existe um problema com a sua conta. Por favor contacte o administrador do site." - timeout_expired: "Expirou o tempo de login, por favor tente de novo." + timeout_expired: "Expirou o tempo de login, por favor tente entrar de novo." original_poster: "Participante Original" most_posts: "Maior parte das mensagens" most_recent_poster: "Participante Mais Recente" @@ -1237,7 +1313,7 @@ pt: must_begin_with_alphanumeric_or_underscore: "tem de começar por uma letra, um número ou o carácter sublinhado" must_end_with_alphanumeric: "tem de terminar com uma letra ou um número" must_not_contain_two_special_chars_in_seq: "não deve conter uma sequência de 2 ou mais caracteres especiais (.-_)" - must_not_end_with_confusing_suffix: "não deve terminar com um sufixo confuso tal como .json ou .png etc." + must_not_end_with_confusing_suffix: "não deve terminar com um sufixo que confunda tal como .json ou .png etc." email: not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email." blocked: "não é permitido." @@ -1246,8 +1322,8 @@ pt: max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal." flags_reminder: flags_were_submitted: - one: "Sinalizações foram submetidas há 1 hora atrás. Por favor analise-as. " - other: "Sinalizações foram submetidas há %{count} horas atrás. Por favor analise-as. " + one: "Uma denúncia foi submetida há 1 hora atrás. Por favor reveja-a. " + other: "Denúncias foram submetidas há %{count} horas atrás. Por favor reveja-as." subject_template: one: "1 sinalização à espera de ser tratada" other: "%{count} sinalizações à espera de serem tratadas" @@ -1255,7 +1331,7 @@ pt: subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}" text_body_template: | Alguém (possivelmente você?) pediu para não receber mais emails com com actualizações de %{site_domain_name} neste endereço. - Se confirma este pedido por favor carregue nesta hiperligação: + Se confirma este pedido por favor carregue nesta ligação: %{confirm_unsubscribe_link} @@ -1380,32 +1456,32 @@ pt: subject_template: "A exportação dos dados falhou" text_body_template: "Pedimos desculpa mas a sua exportação de dados falhou. Por favor verifique os registos do log ou contacte um membro do pessoal." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problema com Email -- Insuficiente nível de confiança" + subject_template: "[%{site_name}] Problema com Email -- Nível de Confiança Insuficiente" email_reject_inactive_user: subject_template: "[%{site_name}] Problema de email -- Utilizador inactivo" text_body_template: | - Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua conta associada com este email não está activa. Por favor active a sua conta antes de enviar emails. email_reject_blocked_user: - subject_template: "[%{site_name}] Problema de email -- Utilizador bloqueado" + subject_template: "[%{site_name}] Problema de email -- Utilizador Bloqueado" text_body_template: |+ - Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua conta associada com este endereço de email foi bloqueada. email_reject_reply_user_not_matching: text_body_template: |+ - Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. - A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro do pessoal. + A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro da equipa de apoio. email_reject_no_account: subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida" text_body_template: |+ - Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. - Não conseguimos encontrar nenhuma conta com combine com o seu endereço de email. Tente enviar de outro endereço de email ou contacte um membro do pessoal. + Não conseguimos encontrar nenhuma conta com o seu endereço de email. Tente enviar de outro endereço de email, ou contacte um membro da equipa de apoio. email_reject_empty: subject_template: "[%{site_name}] Problema de email -- Sem Conteúdo" @@ -1425,15 +1501,15 @@ pt: email_reject_strangers_not_allowed: subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" email_reject_invalid_post: - subject_template: "[%{site_name}] Problema de email -- Erro de publicação" + subject_template: "[%{site_name}] Problema de email -- Erro de Publicação" text_body_template: | - Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Algumas causas possíveis são: formatação complexa, mensagem demasiado grande, mensagem demasiado pequena. Por favor tente novamente, ou publique através do sítio se isto continuar. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problema de email -- Erro de publicação" + subject_template: "[%{site_name}] Problema de email -- Erro de Publicação" text_body_template: | - Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Motivo: @@ -1441,23 +1517,23 @@ pt: Se conseguir corrigir o problema, tente novamente. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problema de email -- Acção de Post inválida" + subject_template: "[%{site_name}] Problema de email -- Acção de Publicação inválida" text_body_template: | - Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. - A acção Post não foi reconhecida. Por favor tente novamente, ou publique através do sítio se isto continuar. + A Acção de Publicação não foi reconhecida. Por favor tente novamente, ou publique através do sítio se isto continuar. email_reject_reply_key: subject_template: "[%{site_name}] Problema de email -- Chave de Resposta Desconhecida" text_body_template: | - Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. - A chave de resposta no email é inválida ou desconhecida e por isso não conseguimos determinar a que email estava a responder. Contacte um membro do pessoal. + A chave de resposta no email é inválida ou desconhecida e por isso não conseguimos determinar a que é o que email estava a responder. Contacte um membro da equipa de apoio. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problema de email -- Endereço Para: Desconhecido" + subject_template: "[%{site_name}] Problema de Email -- Endereço Para: Desconhecido" text_body_template: | - Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. - Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que está a enviar o endereço de email correcto fornecido pelo pessoal. + Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que está a enviar o endereço de email correcto fornecido pela equipa de apoio. email_reject_topic_not_found: subject_template: "[%{site_name}] Problema de email -- Tópico Não Encontrado" email_reject_topic_closed: @@ -1467,11 +1543,11 @@ pt: email_error_notification: subject_template: "[%{site_name}] Problema de email -- Erro de autenticação POP" text_body_template: | - Ocorreu um erro de autenticação ao recuperar emails do servidor POP. + Infelizmente, ocorreu um erro de autenticação ao recuperar emails do servidor POP. Por favor certifique-se que configurou correctamente as credenciais POP em [configurações do sítio](%{base_url}/admin/site_settings/category/email). - Se existe uma interface web para a sua conta de POP de email pode necessitar se iniciar sessão na interface web e verificar a suas configurações aí. + Se existe uma interface web para a sua conta de POP de email, pode precisar de iniciar sessão na web e verificar a suas configurações aí. user_automatically_blocked: text_body_template: | Esta é uma mensagem automática. @@ -1592,17 +1668,18 @@ pt: confirm_new_email: subject_template: "[%{site_name}] Confirme o seu novo endereço de email" text_body_template: | - Confirme o seu novo endereço de email para %{site_name} ao clicar na seguinte hiperligação: + Confirme o seu novo endereço de email para %{site_name} ao clicar na seguinte ligação: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: subject_template: "[%{site_name}] Confirme o seu endereço de email atual" text_body_template: | - Antes de podermos alterar o seu endereço de email precisámos de confirmar que - controla a conta de email atual. Após completar este passo, iremos confirmar + Antes de podermos alterar o seu endereço de email, precisámos que confirme que + controla + a conta de email atual. Após completar este passo, terá de confirmar o seu novo endereço de email. - Confirme o seu endereço de email para o %{site_name} ao clicar na seguinte hiperligação: + Confirme o seu endereço de email para o %{site_name} ao clicar na seguinte ligação: %{base_url}/users/authorize-email/%{email_token} notify_old_email: @@ -1610,7 +1687,7 @@ pt: text_body_template: | Isto é uma mensagem automática para o informar que o seu endereço de email para %{site_name} foi alterado. Se isto foi feito em erro, por favor contacte - o administração do sítio. + a administração do sítio. O seu endereço de email foi alterado para: @@ -1670,7 +1747,7 @@ pt: too_large: "Pedimos desculpa, a imagem que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor redimensione-a e tente novamente." size_not_found: "Pedimos desculpa, mas não conseguimos determinar o tamanho da imagem. É possível que seu ficheiro de imagem esteja corrompido?" email_log: - post_user_deleted: "O utilizador do artigo foi eliminado." + post_user_deleted: "O utilizador do publicação foi eliminado." no_user: "Não foi possível encontrar o utilizador com o id %{user_id}" anonymous_user: "Utilizador é anónimo" suspended_not_pm: "O utilizador está suspenso, sem mensagens" @@ -2018,7 +2095,7 @@ pt: badges: editor: name: Editor - description: Primeira edição de artigo + description: Primeira edição de publicação basic_user: name: Básico member: @@ -2055,19 +2132,19 @@ pt: description: Recebeu 50 gostos num tópico nice_share: name: Boa Partilha - description: Partilhou um artigo com 25 visitantes únicos + description: Partilhou uma publicação com 25 visitantes únicos good_share: name: Ótima Partilha - description: Partilhou um artigo com 300 visitantes únicos + description: Partilhou uma publicação com 300 visitantes únicos great_share: name: Excelente Partilha - description: Partilhou um artigo com 1000 visitantes únicos + description: Partilhou uma publicação com 1000 visitantes únicos first_like: name: Primeiro Gosto - description: Gostou de um artigo + description: Gostou de uma publicação first_flag: - name: Primeira Sinalização - description: Sinalizou um artigo + name: Primeira Denúncia + description: Denunciou uma publicação promoter: name: Promotor description: Convidou um utilizador @@ -2078,29 +2155,29 @@ pt: description: Convidou 5 membros first_share: name: Primeira Partilha - description: Partilhou um artigo + description: Partilhou uma publicação first_link: - name: Primeira Hiperligação - description: Adicionou uma hiperligação para outro tópico + name: Primeira Ligação + description: Adicionou uma ligação para outro tópico first_quote: name: Primeira Citação - description: Citou um artigo + description: Citou uma publicação read_guidelines: - name: Ler Diretrizes - description: Ler as diretrizes da comunidade + name: Ler Orientações + description: Ler as orientações da comunidade reader: name: Leitor description: Ler todas as respostas num tópico com mais de 100 respostas popular_link: - name: Hiperligação Popular - description: Publicou uma hiperligação externa com 50 cliques + name: Ligação Popular + description: Publicou uma ligação externa com 50 cliques famous_link: - name: Hiperligação Famosa - description: Publicou uma hiperligação externa com 1000 cliques + name: Ligação Famosa + description: Publicou uma ligação externa com 1000 cliques appreciated: - description: Recebeu 1 gosto em 20 artigos + description: Recebeu 1 gosto em 20 publicações respected: - description: Recebeu 2 gostos em 100 artigos + description: Recebeu 2 gostos em 100 publicações out_of_love: description: Utilizou 50 gostos num dia higher_love: @@ -2122,7 +2199,7 @@ pt: initial_post_raw: Este tópico inclui relatórios diários de desempenho para o seu sítio. initial_topic_title: Relatórios de desempenho do sítio topic_invite: - user_exists: "Pedimos desculpa, esse utilizador já foi convidado. Pode apenas convidar um utilizador para um tópico uma vez." + user_exists: "Pedimos desculpa, esse utilizador já foi convidado. Pode convidar um utilizador para um tópico apenas uma vez." tags: title: "Etiquetas" activemodel: diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index ee8bc10c61..da1b6b1989 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -50,6 +50,8 @@ pt_BR: reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada." topic_not_found_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi excluído." topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado." + bounced_email_error: "O email é um relatório de email devolvido." + screened_email_error: "Acontece quando o endereço de email do remetente já foi examinado." errors: &errors format: '%{attribute} %{message}' messages: @@ -69,6 +71,7 @@ pt_BR: has_already_been_used: "já está sendo usado" inclusion: não está incluído na lista invalid: é inválido + is_invalid: "parece pouco claro; é uma frase completa?" less_than: precisa ser menor que %{count} less_than_or_equal_to: deve ser menor ou igual à %{count} not_a_number: não é um número @@ -108,6 +111,7 @@ pt_BR: operation_already_running: "Uma operação está sendo executada. Não é possível iniciar um novo trabalho agora." backup_file_should_be_tar_gz: "O arquivo de backup deve ser um arquivo .tar.gz." not_enough_space_on_disk: "Não há espaço suficiente no disco para carregar este backup." + invalid_filename: "O nome do arquivo de backup contém caracteres inválidos. Os caracteres válidos são a-z 0-9 . - _." not_logged_in: "Você precisa estar conectado para fazer isso." not_found: "A URL ou recurso solicitado não pôde ser encontrado." invalid_access: "Você não tem permissão para ver o recurso solicitado." @@ -155,6 +159,7 @@ pt_BR: topic_not_found: "Ocorreu um erro. Talvez este tópico foi fechado ou removido enquanto você estava visualizando?" just_posted_that: "é demasiado similar ao que postaste recentemente" invalid_characters: "contém caracteres inválidos" + is_invalid: "parece pouco claro; é uma frase completa?" next_page: "próxima página →" prev_page: "← página anterior" page_num: "Página %{num}" @@ -179,6 +184,7 @@ pt_BR: user_topics: "Últimos tópicos por @%{username}" tag: "Tópicos marcados" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada." + revert_version_same: "A versão atual é a mesma versão para a qual você está tentando reverter." excerpt_image: "imagem" queue: delete_reason: "Deletado pela fila de moderação" @@ -293,6 +299,10 @@ pt_BR: post_reply: base: different_topic: "Postagem e réplica precisam pertencer ao mesmo tópico." + web_hook: + attributes: + payload_url: + invalid: "URL inválida. A URL deve conter http:// ou https://. Espaço em branco não é permitido." <<: *errors user_profile: no_info_me: "
    o campo Sobre mim do seu perfil está em branco, quer completar?
    " @@ -330,6 +340,7 @@ pt_BR: category: topic_prefix: "Sobre a categoria %{category} " replace_paragraph: "(Substitua este primeiro parágrafo por uma curta descrição da sua nova categoria. Este guia vai aparecer na área de seleção de categoria, então tente usar menos que 200 caracteres. **Até você editar essa descrição ou criar tópicos, esta categoria não aparece na página de categorias.**)" + post_template: "%{replace_paragraph}\n\nUse os parágrafos a seguir para uma descrição mais longa, ou para estabelecer as instruções ou regras da categoria:\n\n- Por que as pessoas devem usar essa categoria? Para que ela serve?\n\n- Como exatamente ela é diferente das outras categorias que já existem?\n\n- O que os tópicos nessa categoria devem conter, em geral?\n\n- Precisamos dessa categoria? Podemos juntá-la com outra categoria ou subcategoria?\n" errors: uncategorized_parent: "Sem categoria não pode ter uma categoria pai" self_parent: "A subcategoria mãe não pode ser ela mesma" @@ -371,6 +382,8 @@ pt_BR: create_like: "Você atingiu o número máximo de curtidas hoje. Por favor aguarde% {time_left} antes de tentar novamente." create_bookmark: "Você atingiu o número máximo de marcadores hoje. Por favor aguarde% {time_left} antes de tentar novamente." edit_post: "Você atingiu o número máximo de edições hoje. Por favor aguarde% {tempo} esquerda antes de tentar novamente." + live_post_counts: "Você está pedindo contagens de publicações ao vivo rápido demais. Por favor, espere %{time_left} antes de tentar novamente." + unsubscribe_via_email: "Você atingiu o número máximo de cancelamentos de inscrição via email por hoje. Por favor, espere %{time_left} antes de tentar novamente." topic_invitations_per_day: "Você atingiu o número máximo de convites para tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente." hours: one: "1 hora" @@ -466,6 +479,7 @@ pt_BR: confirmed: "O seu email foi atualizado." please_continue: "Continuar no %{site_name}" error: "Houve um erro ao alterar o seu endereço de email. Talvez o endereço já esteja sendo utilizado?" + error_staged: "Houve um erro ao alterar o seu endereço de email. O endereço já está usado por outro usuário que ainda não confirmou seu email." already_done: "Desculpe, este link de confirmação não está mais válido. Talvez o seu e-mail já foi alterado?" authorizing_old: title: "Obrigado por confirmar o seu endereço de e-mail atual." @@ -546,6 +560,7 @@ pt_BR: unsubscribed: title: "Desinscrito!" description: "You have been unsubscribed. To change your email settings visit your user preferences.\n\nVocê se desinscreveu. Para alterar as suas configurações de email" + topic_description: "Para se reinscrever a %{link}, use o controle de notificações no fim ou no canto direito do tópico." unsubscribe: title: "Desinscrever" stop_watching_topic: "Parar de observar este tópico, %{link}" @@ -554,12 +569,24 @@ pt_BR: mailing_list_mode: "Desativar o modo lista de discussão" disable_digest_emails: "Pare de me enviar emails de resumo" all: "Não me envie nenhum email de %{sitename}" + different_user_description: "No momento, você está logado como um usuário diferente daquele para o qual mandamos email. Por favor, saia ou entre no modo anônimo de seu navegador e tente novamente." + not_found_description: "Desculpe, não conseguimos encontrar esse cancelamento de inscrição. É possível que o link no seu email tenha expirado?" log_out: "Sair" user_api_key: title: "Autorizar acesso à aplicação" authorize: "Autorizar" read: "ler" read_write: "ler/escrever" + description: "\"%{application_name}\" está pedindo o seguinte acesso à sua conta:" + no_trust_level: "Desculpe, você não tem o nível de confiança necessário para acessar a API de usuário." + generic_error: "Desculpe, não pudemos emitir as chaves de API de usuário. Esse recurso pode ter sido desativado pelo administrador do site." + scopes: + message_bus: "Atualizações ao vivo" + notifications: "Ler e limpar as notificações" + push: "Notificações Push para serviços externos" + session_info: "Ler as informações de seção do usuário" + read: "Ler tudo" + write: "Escrever tudo" reports: visits: title: "Visitas do Usuário" @@ -705,6 +732,7 @@ pt_BR: host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site." gc_warning: 'Seu servidor está rodando a coleta de lixo do ruby com os parâmetros padrão (default ruby garbage collection parameters), os quais não irão propiciar a melhor performance. Leia este tópico sobre ajuste de performance: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que ao menos um processo sidekiq esteja execução. Aprenda sobre Sidekiq aqui.' + queue_size_warning: 'O número de processos na fila é %{queue_size}, o que é alto. Isso pode ser indicação de um problema com o(s) processo(s) do Sidekiq, ou você pode ter que adicionar mais Sidekiq workers.' memory_warning: 'Seu servidor está rodando com menos de 1 GB de memória total. Pelo menos 1 GB é quantidade de memória recomendada.' google_oauth2_config_warning: 'O servidor está configurado para permitir o signup e login com Google OAuth2 (enable_google_oauth2_logins), mas os valores de Cliend Id e Secret não estão configurados. Vá para as Configurações do Site e atualize as configurações. Veja este guia e aprenda mais.' facebook_config_warning: 'O servidor está configurado para permitir o signup e login com Facebook (enable_facebook_logins), mas os valores do App Id e App Secret não estão configurados. Vá para as Configurações do Site e atualize as configurações. Veja este guia e aprenda mais.' @@ -713,11 +741,22 @@ pt_BR: s3_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_upload_bucket. Vá até as Configurações do Site e atualize estas definições. Veja "How to set up image uploads to S3?" para saber mais.' s3_backup_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá até as Configurações e atualize estas definições. Veja "How to set up image uploads to S3?" para saber mais.' image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando seu gerenciador de pacotes preferido ou acesse para fazer download da última versão.' + failing_emails_warning: 'Existem %{num_failed_jobs} tarefas de email que falharam. Verifique seu app.yml e se assegure que as configurações do servidor de email estão corretas. Veja as tarefas que falharam no Sidekiq.' + subfolder_ends_in_slash: "Sua configuração de subdiretórios está incorreta; DISCOURSE_RELATIVE_URL_ROOT termina com uma barra." + email_polling_errored_recently: + one: "A apuração de email gerou um erro nas últimas 24 horas. Veja os logs para mais detalhes." + other: "A apuração de email gerou %{count} erros nas últimas 24 horas. Veja os logs para mais detalhes." + missing_mailgun_api_key: "O servidor está configurado para enviar email pelo mailgun, mas você não forneceu uma chave de API usada para verificar as mensagens de webhook." + bad_favicon_url: "O carregamento do favicon está falhando. Verifique a sua configuração de favicon_url nas Configurações do Site." + poll_pop3_timeout: "A conexão com o servidor POP3 está atingindo o tempo limite. Por favor, verifique suas configurações de POP3 e selecione um servidor de serviço." + poll_pop3_auth_error: "A conexão com o servidor POP3 está falhando com um erro de autenticação. Por favor, verifique suas configurações de POP3." site_settings: censored_words: "Palavras que serão substituídos automaticamente por ■■■■" + censored_pattern: "Padrão de expressão regular que será automaticamente substituído por ■■■■" delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias." default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)" allow_user_locale: "Permitir que os usuários escolham suas próprias preferências de idioma de interface" + set_locale_from_accept_language_header: "define a língua da interface para os usuários anônimos de acordo com os cabeçalhos de língua de seus navegadores. (EXPERIMENTAL, não funciona com cache anônimo)" min_post_length: "Comprimento mínimo permitido do post em caracteres" min_first_post_length: "Comprimento mínimo de caracteres permitido para primeira mensagem (corpo do tópico)" min_private_message_post_length: "Comprimento mínimo de caracteres permitido para mensagens" @@ -726,6 +765,8 @@ pt_BR: max_topic_title_length: "Comprimento máximo permitido para o título do post em caracteres" min_private_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem" min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres" + search_tokenize_chinese_japanese_korean: "Força a busca a tokenizar Mandarim/Japonês/Coreano até para sites que não são nesses idiomas" + search_prefer_recent_posts: "Se buscar o seu fórum está lento, essa opção tenta indexar as publicações mais recentes primeiro" search_recent_posts_size: "Quantas postagens recentes a ser mantidas no íncide" allow_uncategorized_topics: "Permitir criação de tópicos sem uma categoria. NOTA: Se existe algum tópico sem nenhuma categoria, você deve movê-los para uma categoria antes de desabilitar esta opção." allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados, idênticos." @@ -739,7 +780,9 @@ pt_BR: crawl_images: "Recupere imagens de URLs remotas para inserir as dimensões de largura e altura corretos." download_remote_images_to_local: "Converta imagens remotas para imagens locais, transferindo-as; isto evita imagens quebradas." download_remote_images_threshold: "Espaço mínimo necessário para download das imagens ( em % )" + download_remote_images_max_days_old: "Não baixe fotos remotas para publicações que tem mais de n dias." disabled_image_download_domains: "Imagens hospedadas nestes domínios nunca serão baixadas. \nLista delimitada por |" + editing_grace_period: "Por (n) segundos após a publicação, as edições não criarão uma nova versão ho histórico da publicação." post_edit_time_limit: "O autor pode editar ou apagar o seu post para (n) minutos após a postagem. Defina como 0 para sempre." edit_history_visible_to_public: "Permitir que todos vejam as versões anteriores de uma postagem editada. Quando desativado, somente membros da equipe podem ver o histórico de alterações." delete_removed_posts_after: "Postagens removidas pelo autor serão automaticamente deletadas depois de (n) horas. Se o valor definido for 0, as postagens serão deletadas imediatamente." @@ -752,38 +795,59 @@ pt_BR: add_rel_nofollow_to_user_content: "Adicionar \"nofollow\" para todo conteúdo incluído por um usuário, exceto links internos (incluindo sub domínios). Para que as mudanças façam efeito é necessário rodar \"rake posts:rebake\"." exclude_rel_nofollow_domains: "Uma lista de domínios aonde nofollow não deve ser adicionado nos links. tld.com automaticamente permite sub.tld.com. No mínimo, você deve adiocionar o domínio principal deste site para ajudar os motores de busca encontrarem todo conteúdo. Se outras partes de seu site estão em outros domínios, adicione estes também." post_excerpt_maxlength: "Limite de caracteres para o resumo de um post." + show_pinned_excerpt_mobile: "Mostrar excerto de tópicos fixos na exibição para celular." + show_pinned_excerpt_desktop: "Mostrar excerto de tópicos fixos na exibição para desktop." post_onebox_maxlength: "Tamanho máximo para um Post em caracteres" + onebox_domains_blacklist: "Uma lista de domínios que nunca serão transformados em oneboxes." + max_oneboxes_per_post: "Número máximos de oneboxes em uma publicação." logo_url: "O logotipo ao lado superior esquerdo de seu site deve ser um retângulo largo. Se for deixado em branco, o que aparecerá será o nome do site. " + digest_logo_url: "A imagem de logo alternativa usada no topo do email de resumo do seu site. Ela deve ter um formato retangular alongado e não deve ser uma imagem SVG. Se deixado em branco, `logo_url` será usado." + logo_small_url: "A pequena imagem de logo no topo à esquerda do seu site, vista quando rolando a página abaixo. Se deixado em branco, um símbolo de casa será mostrado." + favicon_url: "Um favicon para seu site, veja http://en.wikipedia.org/wiki/Favicon. Para funcionar corretamente por um CDN, ele deve ser um png" + mobile_logo_url: "A imagem de logo de posição fixa usada no topo esquerdo do seu site móvel, que deve ter um formato quadrado. Se deixado em branco, `logo_url` será usado. Por ex: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px." notification_email: "O endereço de email utilizado quando enviado emails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR, devidamente configurados para que os email funcionem corretamente." email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados" email_subject: "Customizar o formato do assunto dos emails padrões. \nRef https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" + force_https: "Force seu site a usar apenas HTTPS. AVISO: NÃO ative até que você tenha verificado que o HTTPS está completamente configurado e funcionando em absolutamente todos os lugares! Você verificou se seu CDN, todos os logins sociais e quaisquer logos e dependências externos são todos compatíveis com HTTPS, também?" summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída no \"Resuma este tópico\" " summary_posts_required: "Mensagens mínimas em um tópico antes de 'Resumir este tópico' ficar habilitado" summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado" summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens" summary_max_results: "Máximo número de posts quando resumidos por Categoria " + enable_private_messages: "Permitir que usuários de nível de confiança 1 (configurável via o nível mínimo de confiança para enviar mensagens) criem e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, independente do caso." enable_long_polling: "O sistema de mensagens das notificações pode fazer solicitações longas." long_polling_base_url: "URL Utilizada para \"long polling\" ( Quando um CDN for configurado, tenha certeza que essa configuração seja a padrão) ex: http://origin.site.com" long_polling_interval: "Tempo que o servidor deve aguardar antes de responder quando não existe nenhum dado para ser enviado. (apenas usuários logados)" polling_interval: "Com que frequencia os clientes podem solicitar o servidor em milisegundos" anon_polling_interval: "Com que frequencia os clientes não registrados podem solicitar o servidor em milisegundos" background_polling_interval: "Com que frequência os clientes podem solicitar o servidor em milisegundos ( em segundo plano )" + flags_required_to_hide_post: "Número de sinalizações que fazem com que uma publicação seja automaticamente escondida e que uma mensagem seja enviada ao usuário (0 para nunca)" cooldown_minutes_after_hiding_posts: "Número de minutos que um usuário deve esperar antes de poder editar uma publicação que foi ocultada devido a sinalização da comunidade." + max_topics_in_first_day: "Número máximo de tópicos que um usuário pode criar num período de 24 horas após a criação de sua primeira publicação" max_replies_in_first_day: "O número máximo de respostas que um usuário está habilitado para criar é de 24 horas após a criação de sua primeira postagem. " tl2_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl2 (membros) multiplicando por esse número" tl3_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl3 (regular) multiplicando por esse número" tl4_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl4 (lideres) multiplicando por esse número" + num_spam_flags_to_block_new_user: "Se as publicações de um novo usuário receberem essa quantidade de sinalizações de spam de num_users_to_block_new_user usuários diferentes, esconder todos os seus posts e impedir publicação futura. 0 para desabilitar. " + num_users_to_block_new_user: "Se as publicações de um usuário novo receberem num_spam_flags_to_block_new_user sinalizações de spam dessa quantidade de usuários diferentes, esconder todos as suas publicações e impedir publicações futuras. 0 para desabilitar." + num_tl3_flags_to_block_new_user: "Se as publicações de um usuário novo tiverem essa quantidade de sinalizações de num_tl3_users_to_block_new_user usuários de nível de confiança 3 diferentes, esconder todas as publicações do usuário e prevenir postagem futura. 0 para desabilitar." notify_mods_when_user_blocked: "Se um usuário for bloqueado de forma automática, enviar uma mensagem para todos os moderadores." flag_sockpuppets: "Se um novo usuário responder um tópico usando o mesmo endereço de IP do novo usário que começou o tópico, sinalize as duas publicações como um potencial spam." traditional_markdown_linebreaks: "Use quebras de linhas tradicionais em Markdown, as quais requerem dois espaços à direita para uma quebra de linha." post_undo_action_window_mins: "Número de minutos permitidos aos usuários para desfazerem uma ação recente em uma publicação (curtir, sinalizar, etc)" must_approve_users: "Os moderadores devem aprovar todas novas contas antes que elas sejam permitidas acessarem o site. CUIDADO: habilitar esta opção para um site já em funcionamento irá revogar o acesso para todos usuários já cadastrados que não são moderadores." + maximum_session_age: "Usuário continuará logado por n horas desde a última visita" + ga_tracking_code: "OBSOLETO: Código de monitoramento do Google analytics (ga.js), por ex: UA-12345678-9; veja http://google.com/analytics" + ga_domain_name: "OBSOLETO: Nome de domínio do Google Analytics (ga.js), por ex: meusite.com; veja http://google.com/analytics" ga_universal_tracking_code: "Código de monitoramento Google Universal Analytics (analytics.js), ex: UA-12345678-9; veja http://google.com/analytics" ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: meusite.com; veja http://google.com/analytics" + gtm_container_id: "ID do container do Gerenciador de Tags do Google. eg: GTM-ABCDEF" + enable_escaped_fragments: "Voltar à API de Ajax-Crawling do Google se nenhum webcrawler for detectado. Veja https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" enable_noscript_support: "Ativar suporte a tag <noscript>" allow_moderators_to_create_categories: "Permitir a criação de categorias por moderadores" cors_origins: "Origens permitidas para pedidos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como true para habilitar CORS." + use_admin_ip_whitelist: "Administradores só podem logar se estiverem na lista de IPs Filtrados (Administração > Logs > IPs Filtrados)." top_menu: "Determina quais items aparecem na navegação da homepage, e em qual ordem. Exemplo latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "A ordem dos items no menu da postagem." post_menu_hidden_items: "Os items de menu a ser escondidos por padrão no menu de postagem, a menos que uma elipse de expansão seja clicada." @@ -798,13 +862,17 @@ pt_BR: topics_per_period_in_top_summary: "Número de melhores tópicos mostrados no sumário padrão de melhores tópicos." topics_per_period_in_top_page: "Número de melhores tópicos mostrados no 'Exibir Mais' melhores tópicos quando expandido." redirect_users_to_top_page: "Automaticamente redirecionar usuários novos e há muito ausentes para a página melhores." + top_page_default_timeframe: "Intervalo de tempo padrão para a página de melhores publicações. " show_email_on_profile: "Mostrar o email de um usuário em seus perfis (apenas visível a eles mesmos e staff)" + prioritize_username_in_ux: "Mostrar primeiro o nome de usuário na página do usuário, cartão do usuário e publicações (quando desabilitado, o nome será mostrado primeiro) " email_token_valid_hours: "Tokens de Esqueceu senha / ativar conta são válidas por (n) horas." email_token_grace_period_hours: "Tokens de esqueceu senha / ativar conta ainda serão válidas por um período extra de (n) horas depois de serem resgatados." enable_badges: "Habilita o sistema de emblemas" + enable_whispers: "Permitir comunicação privativa da equipe dentro de um tópico. (experimental)" allow_index_in_robots_txt: "Especificar no robots.txt que este site é permitido de ser indexado por sistemas de busca na web." email_domains_blacklist: "Lista delimitada por barras (|) de domínios de email que não são permitidos registros de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista separada por barra (|) de domínios de email que usuários DEVEM usar para registrar contas. CUIDADO: Usuário com domínio de email diferentes da lista não serão permitidos!" + forgot_password_strict: "Não informar os usuários da existência de uma conta quando eles usam o diálogo de esquecimento de senha." log_out_strict: "Quando deslogando, deslogar TODAS as sessões do usuário em todos os dispositivos" version_checks: "Pingar Discourse Hub para atualizações de versão e exibir mensagens de versão no Painel em /admin" new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível." @@ -821,8 +889,11 @@ pt_BR: min_admin_password_length: "Tamanho de senha mínima para Administradores." block_common_passwords: "Não permitir senhas que estiverem entre as 10,000 senhas mais comuns." enable_sso: "Permite autenticação única atráves de site externo (AVISO: OS ENDEREÇOS DE E-MAIL *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)" + verbose_sso_logging: "Logar diagnósticos verbosos relacionado ao SSO nos /logs" enable_sso_provider: "Implementar protocolo do provedor Discourse SSO no caminho /session/sso_provider, requer que sso_secret seja configurado" + sso_url: "URL do ponto final do logon único (SSO) (deve incluir http:// ou https://)" sso_secret: "String secreta usada para autenticar criptograficamente informação de SSO, esteja certo de que possui 10 ou mais caracteres" + sso_overrides_bio: "Sobrescreve a bio de usuário e impede o usuário de mudá-la." sso_overrides_email: "Substitui endereço de e-mail local pelo fornecido no site externo através de cada informação de login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a normalização de e-mails locais)" sso_overrides_username: "Substitui nome de usuário local com o fornecido pelo site externo através da informação de cada login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a diferenças ao tamanho e pré-requisitos de nomes de usuário)" sso_overrides_name: "Substitui nome completo local com nome completo do site externo através da informação de login, e previne mudanças locais." @@ -830,6 +901,7 @@ pt_BR: sso_not_approved_url: "Redireciona contas não aprovadas no login externo para este endereço" enable_local_logins: "Habilitar nome de usuário e senha local para autenticação nas contas. (Observação: deve ser habilitado para funcionamento dos convites)" allow_new_registrations: "Permitir registro de novos usuários. Desmarque isso para prevenir quem quer que seja de criar uma nova conta." + enable_signup_cta: "Mostra um aviso aos usuários anônimos que retornem, solicitando que criem uma conta." enable_yahoo_logins: "Ativar autenticação pelo Yahoo" enable_google_oauth2_logins: "Ativar autentincação Google Oauth2. Esse é o método de autenticação que o Google atualmente suporta. Necessita de uma chave e chave secreta." google_oauth2_client_id: "Client ID da sua aplicação Google." @@ -837,19 +909,33 @@ pt_BR: enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret" twitter_consumer_key: "consumer key registrada em dev.twitter.com (usada para fazer autenticação via twitter)" twitter_consumer_secret: "consumer secret registrada em dev.twitter.com (usada para fazer autenticação via twitter)" + enable_instagram_logins: "Habilitar autenticação via Instagram. Requer instagram_consumer_key e instagram_consumer_secret" + instagram_consumer_key: "Chave de consumidor para autenticação via Instagram" + instagram_consumer_secret: "Segredo de consumidor para autenticação via Instagram" enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret" facebook_app_id: "app id, registrado em https://developers.facebook.com/apps (used for facebook auth)" facebook_app_secret: "app secret, registrado em https://developers.facebook.com/apps (used for facebook auth)" + facebook_request_extra_profile_details: "Solicitar sobre mim, localização e site do facebook. (requer que sua aplicação de autenticação seja aprovada pelo facebook)" enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret" github_client_id: "Client id para autenticação via Github, registrado em https://github.com/settings/applications" github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications" + readonly_mode_during_backup: "Habilitar modo de apenas leitura quando estiver realizando um backup" allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup" maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente" + automatic_backups_enabled: "Realizar backups automáticos, como definido na frequência de backup" + backup_frequency: "A frequência com a qual criamos backups, em dias." enable_s3_backups: "Fazer upload dos backups para o S3 quando completado. IMPORTANTE: exige credenciais válidas do S3 configuradas nas Configurações de Arquivos." s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado." + s3_disable_cleanup: "Desabilitar a remoção de backups na S3 quando removidos localmente." + backup_time_of_day: "Hora do dia, em UTC, quando o backup deve ocorrer." + backup_with_uploads: "Incluir uploads nos backups programados. Desabilite para copiar apenas a base de dados. " active_user_rate_limit_secs: "Qual a frequencia de atualização do campo 'última vez visto em', em segundos." verbose_localization: "Mostrar dicas estendidas de localização na UI" previous_visit_timeout_hours: "Quanto tempo uma visita dura antes de considerarmos como 'última visita', em horas." + top_topics_formula_log_views_multiplier: "valor do multiplicador de visualizações logadas (n) na fórmula dos melhores tópicos: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_first_post_likes_multiplier: "valor do multiplicador de curtidas do primeiro post (n) na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador da menor quantidade de curtidas por publicação (n) na fórmula de melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`" + rebake_old_posts_count: "Número de publicações antigas a serem renderizadas novamente a cada 15 minutos." rate_limit_create_topic: "Após criar um tópico, os usuários devem aguardar (n) segundos antes de criar um outro tópico." rate_limit_create_post: "Após postar, os usuários devem aguardar (n) segundos antes de criar um outro post." rate_limit_new_user_create_topic: "Após criar um tópico, novos usuários devem aguardar (n) segundos antes de criar um outro tópico." @@ -862,8 +948,12 @@ pt_BR: max_private_messages_per_day: "Máximo número de mensagens que usuários podem criar por dia." max_invites_per_day: "Número máximo de convites que um usuário pode enviar por dia." max_topic_invitations_per_day: "Número máximo de convites para tópicos que um usuário pode enviar por dia." + alert_admins_if_errors_per_minute: "Número de erros por minutos para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização." + alert_admins_if_errors_per_hour: "Número de erros por hora para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização." + categories_topics: "Números de tópicos a serem mostrados na página /categorias." suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico." limit_suggested_to_category: "Mostrar apenas tópicos da categoria atual em tópicos sugeridos." + suggested_topics_max_days_old: "Tópicos sugeridos não devem ter mais de n dias." clean_up_uploads: "Remover envios sem referência para evitar hospedagem ilegal. AVISO: você pode querer fazer um backup do seu diretório de /uploads antes de habilitar essa configuração." clean_orphan_uploads_grace_period_hours: "Carência (em horas) antes de um upload órfão ser removido." purge_deleted_uploads_grace_period_days: "Carência (em dias) antes que um upload excluído seja apagado." @@ -877,7 +967,12 @@ pt_BR: s3_cdn_url: "O endereço do CDN para usar para todos artefatos do s3 (por exemplo: https://cdn.algumlugar.com). AVISO: depois de mudar esta configuração você deve reconverter todas mensagens antigas." avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente." external_system_avatars_enabled: "Usar serviço de avatar externo." + external_system_avatars_url: "URL do sistema externo do serviço de avatares. Substituições permitidas são {username} {first_letter} {color} {size}" + default_opengraph_image_url: "URL da imagem opengraph padrão." + twitter_summary_large_image_url: "URL da imagem do cartão de resumo padrão do Twitter (deve ter pelo menos 280px de largura e pelo menos 150px de altura)." allow_all_attachments_for_group_messages: "Permitir todos os anexos de e-mail para mensagens de grupo." + convert_pasted_images_to_hq_jpg: "Converte imagens coladas para arquivos JPG de alta qualidade." + convert_pasted_images_quality: "Qualidade dos arquivos JPG convertidos (1 para a qualidade mais baixa, 100 para a mais alta)." enable_flash_video_onebox: "Habilitar o embutir de links swf e flv (Adobe Flash) em oneboxes. AVISO: pode introduzir riscos de segurança." default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários convidados." default_trust_level: "Nível de confiança (0-4) para todos novos usuários. CUIDADO! Mudar irá colocar em sérios riscos de spam." @@ -891,6 +986,7 @@ pt_BR: tl2_requires_likes_received: "Quantos likes um usuário deve receber antes de ser promovido a nível de confiança 2." tl2_requires_likes_given: "Quantos likes um usuário deve dar antes de ser promovido a nível de confiança 2." tl2_requires_topic_reply_count: "Quantos tópicos um usuário deve responder antes de ser promovido a nível de confiança 2." + tl3_time_period: "Período de tempo (em dias) requerido para o Nível de Confiança 3" tl3_requires_topics_viewed_all_time: "O mínimo total de tópicos que um usuário precisa ter visto para se qualificar a promoção ao nível de confiança 3." tl3_requires_posts_read_all_time: "O mínimo total de postagens que um usuário precisa ter lido para se qualificar a promoção ao nível de confiança 3." tl3_promotion_min_duration: "O número mínimo de dias que uma promoção ao nível 3 dura antes que um usuário possa ser rebaixado novamente ao nível de confiança 2." @@ -1196,88 +1292,88 @@ pt_BR: ## Navegação + - Para fazer buscas, voltar para a sua página de usuário, ou acessar o menu ☰, use os **botões com ícone no lado superior direito**. - - For search, your user page, or the ☰ menu, use the **icon buttons at upper right**. - - - Selecting a topic title will always take you to your **next unread reply** in the topic. To enter at the top or bottom instead, select the reply count or last reply date. + - Selecionando o título do tópico sempre leva para a próxima **mensagem não lida** daquele tópico. Para entrar no início ou no final, selecione o contador de mensagens ou a data da última mensagem. - - While reading a topic, use the timeline on the right to jump to the top, bottom, or your last read position. On smaller screens, select the progress bar at bottom right to expand it: + - Enquanto estiver lendo um tópico, use a linha do tempo do lado direito para ir ao início, final ou a local da última leitura. Em telas pequenas, selecione a barra de progresso verde no canto inferior direito para acessar os controles de navegação: - You can also press ? on your keyboard for a list of super-speedy keyboard shortcuts. + Você também pode selecionar a tecla ? para ver uma lista com todos os atalhos do teclado. - ## Replying + ## Respostas - To insert a quote, select the text you wish to quote, then press any Reply button to open the editor. Repeat for multiple quotes. + Para inserir uma citação, selecione o texto desejado e pressione qualquer botão de Resposta para abrir o editor: + + + + Para citações múltiplas, repita o mesmo processo. - You can always continue reading while you compose your reply, and we automatically save drafts as you write. + Você pode continuar lendo enquanto compõe uma resposta. O rascunho da sua mensagem é salvo automaticamente enquanto você escreve. - To notify someone about your reply, mention their name. Type `@` to begin selecting a username. + Para notificar alguém da sua resposta, mencione o nome da pessoa. Digite `@` para selecionar o nome de um usuário. - To use [standard Emoji](http://www.emoji.codes/), just type `:` to match by name, or use the traditional smileys `;)` + Para usar [Emojis comuns](http://www.emoji.codes/), basta ou digitar `:` para ver a lista de opções, ou usar um dos sorrisos tradicionais `:)` :smile: - To generate a summary for a link, paste it on a line by itself: - + Para gerar o resumo de um link, copie-o em uma linha por conta própria: - Your reply can be formatted using simple HTML, BBCode, or [Markdown](http://commonmark.org/help/): + Você pode formatar as suas respostas usando HTML simples, BBCode, ou [Markdown](http://commonmark.org/help/): - This is bold. - This is [b]bold[/b]. - This is **bold**. + Este está em negrito. + Este está em [b]negrito[/b]. + Este está em **negrito**. - For more formatting tips, [try our fun 10 minute interactive tutorial!](http://commonmark.org/help/tutorial/) + Para outras dicas de formatação, [experimente os nossos tutoriais interativos de 10 minutos!](http://commonmark.org/help/tutorial/) - ## Actions + ## Ações - There are action buttons at the bottom of each post: + Há "botões de ação" embaixo de cada resposta. - + - - To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! + - Para indicar que você gostou de uma resposta, use o botão **Like** ("Curtir"). - - Grab a copy-pasteable link to any reply or topic via the **link** button. + - Use o botão **Link** para pegar um link direto para qualquer tópico ou resposta. - - Use the … show more button to reveal more actions. **Flag** to privately let the author, or [our staff](%{base_url}/about), know about a problem. **Bookmark** to find this post later on your profile page. + - Use o botão … para revelar mais ações. O botão **Flag** notifica, de forma privada, o autor ou a [nossa equipe](%{base_url}/about), de algum problema. O **Bookmark** serve para consultar depois o tópico na sua página de usuário. - ## Notifications + ## Notificações - When someone replies to you, quotes your post, mentions your `@username`, or even links to your post, a number will immediately appear at the top right of the page. Select it to access your **notifications**. + Quando alguém responder a uma mensagem sua, citar sua mensagem, mencionar o seu `@nomedeusuário`, ou mesmo criar um link para um comentário seu, um número irá aparecer imediatamente próximo ao seu avatar no canto superior direito da página. Clique neste número para acessar as suas **notificações**. - Don't worry about missing a reply – you'll be emailed any notifications that arrive when you are away. + Não se preocupe se perder uma resposta – você receberá um email com as respostas (e mensagens) caso não esteja online quando elas chegarem. - ## Preferences + ## Preferências - - All topics less than **two days old** are considered new. + - Todos os tópicos com menos de dois dias são considerados novos. - - Any topic you've **actively participated in** (by creating it, replying to it, or reading it for an extended period) will be automatically tracked on your behalf. + - Todos os tópicos dos quais você tenha **participado ativamente** (que tenha respondido, criado, ou lido por um certo tempo) serão automaticamente rastreados para você. - You will see the new and unread number indicators next to these topics: + Você irá ver números indicando respostas novas e não lidas próximos a estes tópicos: - You can change your notifications for any topic via the notification control at the bottom, and right hand side, of each topic. + Você pode mudar as notificações de qualquer tópico por meio do controle de notificações que fica embaixo, no lado direito de cada tópico. - You can also set notification state per category, if you want to watch or mute every new topic in a specific category. + Você também pode configurar as notificações por categoria. Para mudar as configurações, veja as [suas preferências de usuário](%{base_url}/my/preferences). - To change any of these settings, see [your user preferences](%{base_url}/my/preferences). + ## Níveis de Confiança Comunitária - ## Community Trust - - It's great to meet you! As you participate here, over time we'll get to know you, and your temporary new user limitations will be lifted. Keep participating, and over time you'll gain new [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) that include special abilities to help us manage our community together. + É um prazer conhecer você! Conforme for participando, irá ganhando confiança da comunidade e as suas restrições de usuário novato serão removidas automaticamente. Ao atingir [níveis de confiança](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) mais altos, você ganhará habilidades especiais que lhe permitirão ajudar a gerenciar a comunidade junto conosco. welcome_user: subject_template: "Bem-vindo ao %{site_name}!" text_body_template: | @@ -1522,7 +1618,9 @@ pt_BR: more_topics: "Há %{new_topics_since_seen} outros novos tópicos." more_topics_category: "Mais tópicos novos:" mailing_list: + new_topics: "Novos tópicos" topic_updates: "Atualizações do tópico" + view_this_topic: "Ver esse tópico" back_to_top: "Voltar ao topo" forgot_password: subject_template: "[%{site_name}] Redefinição de senha" @@ -1544,6 +1642,13 @@ pt_BR: %{base_url}/users/password-reset/%{email_token} admin_login: subject_template: "[%{site_name}] Login" + text_body_template: | + Alguém pediu para logar na sua conta no [%{site_name}](%{base_url}). + + Se você não realizou esse pedido, você pode ignorar esse email com segurança. + + Clique no link a seguir para logar: + %{base_url}/users/admin-login/%{email_token} account_created: subject_template: "[%{site_name}] Sua nova Conta" text_body_template: | @@ -1551,8 +1656,32 @@ pt_BR: Clique no link a seguir para escolher uma senha para a sua nova conta: %{base_url}/users/password-reset/%{email_token} + confirm_new_email: + subject_template: "[%{site_name}] Confirme seu novo endereço de email" + text_body_template: | + Confirme seu novo endereço de email para %{site_name} clicando no link a seguir: + + %{base_url}/users/authorize-email/%{email_token} + confirm_old_email: + subject_template: "[%{site_name}] Confirme seu endereço de email atual" + text_body_template: | + Antes que possamos mudar seu endereço de email, precisamos confirmar que você controla + a conta de email atual. Após completar esse passo, pediremos que você confirme + o novo endereço de email. + + Confirme seu endereço de email atual para %{site_name} clicando no link a seguir: + + %{base_url}/users/authorize-email/%{email_token} notify_old_email: subject_template: "[%{site_name}] Seu endereço de email foi alterado." + text_body_template: | + Esta é uma mensagem automática para lhe avisar que seu endereço de email para + %{site_name} foi modificado. Se isso foi um erro, por favor entre em contato + com um administrador do site. + + Seu endereço de email foi modificado para: + + %{new_email} signup_after_approval: subject_template: "Você foi aprovado no %{site_name}!" text_body_template: | @@ -1609,7 +1738,11 @@ pt_BR: size_not_found: "Desculpe, mas não conseguimos determinar o tamanho da imagem. É possível que seu arquivo de imagem esteja corrompido?" avatar: missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?" + flag_reason: + sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração `flag_sockpuppets` do site." + spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio (%{domain}). Veja a configuração `newuser_spam_host_threshold` do site." email_log: + post_user_deleted: "Usuário da publicação foi apagado." no_user: "Não foi possível encontrar usuário com id %{user_id}" anonymous_user: "Usuário é anônimo" suspended_not_pm: "Usuário está suspenso, não é uma mensagem" @@ -1620,10 +1753,13 @@ pt_BR: post_deleted: "mensagem foi excluida pelo autor" user_suspended: "usuário foi suspenso" already_read: "usuário já leu esta mensagem" + exceeded_emails_limit: "max_emails_per_day_per_user excedido" + exceeded_bounces_limit: "bounce_score_threshold excedida" message_blank: "message está em branco" message_to_blank: "message.to está em branco" text_part_body_blank: "text_part.body está em branco" body_blank: "body está em branco" + no_echo_mailing_list_mode: "Notificações pela lista de emails desabilitadas para as publicações do próprio usuário" color_schemes: base_theme_name: "Base" about: "Sobre" @@ -1739,9 +1875,13 @@ pt_BR: appreciated: name: Agradecido description: Teve 20 mensagens curtidas + long_description: | + Esse emblema é concedido quando você recebe ao menos uma curtida em 20 publicações diferentes. A comunidade está gostando das suas contribuições e conversas aqui! respected: name: Respeitado description: Recebeu 2 curtidas em 100 mensagens + long_description: | + Esse emblema é concedido quando você recebe ao menos 2 curtidas em 100 posts diferentes. A comunidade está cultivando um respeito por suas várias contribuições e conversas aqui. admired: name: Admirado description: Recebeu 5 curtidas em 300 mensagens @@ -1802,7 +1942,11 @@ pt_BR: help: "registro de uma nova conta para ser iniciado" confirm_email: title: "Confirme seu email" + resend_email: + title: "Reenviar Email de Confirmação" + message: "

    Reenviamos o email de confirmação para %{email}" wizard: + title: "Configuração do Discourse" step: locale: title: "Bem-vindo ao seu Discourse!" @@ -1842,13 +1986,25 @@ pt_BR: placeholder: "nome@exemplo.com" corporate: fields: + company_short_name: + label: "Nome da Empresa (curto)" + placeholder: "Initech" company_full_name: label: "Nome da Companhia" + placeholder: "Initech, Inc." + company_domain: + label: "Nome do Domínio da Empresa" + placeholder: "initech.com" colors: title: "Tema" fields: theme_id: description: "Você prefere um esquema de cores claro ou escuro para começar? Você poderá, futuramente, trocar o esquema de cores do seu site através da Aba: Admin, Configurações." + choices: + default: + label: "Claro Simples" + dark: + label: "Escuro Simples" logos: title: "Logotipos" fields: @@ -1863,9 +2019,12 @@ pt_BR: fields: favicon_url: label: "Ícone pequeno" + description: "Ícone usado para representar seu site em navegadores, que tenha boa aparência em tamanhos pequenos, como 32px por 32px." apple_touch_icon_url: label: "Ícone Largo" + description: "Ícone usado para representar seu site em dispositivos modernos, que tenha boa aparência em tamanhos maiores. O tamanho recomendado é pelo menos 144px por 144px." homepage: + description: "Recomendamos mostrar os últimos tópicos na sua página inicial, mas você pode escolher mostrar categorias (grupos de tópicos) na página inicial, se preferir." title: "Página Inicial" fields: homepage_style: diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 2bd4939412..997b700170 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -1135,6 +1135,7 @@ ro: manual_polling_enabled: "Trimite emailuri folosind API-ul pentru răspunsuri prin email." pop3_polling_enabled: "Folosește POP3 pentru răspunsuri prin email." pop3_polling_ssl: "Folosește SSL pentru conexiunile cu serverul POP3. (Recomandat)" + pop3_polling_openssl_verify: "Verifică certificatul server TLS (Implicit: activat)" pop3_polling_period_mins: "Prioada în minute între fiecare verificare a contului POP3 pentru emailuri. NOTA: necesită restart." pop3_polling_port: "Portul pentru retragerea emailurilor din contul POP3." pop3_polling_host: "Gazda pentru retragerea emailurilor prin POP3." @@ -1245,6 +1246,7 @@ ro: default_categories_watching: "Implicit, listează categoriile care sunt urmărite în mod activ." default_categories_tracking: "Implicit, listează categoriile care sunt urmărite." default_categories_muted: "Implicit, listează categoriile care sunt setate pe silențios." + default_categories_watching_first_post: "Lista categoriilor în care prima postare din fiecare topic va fi urmărită activ în mod implicit." max_user_api_reqs_per_day: "Numărul maxim de interogări API utilizator pe cheie, pe zi. " max_user_api_reqs_per_minute: "Numărul maxim de interogări API utilizator pe cheie, pe minut. " allow_user_api_keys: "Permite generarea de chei API pentru utilizator" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index b94ecaab0a..dcb8be7558 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -2199,6 +2199,7 @@ tr_TR: staff_tag_remove_disallowed: " \"%{tag}\" etiketi yalnızca görevliler tarafından silinebilir gözüküyor." rss_by_tag: "%{tag} etiketli konular" finish_installation: + congratulations: "Tebrikler, Discourse yüklediniz!" register: button: "Kayıt Ol" help: "başlamak için yeni bir hesap oluşturun" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index ae4abab853..b61cbc5f3a 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -1163,7 +1163,7 @@ zh_CN: not_found: "无法找到你的账户。请联系站点管理人员。" account_not_approved: "你的帐号尚未被审核通过。一旦你的帐号获得批准，你就会收到一封电子邮件提醒。" unknown_error: "你的账户发生了问题。请联系站点管理人员。" - timeout_expired: "账户登录超市，请重新尝试登录。" + timeout_expired: "账户登录超时，请重新尝试登录。" original_poster: "原始作者" most_posts: "大部分帖子" most_recent_poster: "当前大部分帖子作者" diff --git a/plugins/poll/config/locales/client.et.yml b/plugins/poll/config/locales/client.et.yml index 5f8c915f2e..b0ff39ed4a 100644 --- a/plugins/poll/config/locales/client.et.yml +++ b/plugins/poll/config/locales/client.et.yml @@ -10,7 +10,7 @@ et: poll: voters: one: "hääletaja" - other: "hääletajad" + other: "hääletajat" total_votes: one: "häält kokku" other: "hääli kokku" diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml index 32be29664e..740c1abb0e 100644 --- a/plugins/poll/config/locales/server.zh_CN.yml +++ b/plugins/poll/config/locales/server.zh_CN.yml @@ -9,6 +9,7 @@ zh_CN: site_settings: poll_enabled: "允许用户创建投票？" poll_maximum_options: "投票允许的最大选项数。" + poll_edit_window_mins: "投票创建后多少分钟内可以编辑？" poll: multiple_polls_without_name: "有多个投票没有名字。使用“name”属性区分各投票。" multiple_polls_with_same_name: "有多个投票的名字相同：%{name}。使用“name”属性区分各投票。" @@ -25,6 +26,10 @@ zh_CN: requires_at_least_1_valid_option: "你必须选择至少 1 个有效的选项。" default_cannot_be_made_public: "投票调查不能公开。" named_cannot_be_made_public: "投票“%{name}”有投票不能公开。" + edit_window_expired: + cannot_change_polls: "在创建话题%{minutes}分钟后，你不可以增加、删除或者重命名该投票。" + op_cannot_edit_options: "在创建话题%{minutes}分钟后，你不可以增加、删除投票选项。如果你需要修改投票选项，请联系管理员。" + staff_cannot_add_or_remove_options: "在创建话题%{minutes}分钟后，你不能增加或者删除投票选项。你可以选择删除该话题然后重新创建一个。" no_polls_associated_with_this_post: "这个帖子中没有投票。" no_poll_with_this_name: "投票“%{name}”没有被关联到帖子。" post_is_deleted: "帖子已经删除，无法操作。" diff --git a/public/500.zh_TW.html b/public/500.zh_TW.html index b6a322963a..b42094bb25 100644 --- a/public/500.zh_TW.html +++ b/public/500.zh_TW.html @@ -7,6 +7,6 @@

    Oops

    討論區軟件端出現未知的錯誤，謹此致歉。

    已記錄詳細的錯誤報告，我們將會檢查自動產生的通知。

    -

    No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.

    +

    無須採取行動。但是，如果問題持續地發生，你可以將錯誤資料，包括出現錯誤的步驟，張貼在討論區 meta 分版內。

    From f885e5b5e65d0f1443f746f02d7a5ad2ebfcd687 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 24 Nov 2016 15:05:33 -0500 Subject: [PATCH 226/266] fix success response handling of sending digest preview email --- .../admin/controllers/admin-email-preview-digest.js.es6 | 1 + app/controllers/admin/email_controller.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 index b46fc4c280..fa2950dd9a 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 @@ -12,6 +12,7 @@ export default Ember.Controller.extend({ const model = this.get('model'); this.set('loading', true); + this.set('sentEmail', false); EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => { model.setProperties(email.getProperties('html_content', 'text_content')); this.set('loading', false); diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 06dfe3ad55..2d7798e6c2 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -60,7 +60,7 @@ class Admin::EmailController < Admin::AdminController message.to = params[:email] begin Email::Sender.new(message, :digest).send - render nothing: true + render json: success_json rescue => e render json: {errors: [e.message]}, status: 422 end From 6c38053c32d794cd0070d50e582f1d2d38eeefc7 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 24 Nov 2016 15:38:22 -0500 Subject: [PATCH 227/266] preview digest renders nicely in an iframe --- .../admin-email-preview-digest.js.es6 | 5 ++++ .../admin/templates/email-preview-digest.hbs | 23 +++++++++++++------ .../stylesheets/common/admin/admin_base.scss | 15 ++++++++++++ config/locales/client.en.yml | 1 + 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 index fa2950dd9a..5da4b0afb5 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 @@ -6,6 +6,11 @@ export default Ember.Controller.extend({ emailEmpty: Em.computed.empty('email'), sendEmailDisabled: Em.computed.or('emailEmpty', 'sendingEmail'), showSendEmailForm: Em.computed.notEmpty('model.html_content'), + htmlEmpty: Em.computed.empty('model.html_content'), + + iframeSrc: function() { + return ('data:text/html;charset=utf-8,' + encodeURI(this.get('model.html_content'))); + }.property('model.html_content'), actions: { refresh() { diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs index f64245c154..80f48717b0 100644 --- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs +++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs @@ -20,13 +20,14 @@ {{#conditional-loading-spinner condition=loading}} +