Permalink
Browse files

Merged opf/openproject/v7.4.6 into opf/openproject-ce/stable/7

  • Loading branch information...
oliverguenther committed Jul 10, 2018
2 parents c34d0df + 8ff7497 commit 6b66658e35547d14c6672f0b27d38aa43e482193
Showing with 4,525 additions and 977 deletions.
  1. +1 −1 .buildpacks
  2. +2 −0 .pkgr.yml
  3. +2 −2 Gemfile
  4. +47 −52 Gemfile.lock
  5. +10 −0 app/assets/javascripts/members_form.js
  6. +0 −4 app/assets/stylesheets/content/_attributes_key_value.sass
  7. +2 −2 app/assets/stylesheets/content/_collapsible_section.sass
  8. +10 −6 app/assets/stylesheets/content/_forms.sass
  9. +2 −2 app/assets/stylesheets/content/_links.sass
  10. +11 −6 app/assets/stylesheets/content/_notifications.sass
  11. +4 −2 app/assets/stylesheets/content/_table.sass
  12. +2 −3 app/assets/stylesheets/content/_widget_box.sass
  13. +1 −1 app/assets/stylesheets/layout/_drop_down.sass
  14. +2 −2 app/assets/stylesheets/layout/_main_menu.sass
  15. +1 −2 app/assets/stylesheets/layout/_top_menu.sass
  16. +5 −0 app/assets/stylesheets/openproject/_generic.sass
  17. +2 −0 app/assets/stylesheets/openproject/_index.sass
  18. +7 −7 app/assets/stylesheets/openproject/_scm.sass
  19. +1 −1 app/assets/stylesheets/vendor/_ng_dialog.sass
  20. +1 −1 app/assets/stylesheets/vendor/_select2.scss
  21. +14 −0 app/controllers/account_controller.rb
  22. +2 −2 app/controllers/activities_controller.rb
  23. +5 −1 app/controllers/concerns/omniauth_login.rb
  24. +129 −0 app/controllers/concerns/user_limits.rb
  25. +11 −0 app/controllers/enterprises_controller.rb
  26. +5 −1 app/controllers/members_controller.rb
  27. +18 −1 app/controllers/users_controller.rb
  28. +12 −1 app/controllers/work_packages/bulk_controller.rb
  29. +10 −4 app/helpers/toolbar_helper.rb
  30. +13 −0 app/mailers/user_mailer.rb
  31. +1 −8 app/models/activity/work_package_activity_provider.rb
  32. +6 −1 app/models/user.rb
  33. +14 −7 app/services/work_packages/schedule_dependency.rb
  34. +8 −0 app/views/enterprises/_current.html.erb
  35. +7 −0 app/views/members/_member_form_non_impaired.html.erb
  36. +47 −0 app/views/user_mailer/activation_limit_reached.html.erb
  37. +34 −0 app/views/user_mailer/activation_limit_reached.text.erb
  38. +15 −2 app/views/users/index.html.erb
  39. +92 −0 app/workers/mail_user_job.rb
  40. +4 −0 config/application.rb
  41. +59 −0 config/locales/crowdin/af.yml
  42. +59 −0 config/locales/crowdin/ar.yml
  43. +59 −0 config/locales/crowdin/bg.yml
  44. +59 −0 config/locales/crowdin/ca.yml
  45. +135 −74 config/locales/crowdin/cs.yml
  46. +59 −0 config/locales/crowdin/da.yml
  47. +66 −1 config/locales/crowdin/de.yml
  48. +59 −0 config/locales/crowdin/es.yml
  49. +59 −0 config/locales/crowdin/et.yml
  50. +59 −0 config/locales/crowdin/fa.yml
  51. +59 −0 config/locales/crowdin/fi.yml
  52. +59 −0 config/locales/crowdin/fil.yml
  53. +60 −1 config/locales/crowdin/fr.yml
  54. +59 −0 config/locales/crowdin/he.yml
  55. +71 −13 config/locales/crowdin/hr.yml
  56. +59 −0 config/locales/crowdin/hu.yml
  57. +59 −0 config/locales/crowdin/id.yml
  58. +64 −5 config/locales/crowdin/it.yml
  59. +49 −0 config/locales/crowdin/ja.yml
  60. +12 −12 config/locales/crowdin/js-cs.yml
  61. +13 −13 config/locales/crowdin/js-da.yml
  62. +3 −3 config/locales/crowdin/js-hr.yml
  63. +12 −10 config/locales/crowdin/js-nl.yml
  64. +2 −2 config/locales/crowdin/js-pl.yml
  65. +2 −2 config/locales/crowdin/js-tr.yml
  66. +3 −3 config/locales/crowdin/js-vi.yml
  67. +134 −156 config/locales/crowdin/js-zh-TW.yml
  68. +59 −0 config/locales/crowdin/ko.yml
  69. +45 −0 config/locales/crowdin/lol.yml
  70. +59 −0 config/locales/crowdin/lt.yml
  71. +59 −0 config/locales/crowdin/lv.yml
  72. +99 −35 config/locales/crowdin/nl.yml
  73. +59 −0 config/locales/crowdin/no.yml
  74. +64 −4 config/locales/crowdin/pl.yml
  75. +59 −0 config/locales/crowdin/pt-BR.yml
  76. +59 −0 config/locales/crowdin/pt.yml
  77. +59 −0 config/locales/crowdin/ro.yml
  78. +59 −0 config/locales/crowdin/ru.yml
  79. +63 −4 config/locales/crowdin/sk.yml
  80. +59 −0 config/locales/crowdin/sv-SE.yml
  81. +59 −0 config/locales/crowdin/th.yml
  82. +78 −18 config/locales/crowdin/tr.yml
  83. +59 −0 config/locales/crowdin/uk.yml
  84. +76 −17 config/locales/crowdin/vi.yml
  85. +273 −284 config/locales/crowdin/zh-TW.yml
  86. +50 −3 config/locales/crowdin/zh.yml
  87. +26 −0 config/locales/en.yml
  88. +31 −2 docker/entrypoint
  89. +27 −0 docs/configuration/configuration.md
  90. +3 −3 docs/installation/manual/README.md
  91. +10 −1 extra/Apache/OpenProjectAuthentication.pm
  92. +26 −16 frontend/app/components/wp-edit-form/work-package-changeset.ts
  93. +1 −3 frontend/npm-shrinkwrap.json
  94. +1 −1 frontend/package.json
  95. +87 −0 lib/open_project/enterprise.rb
  96. +1 −1 lib/open_project/version.rb
  97. +1 −3 lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
  98. +1 −1 lib/redmine/i18n.rb
  99. +124 −0 spec/controllers/account_controller_spec.rb
  100. +58 −0 spec/controllers/users_controller_spec.rb
  101. +100 −49 spec/features/work_packages/new/attributes_from_filter_spec.rb
  102. +80 −0 spec/lib/open_project/enterprise_spec.rb
  103. +73 −0 spec/views/users/index.html.erb_spec.rb
  104. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  105. +1 −1 vendored-plugins/openproject-avatars/lib/open_project/avatars/version.rb
  106. +1 −0 vendored-plugins/openproject-backlogs/app/assets/stylesheets/backlogs/taskboard.sass
  107. +4 −4 vendored-plugins/openproject-backlogs/config/locales/crowdin/ja.yml
  108. +3 −3 vendored-plugins/openproject-backlogs/config/locales/crowdin/zh-TW.yml
  109. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  110. +58 −58 vendored-plugins/openproject-costs/config/locales/crowdin/ja.yml
  111. +1 −0 vendored-plugins/openproject-costs/config/locales/crowdin/lt.yml
  112. +1 −0 vendored-plugins/openproject-costs/config/locales/crowdin/pl.yml
  113. +1 −0 vendored-plugins/openproject-costs/config/locales/crowdin/ru.yml
  114. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  115. +19 −0 vendored-plugins/openproject-documents/config/locales/crowdin/ja.yml
  116. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  117. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  118. +9 −0 vendored-plugins/openproject-global_roles/config/locales/crowdin/ja.yml
  119. +9 −0 vendored-plugins/openproject-global_roles/config/locales/crowdin/zh-TW.yml
  120. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  121. +1 −1 vendored-plugins/openproject-ldap_groups/lib/open_project/ldap_groups/version.rb
  122. +2 −1 vendored-plugins/openproject-ldap_groups/lib/tasks/ldap_groups.rake
  123. +3 −2 vendored-plugins/openproject-meeting/config/locales/crowdin/ar.yml
  124. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/da.yml
  125. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/de.yml
  126. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/es-ES.yml
  127. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/fi.yml
  128. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/fil.yml
  129. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/fr.yml
  130. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/he.yml
  131. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/hr.yml
  132. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/hu.yml
  133. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/id.yml
  134. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/it.yml
  135. +64 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/ja.yml
  136. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/ko.yml
  137. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/lt.yml
  138. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/nl.yml
  139. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/no.yml
  140. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/pl.yml
  141. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/pt-BR.yml
  142. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/pt-PT.yml
  143. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/ru.yml
  144. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/sk.yml
  145. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/sv-SE.yml
  146. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/tr.yml
  147. +1 −0 vendored-plugins/openproject-meeting/config/locales/crowdin/zh-CN.yml
  148. +6 −5 vendored-plugins/openproject-meeting/config/locales/crowdin/zh-TW.yml
  149. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  150. +1 −1 vendored-plugins/openproject-my_project_page/config/locales/crowdin/de.yml
  151. +23 −0 vendored-plugins/openproject-my_project_page/config/locales/crowdin/ja.yml
  152. +3 −0 vendored-plugins/openproject-my_project_page/config/locales/crowdin/js-ja.yml
  153. +1 −1 vendored-plugins/openproject-my_project_page/config/locales/crowdin/js-zh-TW.yml
  154. +6 −6 vendored-plugins/openproject-my_project_page/config/locales/crowdin/zh-TW.yml
  155. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  156. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/sso_logout.rb
  157. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  158. +1 −1 vendored-plugins/openproject-openid_connect/openproject-openid_connect.gemspec
  159. +30 −0 vendored-plugins/openproject-pdf_export/config/locales/crowdin/ja.yml
  160. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  161. +49 −0 vendored-plugins/openproject-reporting/config/locales/crowdin/zh-TW.yml
  162. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  163. +4 −4 vendored-plugins/openproject-two_factor_authentication/config/locales/crowdin/es-ES.yml
  164. +2 −2 vendored-plugins/openproject-two_factor_authentication/config/locales/crowdin/fr.yml
  165. +2 −2 vendored-plugins/openproject-two_factor_authentication/config/locales/crowdin/id.yml
  166. +174 −0 vendored-plugins/openproject-two_factor_authentication/config/locales/crowdin/ja.yml
  167. +1 −1 vendored-plugins/openproject-two_factor_authentication/config/locales/crowdin/tr.yml
  168. +1 −1 ...ugins/openproject-two_factor_authentication/lib/open_project/two_factor_authentication/version.rb
  169. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  170. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  171. +2 −2 vendored-plugins/reporting_engine/config/locales/crowdin/ja.yml
  172. +2 −2 vendored-plugins/reporting_engine/config/locales/crowdin/js-ja.yml
  173. +2 −2 vendored-plugins/reporting_engine/config/locales/crowdin/zh-TW.yml
  174. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
@@ -1,3 +1,3 @@
https://github.com/pkgr/pkgr-buildpack-imagemagick.git
https://github.com/heroku/heroku-buildpack-nodejs.git#v106
https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1
https://github.com/pkgr/heroku-buildpack-ruby.git#v183-1
@@ -10,6 +10,8 @@ targets:
<<: *debian8
ubuntu-16.04:
<<: *debian8
ubuntu-18.04:
<<: *debian8
centos-7:
dependencies:
- epel-release
@@ -257,11 +257,11 @@ platforms :mri, :mingw, :x64_mingw do
end
group :opf_plugins do
gem 'openproject-translations', git: 'https://github.com/opf/openproject-translations.git', branch: 'translations-in-core'
gem 'openproject-translations', git: 'https://github.com/opf/openproject-translations.git', branch: 'dev'
end
group :docker, optional: true do
gem 'passenger'
gem 'passenger', '~> 5.3.3'
# Used to easily precompile assets
gem 'sqlite3', require: false
@@ -16,13 +16,13 @@ GIT
GIT
remote: https://github.com/finnlabs/omniauth-openid-connect.git
revision: c3bce4c9e9ac5412b36b00f80a44e3f1f7817222
revision: 109570739508feef40932a1adccf55ee5d28da0f
branch: dev
specs:
omniauth-openid-connect (0.2.0)
omniauth-openid-connect (0.2.1)
addressable (~> 2.3)
omniauth (~> 1.1)
openid_connect (~> 0.8.0)
openid_connect (~> 1.1.3)
GIT
remote: https://github.com/finnlabs/omniauth-openid_connect-providers.git
@@ -84,13 +84,12 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
revision: 52a08551cf5562f14b2eeadb31bcb64bafd303a2
branch: translations-in-core
revision: a2b97747f7334e159d177a8f1641a0d18a7e26b2
branch: dev
specs:
openproject-translations (7.4.0)
crowdin-api (~> 0.5.0)
mixlib-shellout (~> 2.1.0)
rails (~> 5.0.0)
rubyzip
GIT
@@ -113,119 +112,119 @@ GIT
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
openproject-auth_plugins (7.4.5)
openproject-auth_plugins (7.4.6)
omniauth (~> 1.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-avatars
specs:
openproject-avatars (7.4.5)
openproject-avatars (7.4.6)
fastimage (~> 2.1.0)
gravatar_image_tag (~> 1.2.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
openproject-backlogs (7.4.5)
openproject-backlogs (7.4.6)
acts_as_silent_list (~> 3.0.0)
openproject-pdf_export (= 7.4.5)
openproject-pdf_export (= 7.4.6)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-costs
specs:
openproject-costs (7.4.5)
openproject-costs (7.4.6)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-documents
specs:
openproject-documents (7.4.5)
openproject-documents (7.4.6)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
openproject-github_integration (7.4.5)
openproject-webhooks (~> 7.4.5)
openproject-github_integration (7.4.6)
openproject-webhooks (~> 7.4.6)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
openproject-global_roles (7.4.5)
openproject-global_roles (7.4.6)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-ldap_groups
specs:
openproject-ldap_groups (7.4.5)
openproject-ldap_groups (7.4.6)
PATH
remote: vendored-plugins/openproject-meeting
specs:
openproject-meeting (7.4.5)
openproject-meeting (7.4.6)
icalendar (~> 2.3.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
openproject-my_project_page (7.4.5)
openproject-my_project_page (7.4.6)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
openproject-openid_connect (7.4.5)
lobby_boy (~> 0.1)
openproject-openid_connect (7.4.6)
lobby_boy (~> 0.1.3)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 7.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
openproject-pdf_export (7.4.5)
openproject-pdf_export (7.4.6)
pdf-inspector (~> 1.3.0)
prawn (~> 2.2)
PATH
remote: vendored-plugins/openproject-reporting
specs:
openproject-reporting (7.4.5)
openproject-reporting (7.4.6)
jquery-tablesorter (~> 1.22.3)
openproject-costs (= 7.4.5)
openproject-costs (= 7.4.6)
rails (~> 5.0.0)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-two_factor_authentication
specs:
openproject-two_factor_authentication (7.4.5)
openproject-two_factor_authentication (7.4.6)
messagebird-rest (~> 1.3.2)
rails (~> 5)
rotp (~> 3.3)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
openproject-webhooks (7.4.5)
openproject-webhooks (7.4.6)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
openproject-xls_export (7.4.5)
openproject-xls_export (7.4.6)
rails (~> 5.0.0)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
reporting_engine (7.4.5)
reporting_engine (7.4.6)
json
rails (~> 5.0.0)
@@ -292,6 +291,7 @@ GEM
activerecord (>= 3.0.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
afm (0.2.2)
airbrake (5.1.0)
airbrake-ruby (~> 1.1)
@@ -317,7 +317,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
backports (3.10.3)
bcrypt (3.1.11)
bindata (2.4.0)
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootsnap (1.1.5)
@@ -415,7 +415,7 @@ GEM
representable (>= 2.4.0, <= 3.1.0)
uber (< 0.2.0)
docile (1.1.5)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
equivalent-xml (0.6.0)
@@ -493,12 +493,10 @@ GEM
jquery-tablesorter (1.22.7)
railties (>= 3.2, < 6)
json (1.8.6)
json-jwt (1.7.2)
json-jwt (1.9.4)
activesupport
aes_key_wrap
bindata
multi_json (>= 1.3)
securecompare
url_safe_base64
json_spec (1.1.5)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
@@ -515,16 +513,16 @@ GEM
sass
thor
tilt
lobby_boy (0.1.2)
lobby_boy (0.1.3)
omniauth (~> 1.1)
omniauth-openid-connect (>= 0.2)
omniauth-openid-connect (>= 0.2.1)
rails (>= 3.2.21)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
messagebird-rest (1.3.2)
messagebird-rest (1.3.3)
meta-tags (2.6.0)
actionpack (>= 3.2.0, < 5.3)
method_source (0.8.2)
@@ -550,25 +548,24 @@ GEM
oj (3.3.8)
okcomputer (1.16.0)
open4 (1.3.4)
openid_connect (0.8.3)
openid_connect (1.1.6)
activemodel
attr_required (>= 0.0.5)
json (>= 1.4.3)
json-jwt (>= 0.5.5)
rack-oauth2 (>= 1.0.0)
swd (>= 0.1.2)
attr_required (>= 1.0.0)
json-jwt (>= 1.5.0)
rack-oauth2 (>= 1.6.1)
swd (>= 1.0.0)
tzinfo
validate_email
validate_url
webfinger (>= 0.0.2)
webfinger (>= 1.0.1)
openproject-token (1.0.1)
activemodel (~> 5.0)
parallel (1.12.0)
parallel_tests (2.14.2)
parallel
parser (2.4.0.0)
ast (~> 2.2)
passenger (5.1.5)
passenger (5.3.3)
rack
rake (>= 0.8.1)
pdf-core (0.7.0)
@@ -605,16 +602,16 @@ GEM
public_suffix (3.0.0)
rabl (0.13.1)
activesupport (>= 2.3.14)
rack (2.0.3)
rack (2.0.5)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (5.0.1)
rack
rack-oauth2 (1.8.2)
rack-oauth2 (1.9.2)
activesupport
attr_required
httpclient
json-jwt
json-jwt (>= 1.9.0)
rack
rack-protection (2.0.1)
rack
@@ -742,7 +739,6 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
securecompare (1.0.0)
selenium-webdriver (3.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
@@ -757,7 +753,7 @@ GEM
slop (3.6.0)
spreadsheet (0.8.9)
ruby-ole (>= 1.0)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -793,15 +789,14 @@ GEM
uber (0.0.15)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicorn (5.3.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
url_safe_base64 (0.2.2)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
@@ -915,7 +910,7 @@ DEPENDENCIES
openproject-webhooks!
openproject-xls_export!
parallel_tests (~> 2.14.0)
passenger
passenger (~> 5.3.3)
pg (~> 0.21.0)
prawn (~> 2.2)
prawn-table (~> 0.2.2)
@@ -76,6 +76,16 @@ function showAddMemberForm() {
jQuery('#filter-member-button').removeClass('-active');
localStorage.setItem("showFilter", 'false');
jQuery('#add-member-button').prop('disabled', true);
jQuery("input#member_user_ids").on("change", function() {
var values = jQuery("input#member_user_ids").val();
if (values.indexOf("@") != -1) {
jQuery("#member-user-limit-warning").css("display", "block");
} else {
jQuery("#member-user-limit-warning").css("display", "none");
}
});
}
function hideAddMemberForm() {
@@ -30,10 +30,6 @@
@include grid-block
@include grid-layout(2)
@include grid-visible-overflow
// Overriding position: relative defined by grid-block
// which seems to collide (chrome 66) with the column-count
// defined conditionally on the element as well.
position: static
font-size: 0.875rem
line-height: 1.6
Oops, something went wrong.

0 comments on commit 6b66658

Please sign in to comment.