diff --git a/app/assets/javascripts/plugins/discourse-akismet.js.erb b/app/assets/javascripts/plugins/discourse-akismet.js.erb deleted file mode 100644 index ff64b5c60c..0000000000 --- a/app/assets/javascripts/plugins/discourse-akismet.js.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-akismet/assets/javascripts/discourse') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-akismet/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-akismet/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-akismet/assets/javascripts/discourse/templates/components/reviewable-akismet-post.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-akismet/assets/javascripts/discourse/templates/components/reviewable-akismet-user.hbs') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-assign.js.erb b/app/assets/javascripts/plugins/discourse-assign.js.erb deleted file mode 100644 index 1c7e13a79f..0000000000 --- a/app/assets/javascripts/plugins/discourse-assign.js.erb +++ /dev/null @@ -1,52 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-messages-nav') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-preferences-notifications') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-activity-bottom') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/assigned-messages-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/controllers/assign-user.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/assigns-activity-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/routes/user-private-messages-assigned.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/routes/user-activity-assigned.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/assign-actions-dropdown.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/claim-topic.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-topic-list-item.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/remind-assigns-frequency.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-topic-list.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/flagged-topic-listener.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/components/basic-assigned-topic-list.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/user-assigned-topics.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/claim-topic.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/assigned-to.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/mobile') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/mobile/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/user-activity-assigned.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/modal') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/templates/modal/assign-user.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/services') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/services/task-actions.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/widgets') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-assign/assets/javascripts/discourse/widgets/quick-access-assignments.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-bbcode.js.erb b/app/assets/javascripts/plugins/discourse-bbcode.js.erb deleted file mode 100644 index 90ebd4e60f..0000000000 --- a/app/assets/javascripts/plugins/discourse-bbcode.js.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-bbcode/assets/javascripts/lib') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-bbcode/assets/javascripts/lib/discourse-markdown') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-bbcode/assets/javascripts/lib/discourse-markdown/bbcode.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-chat-integration.js.erb b/app/assets/javascripts/plugins/discourse-chat-integration.js.erb deleted file mode 100644 index 18154533ae..0000000000 --- a/app/assets/javascripts/plugins/discourse-chat-integration.js.erb +++ /dev/null @@ -1,45 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/models') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/models/rule.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/models/provider.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/models/channel.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/adapters') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/adapters/rule.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/adapters/provider.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/adapters/channel.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/components/channel-data.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/components/channel-details.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/components/rule-row.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates/modal') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-channel.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates/modal/admin-plugins-chat-channel-error.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/admin-plugins-chat.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/modals') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/routes/admin-plugins-chat-index.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/routes/admin-plugins-chat.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/routes/admin-plugins-chat-provider.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/admin/chat-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/public-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/admin') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/admin/plugins-chat.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/components/channel-details.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/components/channel-data.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/templates/components/rule-row.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-chat-integration/assets/javascripts/discourse/routes/transcript.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-code-review.js.erb b/app/assets/javascripts/plugins/discourse-code-review.js.erb deleted file mode 100644 index 7c56dd8ebc..0000000000 --- a/app/assets/javascripts/plugins/discourse-code-review.js.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/code-review-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates/connectors') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates/connectors/user-activity-bottom') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates/connectors/user-activity-bottom/commit-activity-link.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates/admin') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/templates/admin/plugins-code-review.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/controllers/admin-plugins-code-review.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/routes/user-activity-approval-given.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/routes/admin-plugins-code-review.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/routes/user-activity-approval-pending.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/activity-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/widgets') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/widgets/code-review-commit-approved-notification-item.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-code-review/assets/javascripts/discourse/initializers/init-code-review.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-data-explorer.js.erb b/app/assets/javascripts/plugins/discourse-data-explorer.js.erb deleted file mode 100644 index 3ec317c636..0000000000 --- a/app/assets/javascripts/plugins/discourse-data-explorer.js.erb +++ /dev/null @@ -1,70 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/admin') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/admin/adapters') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/admin/adapters/query.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/explorer-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/models') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/models/query.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/hljs-code-view.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema-enuminfo.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/json-file-uploader.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/group-reports-nav-item.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-container.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-row-content.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/lib') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/lib/binary-search.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/group-reports-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/connectors') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/connectors/group-reports-nav-item') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/connectors/group-reports-nav-item/nav-item.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group-reports-show.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group-reports-index.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/int.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/string.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/generic.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/boolean.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer-query-result.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/html.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/group.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/text.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/badge.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/user.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/url.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/topic.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/category.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/post.raw.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/explorer/reltime.raw.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components/group-reports-nav-item.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components/explorer-schema.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components/json-file-uploader.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/components/explorer-schema-enuminfo.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/modal') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/modal/import-query.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/import-query.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/group-reports-index.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/group-reports-show.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins-explorer.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/group-reports-index.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/group-reports-show.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-data-explorer/assets/javascripts/discourse/initializers/initialize-data-explorer.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-details.js.erb b/app/assets/javascripts/plugins/discourse-details.js.erb deleted file mode 100644 index 1912abec56..0000000000 --- a/app/assets/javascripts/plugins/discourse-details.js.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% -require_asset('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/details.js') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/lib') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/lib/discourse-markdown') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-local-dates.js.erb b/app/assets/javascripts/plugins/discourse-local-dates.js.erb deleted file mode 100644 index c869041c72..0000000000 --- a/app/assets/javascripts/plugins/discourse-local-dates.js.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/lib') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-narrative-bot.js.erb b/app/assets/javascripts/plugins/discourse-narrative-bot.js.erb deleted file mode 100644 index 35e5586ec5..0000000000 --- a/app/assets/javascripts/plugins/discourse-narrative-bot.js.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-narrative-bot/assets/javascripts/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-presence.js.erb b/app/assets/javascripts/plugins/discourse-presence.js.erb deleted file mode 100644 index 888ad4c452..0000000000 --- a/app/assets/javascripts/plugins/discourse-presence.js.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/components') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/discourse-zendesk-plugin.js.erb b/app/assets/javascripts/plugins/discourse-zendesk-plugin.js.erb deleted file mode 100644 index a1f35bbc92..0000000000 --- a/app/assets/javascripts/plugins/discourse-zendesk-plugin.js.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/zendesk-plugin-route-map.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/templates/admin') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/templates/admin/plugins-zendesk-plugin.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/controllers/admin-plugins-zendesk-plugin.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/routes') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse/routes/admin-plugins-zendesk-plugin.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors') -depend_on('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.hbs') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/lazy-yt.js.erb b/app/assets/javascripts/plugins/lazy-yt.js.erb deleted file mode 100644 index 045deb7bc6..0000000000 --- a/app/assets/javascripts/plugins/lazy-yt.js.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% -require_asset('/Users/romeer/projects/discourse/plugins/lazy-yt/assets/javascripts/lazyYT.js') -depend_on('/Users/romeer/projects/discourse/plugins/lazy-yt/assets/javascripts/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/lazy-yt/assets/javascripts/initializers/lazyYT.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/my_plugin.js.erb b/app/assets/javascripts/plugins/my_plugin.js.erb deleted file mode 100644 index 4408c2a584..0000000000 --- a/app/assets/javascripts/plugins/my_plugin.js.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% -require_asset('/Users/romeer/projects/discourse/spec/fixtures/plugins/my_plugin/assets/code.js') -require_asset('/Users/romeer/projects/discourse/spec/fixtures/plugins/my_plugin/auto_generated/plugin_3a4bd4f26d67d7227c7b18559a4b30332f86ce3a.js') -%> \ No newline at end of file diff --git a/app/assets/javascripts/plugins/poll.js.erb b/app/assets/javascripts/plugins/poll.js.erb deleted file mode 100644 index 1c5892f386..0000000000 --- a/app/assets/javascripts/plugins/poll.js.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/discourse') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/discourse/templates') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/discourse/templates/modal') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/lib') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/lib/discourse-markdown') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/lib/even-round.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/controllers') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/widgets') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6') -depend_on('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/initializers') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6') -require_asset('/Users/romeer/projects/discourse/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6') -%> \ No newline at end of file diff --git a/app/assets/javascripts/preload-application-data.js.no-module.es6 b/app/assets/javascripts/preload-application-data.js.no-module.es6 index 3fcb1e1052..af38129b7d 100644 --- a/app/assets/javascripts/preload-application-data.js.no-module.es6 +++ b/app/assets/javascripts/preload-application-data.js.no-module.es6 @@ -20,9 +20,6 @@ window.Logster = window.Logster || {}; window.Logster.enabled = setupData.enableJsErrorReporting === "true"; - window.Logster = window.Logster || {}; - window.Logster.enabled = setupData.enableJsErrorReporting === "true"; - Discourse.CDN = setupData.cdn; Discourse.BaseUrl = setupData.baseUrl; Discourse.BaseUri = setupData.baseUri; diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 8b1aa031bf..8ecc2938e0 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -9,8 +9,8 @@ ja: js: number: format: - separator: "。" - delimiter: "、" + separator: "." + delimiter: "," human: storage_units: format: "%n %u" @@ -791,7 +791,6 @@ ja: title: "バックアップコードが作られました" second_factor: title: "2段階認証" - enable: "2段階認証を有効にする" confirm_password_description: "続行するにはパスワードを入力してください" name: "名前" label: "コード" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index cc4ce7a9dd..00e24df01c 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2681,16 +2681,6 @@ en: The community flagged this post and now it is hidden. **Because this post has been hidden more than once, your post will now remain hidden until it is handled by a staff member.** For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines). - - flags_disagreed: - title: "Flagged post restored by staff" - subject_template: "Flagged post restored by staff" - text_body_template: | - Hello, - - This is an automated message from %{site_name} to let you know that [your post](%{base_url}%{url}) was restored. - - This post was flagged by the community and a staff member opted to restore it. flags_disagreed: title: "Flagged post restored by staff" diff --git a/public/plugins/discourse-internet-explorer/.gitkeep b/public/plugins/discourse-internet-explorer/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb index 0ec2a6956e..6e796ea36f 100644 --- a/spec/lib/upload_creator_spec.rb +++ b/spec/lib/upload_creator_spec.rb @@ -426,26 +426,4 @@ RSpec.describe UploadCreator do s3_helper.stubs(:s3_client).returns(client) Discourse.stubs(:store).returns(store) end - - describe '#whitelist_svg!' do - let(:file) do - file = Tempfile.new - file.write(<<~XML) - - - - XML - file.rewind - file - end - - it 'removes event handlers' do - begin - UploadCreator.new(file, 'file.svg').whitelist_svg! - expect(file.read).not_to include('onload') - ensure - file.unlink - end - end - end end diff --git a/spec/requests/associate_accounts_spec.rb b/spec/requests/associate_accounts_spec.rb deleted file mode 100644 index 41b199c838..0000000000 --- a/spec/requests/associate_accounts_spec.rb +++ /dev/null @@ -1,89 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Users::AssociateAccountsController do - fab!(:user) { Fabricate(:user) } - fab!(:user2) { Fabricate(:user) } - - before do - OmniAuth.config.test_mode = true - end - - after do - Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil - OmniAuth.config.test_mode = false - end - - context 'when attempting reconnect' do - before do - SiteSetting.enable_google_oauth2_logins = true - OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new( - provider: 'google_oauth2', - uid: '12345', - info: { - email: 'someemail@test.com', - }, - extra: { - raw_info: { - email_verified: true, - } - }, - ) - - Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] - end - - it 'should work correctly' do - sign_in(user) - - # Reconnect flow: - get "/auth/google_oauth2?reconnect=true" - expect(response.status).to eq(302) - expect(session[:auth_reconnect]).to eq(true) - - OmniAuth.config.mock_auth[:google_oauth2].uid = "123456" - get "/auth/google_oauth2/callback.json" - expect(response.status).to eq(302) - - expect(session[:current_user_id]).to eq(user.id) # Still logged in - expect(UserAssociatedAccount.count).to eq(0) # Reconnect has not yet happened - - # Request associate info - uri = URI.parse(response.redirect_url) - get "#{uri.path}.json" - data = JSON.parse(response.body) - expect(data["provider_name"]).to eq("google_oauth2") - expect(data["account_description"]).to eq("someemail@test.com") - - # Request as different user, should not work - sign_in(user2) - get "#{uri.path}.json" - expect(response.status).to eq(404) - - # Back to first user - sign_in(user) - get "#{uri.path}.json" - data = JSON.parse(response.body) - expect(data["provider_name"]).to eq("google_oauth2") - - # Make the connection - post "#{uri.path}.json" - expect(response.status).to eq(200) - expect(UserAssociatedAccount.count).to eq(1) - - # Token cannot be reused - get "#{uri.path}.json" - expect(response.status).to eq(404) - end - - it "returns the correct response for non-existant tokens" do - get "/associate/12345678901234567890123456789012.json" - expect(response.status).to eq(404) - - get "/associate/shorttoken.json" - expect(response.status).to eq(404) - end - - end -end diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js.es6 index c602667fa6..cefd82772e 100644 --- a/test/javascripts/acceptance/admin-watched-words-test.js.es6 +++ b/test/javascripts/acceptance/admin-watched-words-test.js.es6 @@ -32,12 +32,6 @@ QUnit.test("list words in groups", async assert => { "Always show the words when checkbox is checked." ); - assert.equal( - $(find(".watched-words-list .watched-word")[2]).text(), - ' ', - "it should escape watched words" - ); - await click(".nav-stacked .censor a"); assert.ok(exists(".watched-words-list"));