Permalink
Browse files

Merge tag 'v6.1.2' into stable/6

  • Loading branch information...
2 parents f1c0fea + c604303 commit 7975e3b41e8c0f7a569bf330a8e265453dd4488a @machisuji machisuji committed Dec 21, 2016
Showing with 1,522 additions and 420 deletions.
  1. +21 −21 Gemfile.lock
  2. BIN app/assets/fonts/lato/Lato-Bold.eot
  3. BIN app/assets/fonts/lato/Lato-Bold.ttf
  4. BIN app/assets/fonts/lato/Lato-Bold.woff
  5. BIN app/assets/fonts/lato/Lato-Bold.woff2
  6. BIN app/assets/fonts/lato/Lato-BoldItalic.eot
  7. BIN app/assets/fonts/lato/Lato-BoldItalic.ttf
  8. BIN app/assets/fonts/lato/Lato-BoldItalic.woff
  9. BIN app/assets/fonts/lato/Lato-BoldItalic.woff2
  10. BIN app/assets/fonts/lato/Lato-Italic.eot
  11. BIN app/assets/fonts/lato/Lato-Italic.ttf
  12. BIN app/assets/fonts/lato/Lato-Italic.woff
  13. BIN app/assets/fonts/lato/Lato-Italic.woff2
  14. BIN app/assets/fonts/lato/Lato-Light.eot
  15. BIN app/assets/fonts/lato/Lato-Light.ttf
  16. BIN app/assets/fonts/lato/Lato-Light.woff
  17. BIN app/assets/fonts/lato/Lato-Light.woff2
  18. BIN app/assets/fonts/lato/Lato-LightItalic.eot
  19. BIN app/assets/fonts/lato/Lato-LightItalic.ttf
  20. BIN app/assets/fonts/lato/Lato-LightItalic.woff
  21. BIN app/assets/fonts/lato/Lato-LightItalic.woff2
  22. BIN app/assets/fonts/lato/Lato-Regular.eot
  23. BIN app/assets/fonts/lato/Lato-Regular.ttf
  24. BIN app/assets/fonts/lato/Lato-Regular.woff
  25. BIN app/assets/fonts/lato/Lato-Regular.woff2
  26. +94 −94 app/assets/fonts/lato/OFL.txt
  27. +11 −5 app/assets/javascripts/settings.js.erb
  28. +4 −0 app/assets/stylesheets/content/_accounts.sass
  29. +2 −0 app/assets/stylesheets/content/_attributes_key_value.sass
  30. +1 −1 app/assets/stylesheets/content/_table.sass
  31. +6 −0 app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass
  32. +1 −1 app/assets/stylesheets/fonts/_lato.sass
  33. +16 −0 app/cells/settings/text_setting_cell.rb
  34. +38 −0 app/cells/views/settings/text_setting/show.erb
  35. +12 −1 app/contracts/users/base_contract.rb
  36. +9 −5 app/contracts/users/create_contract.rb
  37. +4 −0 app/controllers/account_controller.rb
  38. +1 −1 app/controllers/api/experimental/concerns/query_loading.rb
  39. +37 −0 app/helpers/accounts_helper.rb
  40. +21 −15 app/helpers/queries_helper.rb
  41. +4 −1 app/helpers/settings_helper.rb
  42. +5 −0 app/models/auth_source.rb
  43. +1 −1 app/models/category.rb
  44. +2 −2 app/models/custom_field.rb
  45. +1 −1 app/models/custom_value/version_strategy.rb
  46. +4 −2 app/models/ldap_auth_source.rb
  47. +46 −0 app/models/mixins/unique_finder.rb
  48. +1 −0 app/models/queries/users.rb
  49. +38 −0 app/models/queries/users/filters/login_filter.rb
  50. +13 −0 app/models/queries/users/filters/status_filter.rb
  51. +6 −1 app/models/user.rb
  52. +3 −0 app/views/account/_footer.html.erb
  53. +1 −1 app/views/account/_login.html.erb
  54. +14 −6 app/views/account/register.html.erb
  55. +4 −4 app/views/homescreen/blocks/_users.html.erb
  56. +1 −1 app/views/homescreen/index.html.erb
  57. +1 −0 app/views/ldap_auth_sources/_form.html.erb
  58. +1 −1 app/views/onboarding/_menu_item.html.erb
  59. +1 −2 app/views/onboarding/_starting_video_modal.html.erb
  60. +11 −0 app/views/settings/_authentication.html.erb
  61. +2 −21 app/views/settings/_notifications.html.erb
  62. +0 −1 app/workers/deliver_work_package_notification_job.rb
  63. +0 −5 config/application.rb
  64. +8 −0 config/locales/en.yml
  65. +6 −0 config/settings.yml
  66. +5 −0 db/migrate/201612131919190_remove_category_name_restriction.rb
  67. +34 −0 db/migrate/20161219134700_add_attr_admin_to_ldap.rb
  68. +35 −23 doc/apiv3/endpoints/users.apib
  69. +17 −1 doc/operation_guides/incoming_emails.md
  70. +1 −1 doc/operation_guides/system_requirements.md
  71. +36 −0 frontend/app/components/common/filters/html-escape.filter.ts
  72. +1 −1 frontend/app/components/common/interactive-table/interactive-table.directive.ts
  73. +16 −0 frontend/app/components/modals/modal-wrapper/modal-wrapper.directive.ts
  74. +1 −1 frontend/app/components/wp-display/field-types/wp-display-string-object-field.module.ts
  75. +1 −1 frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.html
  76. +1 −0 frontend/app/components/wp-relations/wp-relations-create/add-child.template.html
  77. +1 −0 frontend/app/components/wp-relations/wp-relations-create/add-fixed-type.template.html
  78. +1 −1 frontend/app/components/wp-relations/wp-relations-create/dynamic-relation-types.template.html
  79. +1 −0 frontend/app/components/wp-relations/wp-relations-create/empty-parents.template.html
  80. +1 −1 ...wp-relations/wp-relations-create/wp-relations-autocomplete/wp-relations-autocomplete.directive.ts
  81. +14 −7 frontend/app/components/wp-relations/wp-relations-create/wp-relations-create.directive.ts
  82. +11 −7 lib/api/utilities/property_name_converter.rb
  83. +54 −0 lib/api/v3/users/user_representer.rb
  84. +1 −1 lib/api/v3/users/users_api.rb
  85. +15 −7 lib/api/v3/utilities/custom_field_injector.rb
  86. +1 −7 lib/api/v3/work_packages/schema/specific_work_package_schema.rb
  87. +5 −6 lib/api/v3/work_packages/work_package_list_helpers.rb
  88. +8 −5 lib/api/v3/work_packages/work_package_representer.rb
  89. +1 −1 lib/open_project/configuration.rb
  90. +1 −1 lib/open_project/version.rb
  91. +12 −4 lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
  92. +1 −1 lib/redmine/menu_manager/top_menu/help_menu.rb
  93. +6 −3 lib/redmine/wiki_formatting/textile/helper.rb
  94. +51 −5 lib/tasks/ldap.rake
  95. +2 −2 spec/controllers/settings_controller_spec.rb
  96. +6 −2 spec/features/support/components/typeahead.rb
  97. +17 −0 spec/features/work_packages/tabs/watcher_tab_spec.rb
  98. +24 −4 spec/lib/api/utilities/property_name_converter_spec.rb
  99. +16 −7 spec/lib/api/v3/utilities/custom_field_injector_spec.rb
  100. +4 −28 spec/lib/api/v3/work_packages/schema/specific_work_package_schema_spec.rb
  101. +0 −6 spec/models/queries/users/filters/status_filter_spec.rb
  102. +1 −1 spec/models/queries/users/user_query_spec.rb
  103. +18 −9 spec/models/user_spec.rb
  104. +106 −17 spec/requests/api/v3/user/create_user_resource_spec.rb
  105. +90 −0 spec/requests/api/v3/user/filters_spec.rb
  106. +16 −0 spec/requests/api/v3/user/user_resource_spec.rb
  107. +65 −12 spec/views/account/register.html.erb_spec.rb
  108. +34 −0 vendored-plugins/openproject-auth_plugins/app/assets/stylesheets/auth_plugins/auth_plugins.css
  109. +7 −2 vendored-plugins/openproject-auth_plugins/app/views/hooks/login/_providers.html.erb
  110. +2 −0 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/engine.rb
  111. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  112. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  113. +19 −5 vendored-plugins/openproject-costs/app/models/work_package/abstract_costs.rb
  114. +8 −4 vendored-plugins/openproject-costs/app/models/work_package/labor_costs.rb
  115. +4 −0 vendored-plugins/openproject-costs/app/models/work_package/material_costs.rb
  116. +0 −1 vendored-plugins/openproject-costs/app/views/cost_types/edit.html.erb
  117. +12 −10 vendored-plugins/openproject-costs/app/views/costlog/edit.html.erb
  118. +107 −0 vendored-plugins/openproject-costs/frontend/app/components/budget/cost-unit-subform.directive.ts
  119. +34 −12 vendored-plugins/openproject-costs/lib/open_project/costs/engine.rb
  120. +2 −2 vendored-plugins/openproject-costs/lib/open_project/costs/patches/work_package_patch.rb
  121. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  122. +123 −0 vendored-plugins/openproject-costs/spec/models/work_package/cost_eager_loading_spec.rb
  123. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  124. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  125. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  126. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  127. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  128. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  129. BIN ...ored-plugins/openproject-openid_connect/app/assets/images/openid_connect/auth_provider-google.png
  130. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  131. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  132. +3 −0 vendored-plugins/openproject-reporting/app/assets/stylesheets/reporting/reporting.css.sass
  133. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  134. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  135. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  136. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  137. +1 −1 vendored-plugins/reporting_engine/lib/assets/stylesheets/reporting_engine/reporting.css.erb
  138. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -94,10 +94,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 12a7a422b4e4348c8bde1aee9650063dfa4c499f
+ revision: 6ebd49ba35c610cd6face3fbe14c9f3af9c6e0c0
branch: stable/6
specs:
- openproject-translations (6.1.1)
+ openproject-translations (6.1.2)
crowdin-api (~> 0.4.1)
mixlib-shellout (~> 2.1.0)
rails (~> 5.0.0)
@@ -132,67 +132,67 @@ GIT
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (6.1.1)
+ openproject-auth_plugins (6.1.2)
omniauth (~> 1.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (6.1.1)
+ openproject-backlogs (6.1.2)
acts_as_silent_list (~> 3.0.0)
- openproject-pdf_export (= 6.1.1)
+ openproject-pdf_export (= 6.1.2)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (6.1.1)
+ openproject-costs (6.1.2)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (6.1.1)
+ openproject-documents (6.1.2)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (6.1.1)
- openproject-webhooks (~> 6.1.1)
+ openproject-github_integration (6.1.2)
+ openproject-webhooks (~> 6.1.2)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (6.1.1)
+ openproject-global_roles (6.1.2)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (6.1.1)
+ openproject-local_avatars (6.1.2)
rails (~> 5.0)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (6.1.1)
+ openproject-meeting (6.1.2)
icalendar (~> 2.3.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (6.1.1)
+ openproject-my_project_page (6.1.2)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (6.1.1)
+ openproject-openid_connect (6.1.2)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 6.0)
@@ -201,42 +201,42 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (6.1.1)
+ openproject-pdf_export (6.1.2)
prawn (~> 2.1.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (6.1.1)
+ openproject-reporting (6.1.2)
jquery-tablesorter (~> 1.22.3)
- openproject-costs (= 6.1.1)
+ openproject-costs (= 6.1.2)
rails (~> 5.0.0)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (6.1.1)
+ openproject-themes-dark (6.1.2)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (6.1.1)
+ openproject-webhooks (6.1.2)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (6.1.1)
+ openproject-xls_export (6.1.2)
rails (~> 5.0.0)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (6.1.1)
+ reporting_engine (6.1.2)
json
rails (~> 5.0.0)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
188 app/assets/fonts/lato/OFL.txt 100644 → 100755
@@ -1,94 +1,94 @@
-Copyright (c) 2010-2014, Łukasz Dziedzic (dziedzic@typoland.com),
-with Reserved Font Name Lato.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com),
+with Reserved Font Name Lato.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -53,11 +53,17 @@ See doc/COPYRIGHT.rdoc for more details.
}
});
- /** Toggle current email decorator fields */
- var lang = jQuery("#emails_decorators_switch").val();
- $(".emails_decorators").hide();
- $("#emails_decorators_" + lang).show();
-
+ /* Javascript for Settings::TextSettingCell */
+ $(document).ready(function() {
+ $(".lang-select-switch").change(function() {
+ var self = $(this);
+ var id = self.attr("id");
+ var lang = self.val();
+
+ $("." + id).hide();
+ $("#" + id + "-" + lang).show();
+ });
+ });
/** Toggle notification settings fields */
$("#email_delivery_method_switch").on("change", function() {
@@ -124,3 +124,7 @@
#top-menu #nav-login-content .login-auth-providers.no-pwd
margin-top: 0
+
+.registration-footer
+ display: block
+ margin-top: 2em
@@ -40,6 +40,8 @@
padding: 0.375rem 0 !important
font-weight: bold
align-self: center
+ overflow: hidden
+ text-overflow: ellipsis
.attributes-key-value--value-container
@include grid-content(8)
@@ -203,10 +203,10 @@ table.generic-table
background: #f8f8f8
.generic-table--column-spacer
+ white-space: nowrap
padding: 0 6px
visibility: hidden
height: 0px
- font-size: 0px
line-height: 0px
.generic-table--sort-header
Oops, something went wrong.

0 comments on commit 7975e3b

Please sign in to comment.