Permalink
Browse files

Release OpenProject Community Edition 6.0.3

  • Loading branch information...
2 parents 6270d35 + 1293564 commit 41ff6df954908ff4e8ee7c957886b03efc9e053f @oliverguenther oliverguenther committed Aug 16, 2016
Showing with 267 additions and 141 deletions.
  1. +1 −1 Gemfile
  2. +58 −58 Gemfile.lock
  3. +13 −5 app/assets/javascripts/top-shelf.js
  4. +13 −6 app/assets/javascripts/top_menu.js
  5. +35 −11 app/assets/javascripts/unsupported-browsers.js
  6. +3 −5 app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass
  7. +1 −1 app/assets/stylesheets/layout/_work_package.sass
  8. +0 −4 app/assets/stylesheets/top-shelf.css.erb
  9. +3 −0 app/controllers/api/experimental/work_packages_controller.rb
  10. +15 −1 app/models/project.rb
  11. +3 −2 app/models/queries/work_packages/available_filter_options.rb
  12. +6 −4 app/models/query.rb
  13. +3 −1 app/models/query/results.rb
  14. +3 −2 app/views/projects/form/_types.html.erb
  15. +14 −8 app/views/wiki/annotate.html.erb
  16. +8 −5 app/views/wiki/diff.html.erb
  17. +4 −1 config/locales/js-en.yml
  18. +3 −3 frontend/app/components/filters/query/query-service.service.ts
  19. +5 −1 frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
  20. +33 −2 frontend/app/work_packages/models/datepicker.js
  21. +1 −1 lib/api/v3/work_packages/schema/typed_work_package_schema.rb
  22. +2 −2 lib/api/v3/work_packages/work_package_representer.rb
  23. +5 −0 lib/open_project/configuration.rb
  24. +1 −1 lib/open_project/version.rb
  25. +18 −0 spec/lib/open_project/configuration_spec.rb
  26. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  27. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  28. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  29. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  30. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  31. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  32. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  33. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  34. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  35. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  36. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  37. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  38. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  39. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  40. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  41. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -28,7 +28,7 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.2.5'
+gem 'rails', '~> 4.2.7', '>= 4.2.7.1'
gem 'actionpack-action_caching'
gem 'actionpack-xml_parser'
gem 'activerecord-session_store'
View
@@ -104,10 +104,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 8f51476878ea149ce9d8a6c62a277f3707f480c8
+ revision: 2db23a9bd59de58e6d10e31d80596d798a6783b1
branch: stable/6
specs:
- openproject-translations (6.0.2)
+ openproject-translations (6.0.3)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
@@ -140,66 +140,66 @@ GIT
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (6.0.2)
+ openproject-auth_plugins (6.0.3)
omniauth (~> 1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (6.0.2)
+ openproject-backlogs (6.0.3)
acts_as_silent_list (~> 2.0.0)
- openproject-pdf_export (= 6.0.2)
+ openproject-pdf_export (= 6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (6.0.2)
+ openproject-costs (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (6.0.2)
+ openproject-documents (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (6.0.2)
- openproject-webhooks (~> 6.0.2)
+ openproject-github_integration (6.0.3)
+ openproject-webhooks (~> 6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (6.0.2)
+ openproject-global_roles (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (6.0.2)
+ openproject-local_avatars (6.0.3)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (6.0.2)
+ openproject-meeting (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (6.0.2)
+ openproject-my_project_page (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (6.0.2)
+ openproject-openid_connect (6.0.3)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 6.0)
@@ -208,57 +208,57 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (6.0.2)
+ openproject-pdf_export (6.0.3)
prawn (~> 2.1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (6.0.2)
- openproject-costs (= 6.0.2)
+ openproject-reporting (6.0.3)
+ openproject-costs (= 6.0.3)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (6.0.2)
+ openproject-themes-dark (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (6.0.2)
+ openproject-webhooks (6.0.3)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (6.0.2)
+ openproject-xls_export (6.0.3)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (6.0.2)
+ reporting_engine (6.0.3)
json
rails (~> 4.2.4)
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.2)
- actionmailer (4.2.7)
- actionpack (= 4.2.7)
- actionview (= 4.2.7)
- activejob (= 4.2.7)
+ actionmailer (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.7)
- actionview (= 4.2.7)
- activesupport (= 4.2.7)
+ actionpack (4.2.7.1)
+ actionview (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
@@ -267,29 +267,29 @@ GEM
actionpack (>= 4.0.0, < 5.0)
actionpack-xml_parser (1.0.2)
actionpack (>= 4.0.0, < 5)
- actionview (4.2.7)
- activesupport (= 4.2.7)
+ actionview (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.7)
- activesupport (= 4.2.7)
+ activejob (4.2.7.1)
+ activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
- activemodel (4.2.7)
- activesupport (= 4.2.7)
+ activemodel (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
- activerecord (4.2.7)
- activemodel (= 4.2.7)
- activesupport (= 4.2.7)
+ activerecord (4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
arel (~> 6.0)
activerecord-session_store (0.1.2)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
activerecord-tableless (1.3.4)
activerecord (>= 2.3.0)
- activesupport (4.2.7)
+ activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -348,7 +348,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
color-tools (1.3.0)
- concurrent-ruby (1.0.1)
+ concurrent-ruby (1.0.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crowdin-api (0.4.1)
@@ -425,7 +425,7 @@ GEM
ruby-progressbar (~> 1.4)
gherkin (2.12.2)
multi_json (~> 1.3)
- globalid (0.3.6)
+ globalid (0.3.7)
activesupport (>= 4.1.0)
globalize (5.0.1)
activemodel (>= 4.2.0, < 4.3)
@@ -489,13 +489,13 @@ GEM
rails (>= 3.2.21)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.2)
mini_portile2 (2.1.0)
minisyntax (0.2.5)
- minitest (5.8.4)
+ minitest (5.9.0)
mixlib-shellout (2.1.0)
multi_json (1.11.3)
multi_test (0.1.2)
@@ -589,16 +589,16 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
- rails (4.2.7)
- actionmailer (= 4.2.7)
- actionpack (= 4.2.7)
- actionview (= 4.2.7)
- activejob (= 4.2.7)
- activemodel (= 4.2.7)
- activerecord (= 4.2.7)
- activesupport (= 4.2.7)
+ rails (4.2.7.1)
+ actionmailer (= 4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activerecord (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.7)
+ railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -617,14 +617,14 @@ GEM
rails (> 3.1)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
- railties (4.2.7)
- actionpack (= 4.2.7)
- activesupport (= 4.2.7)
+ railties (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.16.0)
- rake (11.1.1)
+ rake (11.2.2)
rb-readline (0.5.3)
rdoc (4.2.2)
json (~> 1.4)
@@ -718,7 +718,7 @@ GEM
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.0.4)
+ sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -889,7 +889,7 @@ DEPENDENCIES
rack-protection!
rack-test (~> 0.6.2)
rack_session_access
- rails (~> 4.2.5)
+ rails (~> 4.2.7, >= 4.2.7.1)
rails-angular-xss!
rails-observers
rails_12factor
@@ -39,14 +39,22 @@
var opts = mergeOptions(options);
var message = this;
var topShelf = $("<div/>").addClass(opts.className);
+ var link = $("<a/>").append(' ' + opts.link).attr({"href": opts.url});
+
+ if (window.localStorage.getItem(opts.id)) {
+ return;
+ }
+
+ var closeLink = $("<a/>").append(opts.close);
+ closeLink.click(function() {
+ window.localStorage.setItem(opts.id, '1');
+ topShelf.remove();
+ });
if (message.length === 0) {
topShelf.append($("<h1/>").append(opts.title))
- .append($("<p/>").append(opts.message))
- .append($("<h2/>").append(
- $("<a/>").append(opts.link)
- .attr({"href": opts.url})
- ));
+ .append($("<p/>").append(opts.message).append(link))
+ .append($("<h2/>").append(closeLink));
} else {
topShelf.append(message);
}
@@ -132,7 +132,7 @@
self.toggleClick($(this));
return false;
});
- $(it).hover(function () {
+ $(it).hover(function() {
// only do something if the menu is in hover mode
// AND the dropdown we hover on is not currently open anyways
if (self.hover && self.isClosed($(this))) {
@@ -157,16 +157,16 @@
dropdown.trigger("opened", dropdown);
},
- close: function (dropdown) {
- this.slideUp(dropdown);
+ close: function (dropdown, immediate) {
+ this.slideUp(dropdown, immediate);
dropdown.trigger("closed", dropdown);
},
closeOtherItems: function (dropdown) {
var self = this;
this.openDropdowns().each(function (ix, it) {
if ($(it) != $(dropdown)) {
- self.close($(it));
+ self.close($(it), true);
}
});
},
@@ -191,10 +191,17 @@
toDrop.slideDown(animationRate).attr("aria-expanded","true");
},
- slideUp: function (dropdown) {
+ slideUp: function (dropdown, immediate) {
var toDrop = $(dropdown).find("> ul");
dropdown.removeClass("open");
- toDrop.slideUp(animationRate).attr("aria-expanded","false");
+
+ if (immediate) {
+ toDrop.hide();
+ } else {
+ toDrop.slideUp(animationRate);
+ }
+
+ toDrop.attr("aria-expanded","false");
},
// If there is ANY input, it will have precedence over links,
Oops, something went wrong.

0 comments on commit 41ff6df

Please sign in to comment.