From e214aae719c10953c4c3a7949c9bd02d6983b045 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Mar 2016 22:35:57 +0500 Subject: PLT-963 - Improving scss structure --- config/config.json | 33 +- model/version.go | 2 +- templates/error.html | 2 +- .../components/admin_console/admin_controller.jsx | 7 +- web/react/components/admin_console/team_users.jsx | 2 +- web/react/components/admin_console/user_item.jsx | 8 +- web/react/components/authorize.jsx | 2 +- web/react/components/center_panel.jsx | 2 +- web/react/components/file_attachment.jsx | 6 +- web/react/components/file_preview.jsx | 16 +- web/react/components/filtered_user_list.jsx | 6 +- web/react/components/get_link_modal.jsx | 2 +- web/react/components/more_channels.jsx | 31 +- web/react/components/navbar.jsx | 8 +- web/react/components/not_logged_in.jsx | 4 +- web/react/components/popover_list_members.jsx | 12 +- web/react/components/search_bar.jsx | 2 +- web/react/components/search_results_item.jsx | 2 +- web/react/components/sidebar_right.jsx | 14 +- .../components/suggestion/at_mention_provider.jsx | 12 +- .../components/suggestion/command_provider.jsx | 2 +- .../components/suggestion/suggestion_list.jsx | 2 +- web/react/components/user_list.jsx | 22 +- web/react/components/user_list_row.jsx | 46 +- web/react/utils/emoticons.jsx | 2 +- web/react/utils/text_formatting.jsx | 4 +- web/react/utils/utils.jsx | 30 +- web/sass-files/sass/base/_module.scss | 3 + web/sass-files/sass/base/_structure.scss | 57 + web/sass-files/sass/base/_typography.scss | 27 + web/sass-files/sass/components/_alerts.scss | 13 + web/sass-files/sass/components/_buttons.scss | 23 + web/sass-files/sass/components/_dropdown.scss | 16 + web/sass-files/sass/components/_emoticons.scss | 27 + web/sass-files/sass/components/_error-bar.scss | 30 + web/sass-files/sass/components/_files.scss | 293 ++++ web/sass-files/sass/components/_inputs.scss | 26 + web/sass-files/sass/components/_links.scss | 23 + web/sass-files/sass/components/_mentions.scss | 56 + web/sass-files/sass/components/_modal.scss | 508 ++++++ web/sass-files/sass/components/_module.scss | 19 + web/sass-files/sass/components/_oauth.scss | 38 + web/sass-files/sass/components/_popover.scss | 184 ++ web/sass-files/sass/components/_scrollbar.scss | 28 + web/sass-files/sass/components/_search.scss | 175 ++ .../sass/components/_suggestion-list.scss | 41 + web/sass-files/sass/components/_tooltip.scss | 10 + web/sass-files/sass/components/_tutorial.scss | 208 +++ web/sass-files/sass/components/_videos.scss | 66 + web/sass-files/sass/layout/_content.scss | 85 + web/sass-files/sass/layout/_footer.scss | 30 + web/sass-files/sass/layout/_forms.scss | 66 + web/sass-files/sass/layout/_headers.scss | 370 ++++ web/sass-files/sass/layout/_markdown.scss | 116 ++ web/sass-files/sass/layout/_module.scss | 13 + web/sass-files/sass/layout/_navigation.scss | 137 ++ web/sass-files/sass/layout/_post-right.scss | 155 ++ web/sass-files/sass/layout/_post.scss | 997 +++++++++++ web/sass-files/sass/layout/_sidebar-left.scss | 197 +++ web/sass-files/sass/layout/_sidebar-menu.scss | 72 + web/sass-files/sass/layout/_sidebar-right.scss | 129 ++ web/sass-files/sass/layout/_webhooks.scss | 37 + web/sass-files/sass/pages/_access-history.scss | 32 + web/sass-files/sass/pages/_activity-log.scss | 64 + web/sass-files/sass/pages/_admin-console.scss | 343 ++++ web/sass-files/sass/pages/_docs.scss | 19 + web/sass-files/sass/pages/_error-page.scss | 35 + web/sass-files/sass/pages/_loading.scss | 48 + web/sass-files/sass/pages/_module.scss | 11 + web/sass-files/sass/pages/_print.scss | Bin 0 -> 4392 bytes web/sass-files/sass/pages/_settings.scss | 451 +++++ web/sass-files/sass/pages/_signup.scss | 440 +++++ web/sass-files/sass/pages/_statistics.scss | 85 + web/sass-files/sass/partials/_access-history.scss | 27 - web/sass-files/sass/partials/_activity-log.scss | 53 - web/sass-files/sass/partials/_admin-console.scss | 261 --- web/sass-files/sass/partials/_base.scss | 256 --- web/sass-files/sass/partials/_colorpicker.scss | 253 --- web/sass-files/sass/partials/_content.scss | 82 - web/sass-files/sass/partials/_docs.scss | 19 - web/sass-files/sass/partials/_error-bar.scss | 28 - web/sass-files/sass/partials/_error.scss | 31 - web/sass-files/sass/partials/_files.scss | 264 --- web/sass-files/sass/partials/_font-awesome.scss | 1803 -------------------- web/sass-files/sass/partials/_footer.scss | 25 - web/sass-files/sass/partials/_forms.scss | 51 - web/sass-files/sass/partials/_get-link.scss | 8 - web/sass-files/sass/partials/_headers.scss | 320 ---- web/sass-files/sass/partials/_loading.scss | 42 - web/sass-files/sass/partials/_markdown.scss | 106 -- web/sass-files/sass/partials/_mentions.scss | 61 - web/sass-files/sass/partials/_modal.scss | 489 ------ web/sass-files/sass/partials/_navbar.scss | 112 -- web/sass-files/sass/partials/_oauth.scss | 33 - .../sass/partials/_perfect-scrollbar.scss | 122 -- web/sass-files/sass/partials/_popover.scss | 158 -- web/sass-files/sass/partials/_post.scss | 1013 ----------- web/sass-files/sass/partials/_post_right.scss | 159 -- web/sass-files/sass/partials/_print.scss | Bin 3604 -> 0 bytes web/sass-files/sass/partials/_responsive.scss | 894 ---------- web/sass-files/sass/partials/_search.scss | 160 -- web/sass-files/sass/partials/_settings.scss | 455 ----- web/sass-files/sass/partials/_sidebar--left.scss | 193 --- web/sass-files/sass/partials/_sidebar--menu.scss | 71 - web/sass-files/sass/partials/_sidebar--right.scss | 124 -- web/sass-files/sass/partials/_signup.scss | 390 ----- web/sass-files/sass/partials/_statistics.scss | 87 - web/sass-files/sass/partials/_suggestion_list.scss | 67 - web/sass-files/sass/partials/_tooltips.scss | 7 - web/sass-files/sass/partials/_tutorial.scss | 212 --- web/sass-files/sass/partials/_variables.scss | 16 - web/sass-files/sass/partials/_videos.scss | 66 - web/sass-files/sass/partials/_webhooks.scss | 33 - web/sass-files/sass/partials/_welcome.scss | 15 - web/sass-files/sass/responsive/_desktop.scss | 65 + web/sass-files/sass/responsive/_mobile.scss | 901 ++++++++++ web/sass-files/sass/responsive/_module.scss | 4 + web/sass-files/sass/responsive/_tablet.scss | 35 + web/sass-files/sass/styles.scss | 57 +- web/sass-files/sass/utils/_animations.scss | 19 + web/sass-files/sass/utils/_functions.scss | 9 + web/sass-files/sass/utils/_mixins.scss | 8 + web/sass-files/sass/utils/_module.scss | 5 + web/sass-files/sass/utils/_variables.scss | 13 + web/sass-files/sass/vendors/_colorpicker.scss | 253 +++ web/sass-files/sass/vendors/_font-awesome.scss | 1803 ++++++++++++++++++++ web/sass-files/sass/vendors/_module.scss | 4 + .../sass/vendors/_perfect-scrollbar.scss | 141 ++ 128 files changed, 9221 insertions(+), 8746 deletions(-) create mode 100644 web/sass-files/sass/base/_module.scss create mode 100644 web/sass-files/sass/base/_structure.scss create mode 100644 web/sass-files/sass/base/_typography.scss create mode 100644 web/sass-files/sass/components/_alerts.scss create mode 100644 web/sass-files/sass/components/_buttons.scss create mode 100644 web/sass-files/sass/components/_dropdown.scss create mode 100644 web/sass-files/sass/components/_emoticons.scss create mode 100644 web/sass-files/sass/components/_error-bar.scss create mode 100644 web/sass-files/sass/components/_files.scss create mode 100644 web/sass-files/sass/components/_inputs.scss create mode 100644 web/sass-files/sass/components/_links.scss create mode 100644 web/sass-files/sass/components/_mentions.scss create mode 100644 web/sass-files/sass/components/_modal.scss create mode 100644 web/sass-files/sass/components/_module.scss create mode 100644 web/sass-files/sass/components/_oauth.scss create mode 100644 web/sass-files/sass/components/_popover.scss create mode 100644 web/sass-files/sass/components/_scrollbar.scss create mode 100644 web/sass-files/sass/components/_search.scss create mode 100644 web/sass-files/sass/components/_suggestion-list.scss create mode 100644 web/sass-files/sass/components/_tooltip.scss create mode 100644 web/sass-files/sass/components/_tutorial.scss create mode 100644 web/sass-files/sass/components/_videos.scss create mode 100644 web/sass-files/sass/layout/_content.scss create mode 100644 web/sass-files/sass/layout/_footer.scss create mode 100644 web/sass-files/sass/layout/_forms.scss create mode 100644 web/sass-files/sass/layout/_headers.scss create mode 100644 web/sass-files/sass/layout/_markdown.scss create mode 100644 web/sass-files/sass/layout/_module.scss create mode 100644 web/sass-files/sass/layout/_navigation.scss create mode 100644 web/sass-files/sass/layout/_post-right.scss create mode 100644 web/sass-files/sass/layout/_post.scss create mode 100644 web/sass-files/sass/layout/_sidebar-left.scss create mode 100644 web/sass-files/sass/layout/_sidebar-menu.scss create mode 100644 web/sass-files/sass/layout/_sidebar-right.scss create mode 100644 web/sass-files/sass/layout/_webhooks.scss create mode 100644 web/sass-files/sass/pages/_access-history.scss create mode 100644 web/sass-files/sass/pages/_activity-log.scss create mode 100644 web/sass-files/sass/pages/_admin-console.scss create mode 100644 web/sass-files/sass/pages/_docs.scss create mode 100644 web/sass-files/sass/pages/_error-page.scss create mode 100644 web/sass-files/sass/pages/_loading.scss create mode 100644 web/sass-files/sass/pages/_module.scss create mode 100644 web/sass-files/sass/pages/_print.scss create mode 100644 web/sass-files/sass/pages/_settings.scss create mode 100644 web/sass-files/sass/pages/_signup.scss create mode 100644 web/sass-files/sass/pages/_statistics.scss delete mode 100644 web/sass-files/sass/partials/_access-history.scss delete mode 100644 web/sass-files/sass/partials/_activity-log.scss delete mode 100644 web/sass-files/sass/partials/_admin-console.scss delete mode 100644 web/sass-files/sass/partials/_base.scss delete mode 100644 web/sass-files/sass/partials/_colorpicker.scss delete mode 100644 web/sass-files/sass/partials/_content.scss delete mode 100644 web/sass-files/sass/partials/_docs.scss delete mode 100644 web/sass-files/sass/partials/_error-bar.scss delete mode 100644 web/sass-files/sass/partials/_error.scss delete mode 100644 web/sass-files/sass/partials/_files.scss delete mode 100644 web/sass-files/sass/partials/_font-awesome.scss delete mode 100644 web/sass-files/sass/partials/_footer.scss delete mode 100644 web/sass-files/sass/partials/_forms.scss delete mode 100644 web/sass-files/sass/partials/_get-link.scss delete mode 100644 web/sass-files/sass/partials/_headers.scss delete mode 100644 web/sass-files/sass/partials/_loading.scss delete mode 100644 web/sass-files/sass/partials/_markdown.scss delete mode 100644 web/sass-files/sass/partials/_mentions.scss delete mode 100644 web/sass-files/sass/partials/_modal.scss delete mode 100644 web/sass-files/sass/partials/_navbar.scss delete mode 100644 web/sass-files/sass/partials/_oauth.scss delete mode 100755 web/sass-files/sass/partials/_perfect-scrollbar.scss delete mode 100644 web/sass-files/sass/partials/_popover.scss delete mode 100644 web/sass-files/sass/partials/_post.scss delete mode 100644 web/sass-files/sass/partials/_post_right.scss delete mode 100644 web/sass-files/sass/partials/_print.scss delete mode 100644 web/sass-files/sass/partials/_responsive.scss delete mode 100644 web/sass-files/sass/partials/_search.scss delete mode 100644 web/sass-files/sass/partials/_settings.scss delete mode 100644 web/sass-files/sass/partials/_sidebar--left.scss delete mode 100644 web/sass-files/sass/partials/_sidebar--menu.scss delete mode 100644 web/sass-files/sass/partials/_sidebar--right.scss delete mode 100644 web/sass-files/sass/partials/_signup.scss delete mode 100644 web/sass-files/sass/partials/_statistics.scss delete mode 100644 web/sass-files/sass/partials/_suggestion_list.scss delete mode 100644 web/sass-files/sass/partials/_tooltips.scss delete mode 100644 web/sass-files/sass/partials/_tutorial.scss delete mode 100644 web/sass-files/sass/partials/_variables.scss delete mode 100644 web/sass-files/sass/partials/_videos.scss delete mode 100644 web/sass-files/sass/partials/_webhooks.scss delete mode 100644 web/sass-files/sass/partials/_welcome.scss create mode 100644 web/sass-files/sass/responsive/_desktop.scss create mode 100644 web/sass-files/sass/responsive/_mobile.scss create mode 100644 web/sass-files/sass/responsive/_module.scss create mode 100644 web/sass-files/sass/responsive/_tablet.scss create mode 100644 web/sass-files/sass/utils/_animations.scss create mode 100644 web/sass-files/sass/utils/_functions.scss create mode 100644 web/sass-files/sass/utils/_mixins.scss create mode 100644 web/sass-files/sass/utils/_module.scss create mode 100644 web/sass-files/sass/utils/_variables.scss create mode 100644 web/sass-files/sass/vendors/_colorpicker.scss create mode 100644 web/sass-files/sass/vendors/_font-awesome.scss create mode 100644 web/sass-files/sass/vendors/_module.scss create mode 100755 web/sass-files/sass/vendors/_perfect-scrollbar.scss diff --git a/config/config.json b/config/config.json index b211b16d3..7e8b42708 100644 --- a/config/config.json +++ b/config/config.json @@ -11,7 +11,7 @@ "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableTesting": false, + "EnableTesting": true, "EnableDeveloper": false, "EnableSecurityFixAlert": true, "EnableInsecureOutgoingConnections": false, @@ -19,7 +19,9 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -72,7 +74,7 @@ "EnableSignUpWithEmail": true, "EnableSignInWithEmail": true, "EnableSignInWithUsername": false, - "SendEmailNotifications": false, + "SendEmailNotifications": true, "RequireEmailVerification": false, "FeedbackName": "", "FeedbackEmail": "", @@ -113,5 +115,28 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" + }, + "GoogleSettings": { + "Enable": false, + "Secret": "", + "Id": "", + "Scope": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + }, + "LdapSettings": { + "Enable": false, + "LdapServer": null, + "LdapPort": 389, + "BaseDN": null, + "BindUsername": null, + "BindPassword": null, + "FirstNameAttribute": null, + "LastNameAttribute": null, + "EmailAttribute": null, + "UsernameAttribute": null, + "IdAttribute": null, + "QueryTimeout": 60 } -} +} \ No newline at end of file diff --git a/model/version.go b/model/version.go index 6011a9245..46f34b81e 100644 --- a/model/version.go +++ b/model/version.go @@ -31,7 +31,7 @@ var CurrentVersion string = versions[0] var BuildNumber = "_BUILD_NUMBER_" var BuildDate = "_BUILD_DATE_" var BuildHash = "_BUILD_HASH_" -var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_" +var BuildEnterpriseReady = "false" var versionsWithoutHotFixes []string func init() { diff --git a/templates/error.html b/templates/error.html index b86039ca3..5aa48098f 100644 --- a/templates/error.html +++ b/templates/error.html @@ -2,7 +2,7 @@ {{template "head" . }} - +
diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 4c4f21f08..6dca391d0 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -172,7 +172,10 @@ export default class AdminController extends React.Component { } return ( -
+