Permalink
Browse files

Release openproject-ce v5.0.2

  • Loading branch information...
2 parents 0744848 + bcac975 commit 2d26dbd27b6eff26a5a6e8b383fe49662cbed8e9 @oliverguenther oliverguenther committed Nov 24, 2015
Showing with 286 additions and 203 deletions.
  1. +57 −57 Gemfile.lock
  2. +1 −1 Gemfile.plugins
  3. +3 −0 app/assets/stylesheets/_jstoolbar.sass
  4. +17 −4 app/assets/stylesheets/_misc_legacy.sass
  5. +6 −0 app/assets/stylesheets/_work_packages_show_view_overwrite.scss
  6. +15 −0 app/assets/stylesheets/content/_buttons.sass
  7. +2 −2 app/assets/stylesheets/content/_in_place_editing.sass
  8. +4 −28 app/assets/stylesheets/content/_legacy_actions.sass
  9. +3 −0 app/assets/stylesheets/content/_wiki.sass
  10. +1 −1 app/assets/stylesheets/layout/_base.sass
  11. +33 −28 app/assets/stylesheets/layout/_drop_down.sass
  12. +11 −1 app/assets/stylesheets/layout/_toolbar.sass
  13. +14 −1 app/assets/stylesheets/layout/_top_menu.sass
  14. +7 −4 app/assets/stylesheets/layout/_work_package.sass
  15. +4 −2 app/helpers/watchers_helper.rb
  16. +6 −6 app/seeders/basic_data/role_seeder.rb
  17. +5 −0 app/services/scm/checkout_instructions_service.rb
  18. +1 −3 app/views/boards/show.html.erb
  19. +20 −14 app/views/layouts/_action_menu_base.html.erb
  20. +40 −25 app/views/messages/show.html.erb
  21. +1 −4 app/views/news/show.html.erb
  22. +1 −1 app/views/projects/settings/_boards.html.erb
  23. +1 −1 app/views/projects/settings/_versions.html.erb
  24. +11 −0 app/views/repositories/_checkout_instructions.html.erb
  25. +1 −1 app/views/repositories/_repository_header.html.erb
  26. +2 −2 app/views/wiki/show.html.erb
  27. +1 −1 config/locales/en.yml
  28. +1 −1 doc/operation_guides/manual/installation-guide.md
  29. +5 −1 doc/operation_guides/packager/installation-guide.md
  30. +10 −13 frontend/app/routing.js
  31. +1 −0 frontend/app/timelines/models/mixins/ui.js
  32. +1 −1 lib/open_project/version.rb
View
@@ -41,132 +41,132 @@ GIT
GIT
remote: https://github.com/finnlabs/openproject-announcements.git
- revision: bbfcbc49f7871250f4bcf9ed3f04d43874d90aa6
- tag: v5.0.1
+ revision: dfcb0b88acdbc2969ea939786db0ec3c7b70d128
+ tag: v5.0.2
specs:
- openproject-announcements (5.0.1)
+ openproject-announcements (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-backlogs.git
- revision: 42eb9ee6a74a6d82ddd7d4f66ed46dc28c4bab79
- tag: v5.0.1
+ revision: 9bde7956fbe4b8c75ced4358245ffa6bd254b57f
+ tag: v5.0.2
specs:
- openproject-backlogs (5.0.1)
+ openproject-backlogs (5.0.2)
acts_as_silent_list (~> 2.0.0)
openproject-pdf_export
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-costs.git
- revision: 33b8eddcafffcd01d8ce31a690cceb7978ee08d5
- tag: v5.0.1
+ revision: 0328768c252aaa0efe95b2c8a08511696df229a6
+ tag: v5.0.2
specs:
- openproject-costs (5.0.1)
+ openproject-costs (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-github_integration
- revision: a6cd0b74e1e6744ae714010056284ebd9afa8570
- tag: v5.0.1
+ revision: e823005413349c6b5f057eefb11b09700fed9b3e
+ tag: v5.0.2
specs:
- openproject-github_integration (5.0.1)
- openproject-webhooks (~> 5.0.0.pre.alpha)
+ openproject-github_integration (5.0.2)
+ openproject-webhooks (~> 5.0.1)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-global_roles.git
- revision: c8d46fe4a228566e9dccd70f5a81a2f33482989e
- tag: v5.0.1
+ revision: e248a767aeb40ade8343cad35d8eb934e3dd0228
+ tag: v5.0.2
specs:
- openproject-global_roles (5.0.1)
+ openproject-global_roles (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-help_link.git
- revision: ad2a68ae861ab79537a145c61326c9d8fb43e4f9
- tag: v5.0.1
+ revision: b20ac0cd02ead5c1550c6fa8873ea2f7a183cb13
+ tag: v5.0.2
specs:
- openproject-help_link (5.0.1)
+ openproject-help_link (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-local_avatars
- revision: 0225dbedf597335c9332887259bd898d509f4214
- tag: v5.0.1
+ revision: 976c93398c9a0f0403e251ef92ab530e257fe8d9
+ tag: v5.0.2
specs:
- openproject-local_avatars (5.0.1)
+ openproject-local_avatars (5.0.2)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
GIT
remote: https://github.com/finnlabs/openproject-meeting.git
- revision: 7d463eabac29c4024b4b513d9c0d8313e4a6c1a8
- tag: v5.0.1
+ revision: dac76b566e20ec8a4c305d998643a99fb90f3749
+ tag: v5.0.2
specs:
- openproject-meeting (5.0.1)
+ openproject-meeting (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-my_project_page.git
- revision: 3780fcdf843058d298f8e2812036de3b297f1868
- tag: v5.0.1
+ revision: 041425b20d3f1993e67594007b69e48492a98144
+ tag: v5.0.2
specs:
- openproject-my_project_page (5.0.1)
+ openproject-my_project_page (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-openid_connect.git
- revision: 419839c1e94047747e4d7795fbfd4b39995c7f57
- tag: v5.0.1
+ revision: 406ca7474a223ab3c35af5b8d34f0ad83442409e
+ tag: v5.0.2
specs:
- openproject-openid_connect (5.0.1)
+ openproject-openid_connect (5.0.2)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
- openproject-auth_plugins (~> 5.0.0.pre.alpha)
+ openproject-auth_plugins (~> 5.0.1)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-pdf_export.git
- revision: a3d3bede5035820ea29aa5e849a280fccdef5d1a
- tag: v5.0.1
+ revision: 16f62d8caa2c8f7b839d5a6174783df2354471fd
+ tag: v5.0.2
specs:
- openproject-pdf_export (5.0.1)
+ openproject-pdf_export (5.0.2)
prawn (~> 0.14.0)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-reporting.git
- revision: 7c179092f7f12d91b83926159e40c3ea9a1c2588
- tag: v5.0.1
+ revision: d3c222debce944e053f09f082aa721bfd666c945
+ tag: v5.0.2
specs:
- openproject-reporting (5.0.1)
- openproject-costs (>= 4.0.0)
+ openproject-reporting (5.0.2)
+ openproject-costs (>= 5.0.1)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
GIT
remote: https://github.com/finnlabs/openproject-themes-dark.git
- revision: 8f7c36bda738d8546f331b6a77a2eb009084e924
- tag: v5.0.1
+ revision: fd64af2c91d9cd02f787f9b02ff3a9e8894d604d
+ tag: v5.0.2
specs:
- openproject-themes-dark (5.0.1)
+ openproject-themes-dark (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-webhooks
- revision: 3e354f3da1cbe75f0e72740ce80ece32d2cacdd5
- tag: v5.0.1
+ revision: c6b8f4b42bf222dd87bdb6c44aa4458d40dc849d
+ tag: v5.0.2
specs:
- openproject-webhooks (5.0.1)
+ openproject-webhooks (5.0.2)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-xls_export.git
- revision: 2cc0488cb91dc4f4c9baef0115542bda1b5fbc7a
- tag: v5.0.1
+ revision: 9dcdc78d19e60ba88c00fbdef4c9e72d38fd0057
+ tag: v5.0.2
specs:
- openproject-xls_export (5.0.1)
+ openproject-xls_export (5.0.2)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
@@ -203,19 +203,19 @@ GIT
GIT
remote: https://github.com/opf/openproject-auth_plugins.git
- revision: cc485a7946e19db44beebc4686a316c09fa30579
- tag: v5.0.1
+ revision: 9ceb40e088f92f9d0f681f2ba7cc4b1d00cb4e25
+ tag: v5.0.2
specs:
- openproject-auth_plugins (5.0.1)
+ openproject-auth_plugins (5.0.2)
omniauth (~> 1.0)
rails (~> 4.2.4)
GIT
remote: https://github.com/opf/openproject-documents.git
- revision: fe164cf9a1b6a2b00eeb5907e865d7806f3a2eeb
- tag: v5.0.1
+ revision: 3271435a62accbf76d43c8a6c401518d94f6d7f4
+ tag: v5.0.2
specs:
- openproject-documents (5.0.1)
+ openproject-documents (5.0.2)
rails (~> 4.2.4)
GIT
@@ -228,10 +228,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 2be19365a32c0769cf3c4c86b8e1afe891844883
+ revision: 5bdea3f0cc4764efe344de7f477d38d7e032070b
branch: release/5.0
specs:
- openproject-translations (5.0.0.pre.alpha)
+ openproject-translations (5.0.2)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
@@ -519,7 +519,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
netrc (0.11.0)
- nokogiri (1.6.6.2)
+ nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
non-stupid-digest-assets (1.0.4)
oj (2.11.5)
View
@@ -1,4 +1,4 @@
-CORE_VERSION = 'v5.0.1'
+CORE_VERSION = 'v5.0.2'
# the dependencies from the gemspec from a git repo are ignored
# see also https://github.com/bundler/bundler/issues/1041
@@ -42,6 +42,9 @@ $jstoolbar--icon-active-background: #eee
textarea, iframe
margin: 0
+ textarea
+ min-height: 200px
+
.jstHandle
height: 10px
font-size: 0.1em
@@ -214,6 +214,19 @@ div
text-overflow: ellipsis
white-space: nowrap
overflow: hidden
+
+ &.message-title
+ padding-top: 12px
+ padding-bottom: 19px
+ white-space: normal
+ overflow: visible
+ float: left
+
+ &.messages-wrapper
+ @include clearfix
+ .toolbar-container
+ float: right
+
ul
margin: 0
text-align: right
@@ -440,7 +453,7 @@ div.issue hr
margin-bottom: 6px
#content
- min-height: 250px
+ min-height: 300px
h3
margin: 12px 0 6px
@@ -557,9 +570,6 @@ th.checkbox img
p.buttons
margin-left: 10px
-div.contextual > a.icon, p.buttons > a, ul.action_menu_main > li
- padding-right: 10px
-
strong.related-issues-heading
display: block
margin-top: 10px
@@ -617,6 +627,9 @@ input::-webkit-input-placeholder, :-moz-placeholder
#modalDiv
padding: 2em 0 0 1.5em
+ &.-full
+ padding: 0
+
h4.comment
margin-bottom: 8px
margin-top: 18px
@@ -97,6 +97,12 @@ body.controller-work_packages.action-show {
}
}
+ &.edit-all-mode {
+ .work-packages--left-panel {
+ height: calc(100% - 55px);
+ }
+ }
+
.work-packages--split-view {
overflow: visible !important;
}
@@ -131,3 +131,18 @@ a.button
&:before
@extend .icon-pulldown-arrow1:before
+
+// hack around the old watchers_link implementation
+a.watcher_link
+ color: $button--font-color
+ text-decoration: none
+
+ &:before
+ margin-right: $button--text-icon-spacing
+
+// hack around the old markup (icon class applied on <a>)
+// which is used for toolbar-items to add space after icons inside buttons
+.toolbar-item
+ .button[class*='icon-']
+ &:before
+ margin-right: $button--text-icon-spacing
@@ -300,8 +300,8 @@ a.inplace-editing--trigger-link,
&.edit-strategy-textarea
margin-top: auto
-.jstElements
- margin-bottom: 18px !important
+ .jstElements
+ margin-bottom: 18px !important
// Explicit styles for input-esque trigger appearance
.work-packages--activity--add-comment,
@@ -45,6 +45,7 @@
ul.legacy-actions-main
@include legacy-actions-defaults
+ margin-left: 20px
ul.legacy-actions-specific,
.nosidebar ul.legacy-actions-specific
@@ -53,33 +54,6 @@ ul.legacy-actions-specific,
p.subtitle + ul.legacy-actions-specific
@include legacy-actions-defaults(-57px)
-ul.legacy-actions-more
- margin: 0
- list-style-type: none
- font-size: 0.9rem
-
- position: absolute
- top: 23px
- right: 0
- z-index: 100
- white-space: nowrap
- padding: 5px 0 5px 0
-
- background: white
- border: 1px solid #B7B7B7
-
- box-shadow: 1px 1px 2px #aaa
- > li
- [class^="icon-"]:before
- vertical-align: -1px
- a
- padding: 2.5px 10px 2.5px 10px
- display: block
- &:hover
- background-color: #F0F0F0
-
-
-
#lower-title-bar ul.legacy-actions-specific
@include legacy-actions-defaults
padding-top: 10px
@@ -93,7 +67,9 @@ ul.legacy-actions-more
position: relative
.message-reply-menu
- @include contextual(-39px)
+ @include contextual(-60px)
+ > .button
+ margin-right: 0
.legacy-actions--inline-label
@extend .inline-label
@@ -169,3 +169,6 @@ blockquote
bottom: 10px
right: 15px
padding: 0 0 0 0
+
+.toolbar-container + .wiki-content
+ margin-top: -64px
Oops, something went wrong.

0 comments on commit 2d26dbd

Please sign in to comment.