Permalink
Browse files

Release openproject-ce 6.0.5

  • Loading branch information...
2 parents d23fc45 + 11f0b37 commit f9216c70b5b86a2d574a21f7ca7ff021a3afbd6b @oliverguenther oliverguenther committed Oct 18, 2016
Showing with 1,794 additions and 517 deletions.
  1. +3 −0 .travis.yml
  2. +1 −1 Dockerfile.public
  3. +24 −24 Gemfile.lock
  4. +6 −1 app/assets/javascripts/tooltips.js
  5. +0 −18 app/assets/stylesheets/_misc_legacy.sass
  6. +19 −29 app/assets/stylesheets/content/_my_page.sass
  7. +1 −1 app/assets/stylesheets/content/_pagination.sass
  8. +82 −0 app/assets/stylesheets/content/_project_overview.sass
  9. +8 −0 app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass
  10. +1 −0 app/assets/stylesheets/default.css.sass
  11. +4 −0 app/assets/stylesheets/fonts/_openproject_icon_font.sass
  12. +33 −3 app/controllers/wiki_controller.rb
  13. +5 −3 app/controllers/wiki_menu_items_controller.rb
  14. +6 −2 app/helpers/queries_helper.rb
  15. +1 −0 app/helpers/timelines_helper.rb
  16. +2 −0 app/models/attachment.rb
  17. +1 −0 app/models/menu_item.rb
  18. +1 −7 app/views/admin/info.html.erb
  19. +5 −2 app/views/admin/projects.html.erb
  20. +5 −2 app/views/auth_sources/index.html.erb
  21. +4 −2 app/views/boards/show.html.erb
  22. +5 −2 app/views/custom_fields/_tab.html.erb
  23. +4 −3 app/views/enumerations/index.html.erb
  24. +5 −2 app/views/groups/index.html.erb
  25. +5 −2 app/views/homescreen/blocks/_projects.html.erb
  26. +4 −2 app/views/members/index.html.erb
  27. +1 −1 app/views/my/page.html.erb
  28. +2 −2 app/views/my/page_layout.html.erb
  29. +6 −2 app/views/news/index.html.erb
  30. +5 −2 app/views/planning_element_type_colors/index.html.erb
  31. +5 −2 app/views/project_types/index.html.erb
  32. +4 −1 app/views/projects/_members_box.html.erb
  33. +5 −2 app/views/projects/index.html.erb
  34. +6 −2 app/views/projects/settings.html.erb
  35. +4 −2 app/views/projects/settings/_boards.html.erb
  36. +4 −2 app/views/projects/settings/_categories.html.erb
  37. +4 −2 app/views/projects/settings/_versions.html.erb
  38. +53 −45 app/views/projects/show.html.erb
  39. +5 −2 app/views/reportings/index.html.erb
  40. +5 −2 app/views/roles/index.html.erb
  41. +5 −2 app/views/statuses/index.html.erb
  42. +1 −1 app/views/timelines/show.html.erb
  43. +5 −2 app/views/types/index.html.erb
  44. +5 −2 app/views/users/index.html.erb
  45. +7 −1 app/views/wiki/show.html.erb
  46. +8 −1 config/locales/en.yml
  47. +1 −0 config/locales/js-en.yml
  48. +58 −18 doc/operation_guides/packager/installation-guide.md
  49. +32 −0 docker-compose.pullpreview.yml
  50. +9 −0 docker/supervisord.conf
  51. +161 −0 docker/wait-for-it.sh
  52. +3 −3 features/reportings/reporting_permissions.feature
  53. +2 −2 features/timelines/timeline_view.feature
  54. +0 −2 .../has-preview-directive-test.js → app/components/common/has-preview/has-preview.directive.test.ts}
  55. +11 −2 ...{ui_components/has-preview-directive.js → components/common/has-preview/has-preview.directive.ts}
  56. +43 −0 frontend/app/components/common/urijs/urijs.service.test.ts
  57. +37 −0 frontend/app/components/common/urijs/urijs.service.ts
  58. +68 −0 frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.test.ts
  59. +54 −0 frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts
  60. +52 −0 frontend/app/components/common/xss/expression.service.ts
  61. +3 −0 frontend/app/components/routing/ui-router.config.ts
  62. +1 −0 frontend/app/components/work-packages/wp-attachments/wp-attachments.directive.html
  63. +4 −0 frontend/app/components/work-packages/wp-attachments/wp-attachments.directive.ts
  64. +1 −1 frontend/app/components/wp-activity/user/user-activity-directive.test.js
  65. +1 −1 frontend/app/components/wp-display/field-types/wp-display-formattable-field.directive.html
  66. +20 −4 frontend/app/components/wp-display/field-types/wp-display-formattable-field.module.ts
  67. +42 −0 frontend/app/components/wp-display/field-types/wp-display-integer-field.module.ts
  68. +13 −0 frontend/app/components/wp-display/field-types/wp-display-spent-time-field.directive.html
  69. +57 −0 frontend/app/components/wp-display/field-types/wp-display-spent-time-field.module.ts
  70. +12 −0 frontend/app/components/wp-display/field-types/wp-display-work-package-field.directive.html
  71. +67 −0 frontend/app/components/wp-display/field-types/wp-display-work-package-field.module.ts
  72. +18 −13 frontend/app/components/wp-display/wp-display-field/wp-display-field.config.ts
  73. +1 −0 frontend/app/components/wp-edit/field-types/wp-edit-date-field.directive.html
  74. +1 −1 frontend/app/components/wp-edit/field-types/wp-edit-wiki-textarea-field.directive.html
  75. +7 −2 frontend/app/components/wp-edit/op-date-picker/op-date-picker.directive.ts
  76. +2 −0 frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
  77. +8 −1 frontend/app/components/wp-list/wp-list.service.ts
  78. +2 −4 frontend/app/components/wp-table/table-pagination/table-pagination.directive.html
  79. +12 −6 frontend/app/components/wp-table/table-pagination/table-pagination.directive.js
  80. +1 −1 frontend/app/components/wp-table/table-pagination/table-pagination.directive.test.js
  81. +3 −0 frontend/app/global.js
  82. +3 −1 frontend/app/init-app.js
  83. +2 −2 frontend/app/templates/work_packages/activities/_user.html
  84. +0 −66 frontend/app/templates/work_packages/attachments-edit.html
  85. +0 −73 frontend/app/templates/work_packages/attachments.html
  86. +0 −3 frontend/app/ui_components/index.js
  87. +1 −1 frontend/app/work_packages/config/index.js
  88. +1 −0 frontend/typings.json
  89. +242 −0 frontend/typings/globals/urijs/index.d.ts
  90. +8 −0 frontend/typings/globals/urijs/typings.json
  91. +1 −0 frontend/typings/index.d.ts
  92. +1 −3 frontend/webpack-main-config.js
  93. +11 −9 lib/api/v3/work_packages/work_package_collection_representer.rb
  94. +8 −13 lib/open_project/scm/adapters/git.rb
  95. +1 −1 lib/open_project/text_formatting.rb
  96. +1 −1 lib/open_project/version.rb
  97. +4 −0 lib/redmine/menu_manager/menu_item.rb
  98. +4 −2 lib/redmine/menu_manager/top_menu/projects_menu.rb
  99. +26 −3 lib/redmine/menu_manager/tree_node.rb
  100. +3 −3 spec/features/members/invitation_spec.rb
  101. +63 −0 spec/features/security/angular_xss_spec.rb
  102. +6 −0 spec/features/work_packages/details/inplace_editor/custom_field_spec.rb
  103. +16 −1 spec/features/work_packages/details/inplace_editor/description_editor_spec.rb
  104. +5 −1 spec/features/work_packages/details/inplace_editor/version_editor_spec.rb
  105. +3 −1 spec/features/work_packages/edit_work_package_spec.rb
  106. +27 −2 spec/features/work_packages/export_spec.rb
  107. +3 −3 spec/features/work_packages/select_work_package_row_spec.rb
  108. +1 −0 spec/features/work_packages/tabs/keep_tab_spec.rb
  109. +12 −0 spec/models/menu_items/wiki_menu_item_spec.rb
  110. +2 −2 spec/support/pages/members.rb
  111. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  112. +3 −1 vendored-plugins/openproject-backlogs/.travis.yml
  113. +3 −3 vendored-plugins/openproject-backlogs/app/assets/stylesheets/backlogs/master_backlog.css.sass
  114. +4 −2 vendored-plugins/openproject-backlogs/app/views/projects/settings/_versions.html.erb
  115. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  116. +3 −1 vendored-plugins/openproject-costs/.travis.yml
  117. +8 −0 vendored-plugins/openproject-costs/app/assets/stylesheets/costs/costs_legacy.css
  118. +1 −3 vendored-plugins/openproject-costs/app/views/cost_objects/_edit.html.erb
  119. +11 −7 vendored-plugins/openproject-costs/app/views/cost_objects/_form.html.erb
  120. +2 −2 vendored-plugins/openproject-costs/app/views/cost_objects/_show_variable_cost_object.html.erb
  121. +2 −2 vendored-plugins/openproject-costs/app/views/cost_objects/index.html.erb
  122. +35 −18 vendored-plugins/openproject-costs/app/views/cost_objects/show.html.erb
  123. +6 −3 vendored-plugins/openproject-costs/app/views/cost_types/edit.html.erb
  124. +4 −3 vendored-plugins/openproject-costs/app/views/cost_types/index.html.erb
  125. +6 −3 vendored-plugins/openproject-costs/app/views/hourly_rates/edit.html.erb
  126. +1 −0 vendored-plugins/openproject-costs/config/locales/zh-CN.yml
  127. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  128. +3 −1 vendored-plugins/openproject-documents/.travis.yml
  129. +6 −2 vendored-plugins/openproject-documents/app/views/documents/index.html.erb
  130. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  131. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  132. +3 −1 vendored-plugins/openproject-global_roles/.travis.yml
  133. +6 −2 vendored-plugins/openproject-global_roles/app/views/roles/index.html.erb
  134. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  135. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  136. +3 −1 vendored-plugins/openproject-meeting/.travis.yml
  137. +6 −2 vendored-plugins/openproject-meeting/app/views/meetings/index.html.erb
  138. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  139. +3 −1 vendored-plugins/openproject-my_project_page/.travis.yml
  140. +4 −1 ...ored-plugins/openproject-my_project_page/app/views/my_projects_overviews/blocks/_members.html.erb
  141. +4 −1 ...-plugins/openproject-my_project_page/app/views/my_projects_overviews/blocks/_news_latest.html.erb
  142. +4 −1 ...penproject-my_project_page/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb
  143. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  144. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  145. +4 −2 vendored-plugins/openproject-pdf_export/.travis.yml
  146. +5 −2 vendored-plugins/openproject-pdf_export/app/views/export_card_configurations/index.html.erb
  147. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  148. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  149. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  150. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  151. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  152. +1 −0 vendored-plugins/reporting_engine/lib/assets/stylesheets/reporting_engine/reporting.css.erb
  153. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -94,6 +94,9 @@ env:
- "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=3 GROUP=3"
before_install:
+ - "rvm @default,@global do gem uninstall bundler -a -x"
+ - gem install bundler -v 1.12.5
+ - echo `bundle -v`
- "echo `firefox -v`"
- "export DISPLAY=:99.0"
- "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"
View
@@ -1,4 +1,4 @@
-FROM openproject/community:6-base
+FROM openproject/community:6.0-base
MAINTAINER operations@openproject.com
ENV DATABASE_URL=postgres://openproject:openproject@127.0.0.1/openproject
View
@@ -104,10 +104,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: e19713a37e64af3d99d84ae901936958ec87de43
+ revision: 9821ade5d966ef12321618d5fe60c45d8c8573ba
branch: stable/6
specs:
- openproject-translations (6.0.4)
+ openproject-translations (6.0.5)
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.4)
+ openproject-auth_plugins (6.0.5)
omniauth (~> 1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (6.0.4)
+ openproject-backlogs (6.0.5)
acts_as_silent_list (~> 2.0.0)
- openproject-pdf_export (= 6.0.4)
+ openproject-pdf_export (= 6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (6.0.4)
+ openproject-costs (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (6.0.4)
+ openproject-documents (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (6.0.4)
- openproject-webhooks (~> 6.0.4)
+ openproject-github_integration (6.0.5)
+ openproject-webhooks (~> 6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (6.0.4)
+ openproject-global_roles (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (6.0.4)
+ openproject-local_avatars (6.0.5)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (6.0.4)
+ openproject-meeting (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (6.0.4)
+ openproject-my_project_page (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (6.0.4)
+ openproject-openid_connect (6.0.5)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 6.0)
@@ -208,41 +208,41 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (6.0.4)
+ openproject-pdf_export (6.0.5)
prawn (~> 2.1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (6.0.4)
- openproject-costs (= 6.0.4)
+ openproject-reporting (6.0.5)
+ openproject-costs (= 6.0.5)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (6.0.4)
+ openproject-themes-dark (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (6.0.4)
+ openproject-webhooks (6.0.5)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (6.0.4)
+ openproject-xls_export (6.0.5)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (6.0.4)
+ reporting_engine (6.0.5)
json
rails (~> 4.2.4)
@@ -385,7 +385,7 @@ GEM
uber
docile (1.1.5)
unf (>= 0.0.5, < 1.0.0)
- domain_name (0.5.20160615)
+ domain_name (0.5.20160826)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
equivalent-xml (0.6.0)
@@ -452,7 +452,7 @@ GEM
health_check (1.5.1)
rails (>= 2.3.0)
htmldiff (0.0.1)
- http-cookie (1.0.2)
+ http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.0)
i18n (0.7.0)
@@ -934,4 +934,4 @@ DEPENDENCIES
will_paginate (~> 3.1)
BUNDLED WITH
- 1.12.5
+ 1.13.2
@@ -2,13 +2,18 @@ jQuery(function($) {
var tooltipTriggers = $('.advanced-tooltip-trigger');
tooltipTriggers.each(function (index, el) {
var tooltip = $("#" + $(el).attr('aria-describedby'));
+
$(el).bind('mouseover focus', function () {
var top = $(this).offset().top - $(window).scrollTop();
// Adjust top for small elements
var POINTER_HEIGHT = 16.5;
var middle = $(this).outerHeight() / 2;
if (middle < POINTER_HEIGHT) top -= POINTER_HEIGHT - middle;
- tooltip.css({'opacity': 1, 'visibility': 'visible', 'top': top});
+
+ // On the left side of the element + 5px Distance
+ var left = $(this).offset().left + $(this).width() + 5;
+
+ tooltip.css({'opacity': 1, 'visibility': 'visible', 'top': top, 'left': left});
}).bind('mouseout focusout', function () {
tooltip.css({'opacity': 0, 'visibility': 'hidden'});
});
@@ -587,24 +587,6 @@ a.impaired--empty-link,
.impaired--empty-link
color: inherit
-/* Align widget boxes with description above on project overview */
-.project-overview
- margin: 0 -10px
-
-/* Legacy styles for my project page plugin version (without widget-box styles) */
-#invisible-grid
- #list-left
- .mypage-box
- margin-right: 10px
-
- #list-right
- .mypage-box
- margin-left: 10px
-
- .mypage-box
- .box-actions
- margin-top: -60px
-
// Avoid content cut off in IE
#new-member-message + div.grid-block
min-height: 6rem
@@ -26,8 +26,6 @@
// See doc/COPYRIGHT.rdoc for more details.
//++
-
-
#content
.mypage-box
@include content-box
@@ -41,53 +39,45 @@
border: none
.my-page--container
- #left,
- #right
- @extend .medium-6
+ #right,
+ #left
+ flex: 0 0 50%
+ max-width: 50%
.widget-boxes
margin: 0 -10px
.widget-box
margin-bottom: 20px
+ overflow: auto
&:last-child
margin-bottom: 10px
+@include breakpoint(680px down)
+ .my-page--container .grid-block.widget-boxes
+ flex-wrap: wrap
+
+ #right,
+ #left
+ flex: 0 0 100%
+ max-width: 100%
+
+ #left
+ margin-bottom: 0
+
.handle
cursor: move
div.box-actions
float: right
z-index: 500
-#invisible-grid
- #top
- padding: 0 4px
-
- .container
- margin-bottom: 24px
-
- > h3:first-child
- margin-bottom: 14px
-
#visible-grid
.handle
cursor: move
-
-#visible-grid,
-#invisible-grid
- // TODO: this fixes an issue which currently breaks the layout
- // It has to be removed once it is fixed upstream
- // @see https://github.com/zurb/foundation-apps/issues/575
- .left, .right
- @extend .medium-6
-
- .widget-box
- margin-bottom: 20px
-
- &:last-child
- margin-bottom: 10px
+ &.my-page--container .widget-boxes
+ margin: 0
.block-receiver
border: 1px dashed $my-page-edit-box-border-color
@@ -89,11 +89,11 @@ $pagination--font-size: 0.8125rem
background: #eaeaea
.pagination--space
- width: 25px
background: #ffffff
border: 1px solid #ffffff
font-style: italic
padding: 3px 0
+ margin: 0 5px 0 0
.pagination--label
+flex(1)
Oops, something went wrong.

0 comments on commit f9216c7

Please sign in to comment.