Merge remote-tracking branch 'origin/dev' into fix/specify_watchers_link

Conflicts:
	doc/apiv3-documentation.apib

[ci skip]
pull/2345/head
Jan Sandbrink 10 years ago
commit 6bcb2b97d2
  1. 2
      .gitignore
  2. 2
      .rspec
  3. 2
      .travis.yml
  4. 13
      Gemfile
  5. 69
      Gemfile.lock
  6. 2
      Guardfile
  7. 2
      Rakefile
  8. BIN
      app/assets/fonts/lato/Lato-Bold.eot
  9. BIN
      app/assets/fonts/lato/Lato-Bold.ttf
  10. BIN
      app/assets/fonts/lato/Lato-Bold.woff
  11. BIN
      app/assets/fonts/lato/Lato-BoldItalic.eot
  12. BIN
      app/assets/fonts/lato/Lato-BoldItalic.ttf
  13. BIN
      app/assets/fonts/lato/Lato-BoldItalic.woff
  14. BIN
      app/assets/fonts/lato/Lato-Italic.eot
  15. BIN
      app/assets/fonts/lato/Lato-Italic.ttf
  16. BIN
      app/assets/fonts/lato/Lato-Italic.woff
  17. BIN
      app/assets/fonts/lato/Lato-Light.eot
  18. BIN
      app/assets/fonts/lato/Lato-Light.ttf
  19. BIN
      app/assets/fonts/lato/Lato-Light.woff
  20. BIN
      app/assets/fonts/lato/Lato-LightItalic.eot
  21. BIN
      app/assets/fonts/lato/Lato-LightItalic.ttf
  22. BIN
      app/assets/fonts/lato/Lato-LightItalic.woff
  23. BIN
      app/assets/fonts/lato/Lato-Regular.eot
  24. BIN
      app/assets/fonts/lato/Lato-Regular.ttf
  25. BIN
      app/assets/fonts/lato/Lato-Regular.woff
  26. 0
      app/assets/fonts/lato/OFL.txt
  27. 2
      app/assets/javascripts/accessibility.js
  28. 2
      app/assets/javascripts/action_menu.js
  29. 2
      app/assets/javascripts/admin_users.js
  30. 2
      app/assets/javascripts/ajaxappender.js
  31. 2
      app/assets/javascripts/autocomplete_textareas.js.erb
  32. 2
      app/assets/javascripts/autocompleter.js
  33. 2
      app/assets/javascripts/breadcrumb.js
  34. 2
      app/assets/javascripts/contextual_fieldset.js
  35. 2
      app/assets/javascripts/findDomElement.js
  36. 2
      app/assets/javascripts/jquery_noconflict.js
  37. 2
      app/assets/javascripts/jstoolbar.js
  38. 2
      app/assets/javascripts/keyboard_shortcuts.js
  39. 2
      app/assets/javascripts/members_form.js
  40. 2
      app/assets/javascripts/members_select_boxes.js
  41. 2
      app/assets/javascripts/modal.js
  42. 2
      app/assets/javascripts/openproject.js
  43. 2
      app/assets/javascripts/openproject_plugins.js.erb
  44. 2
      app/assets/javascripts/project/responsible_attribute.js
  45. 2
      app/assets/javascripts/repository_navigation.js
  46. 2
      app/assets/javascripts/select_list_move.js
  47. 2
      app/assets/javascripts/settings.js.erb
  48. 2
      app/assets/javascripts/specific/main_menu.js.erb
  49. 2
      app/assets/javascripts/specific/toggable_fieldset.js
  50. 2
      app/assets/javascripts/tab_handling.js
  51. 2
      app/assets/javascripts/timelines_modal.js
  52. 2
      app/assets/javascripts/timelines_select_boxes.js
  53. 2
      app/assets/javascripts/top-shelf.js
  54. 2
      app/assets/javascripts/top_menu.js
  55. 2
      app/assets/javascripts/types_checkboxes.js
  56. 2
      app/assets/javascripts/unsupported-browsers.js
  57. 2
      app/assets/javascripts/versions.js
  58. 2
      app/assets/javascripts/warn_leaving_unsaved.js
  59. 2
      app/assets/javascripts/work_packages.js.erb
  60. 2
      app/assets/stylesheets/_reset.sass
  61. 2
      app/assets/stylesheets/accessibility.css
  62. 2
      app/assets/stylesheets/content/_accounts.sass
  63. 2
      app/assets/stylesheets/content/_action_menu_main.sass
  64. 2
      app/assets/stylesheets/content/_boxes.sass
  65. 2
      app/assets/stylesheets/content/_buttons.sass
  66. 2
      app/assets/stylesheets/content/_calendar.sass
  67. 2
      app/assets/stylesheets/content/_components_add_comments_default.sass
  68. 2
      app/assets/stylesheets/content/_components_add_comments_onclick.sass
  69. 2
      app/assets/stylesheets/content/_context_menu.sass
  70. 2
      app/assets/stylesheets/content/_control_colors.sass
  71. 2
      app/assets/stylesheets/content/_expandable_group_content.sass
  72. 19
      app/assets/stylesheets/content/_flash_messages.sass
  73. 2
      app/assets/stylesheets/content/_form_elements_input_textarea.sass
  74. 2
      app/assets/stylesheets/content/_forms.sass
  75. 2
      app/assets/stylesheets/content/_grid_table.sass
  76. 2
      app/assets/stylesheets/content/_headings.sass
  77. 20
      app/assets/stylesheets/content/_in_place_editing.sass
  78. 2
      app/assets/stylesheets/content/_journal.sass
  79. 2
      app/assets/stylesheets/content/_legacy_actions.sass
  80. 2
      app/assets/stylesheets/content/_links.sass
  81. 2
      app/assets/stylesheets/content/_modal.sass
  82. 2
      app/assets/stylesheets/content/_my_page.sass
  83. 2
      app/assets/stylesheets/content/_pagination.sass
  84. 2
      app/assets/stylesheets/content/_preview.sass
  85. 2
      app/assets/stylesheets/content/_progress_bar.sass
  86. 2
      app/assets/stylesheets/content/_tabular.sass
  87. 2
      app/assets/stylesheets/content/_timelines.sass
  88. 2
      app/assets/stylesheets/content/_user_avatars.sass
  89. 2
      app/assets/stylesheets/content/_watchers.sass
  90. 2
      app/assets/stylesheets/content/_wiki.sass
  91. 2
      app/assets/stylesheets/content/_work_packages.sass
  92. 2
      app/assets/stylesheets/content/_work_packages_filters.sass
  93. 2
      app/assets/stylesheets/content/_work_packages_table.sass
  94. 2
      app/assets/stylesheets/content/work_package_details/_activities_tab.sass
  95. 2
      app/assets/stylesheets/content/work_package_details/_attachments_tab.sass
  96. 2
      app/assets/stylesheets/content/work_package_details/_overview_tab.sass
  97. 16
      app/assets/stylesheets/content/work_package_details/_relations_tab.sass
  98. 2
      app/assets/stylesheets/content/work_package_details/_tables.sass
  99. 2
      app/assets/stylesheets/content/work_package_details/_watchers_tab.sass
  100. 2
      app/assets/stylesheets/context_menu_rtl.css
  101. Some files were not shown because too many files have changed in this diff Show More

2
.gitignore vendored

@ -1,6 +1,6 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
@ -122,6 +122,9 @@ gem 'i18n', '>=0.6.8'
gem 'nokogiri', '>=1.5.11'
# see https://groups.google.com/forum/#!topic/ruby-security-ann/DeJpjTAg1FA
gem 'carrierwave', '~> 0.10.0'
gem 'fog', '~> 1.23.0', require: "fog/aws/storage"
group :test do
gem 'rack-test', '~> 0.6.2'
gem 'shoulda'
@ -173,14 +176,14 @@ group :development, :test do
gem 'pry-rails'
gem 'pry-stack_explorer'
gem 'pry-rescue'
gem 'pry-byebug', :platforms => [:mri_20,:mri_21]
gem 'pry-byebug', :platforms => [:mri]
gem 'pry-doc'
end
# API gems
gem 'grape', '~> 0.9.0'
gem 'roar', '~> 1.0.0.beta2'
gem 'reform', '~> 1.1.1', require: false
gem 'grape', '~> 0.10.1'
gem 'roar', '~> 1.0.0'
gem 'reform', '~> 1.2.4', require: false
# Use the commented pure ruby gems, if you have not the needed prerequisites on
# board to compile the native ones. Note, that their use is discouraged, since

@ -110,6 +110,11 @@ GEM
xpath (~> 2.0)
capybara-screenshot (0.3.6)
capybara (>= 1.0, < 3)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
childprocess (0.5.3)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.0.3)
@ -151,12 +156,13 @@ GEM
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
disposable (0.0.8)
disposable (0.0.9)
representable (~> 2.0)
uber
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.3)
excon (0.42.1)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
@ -167,6 +173,30 @@ GEM
faker (1.2.0)
i18n (~> 0.5)
ffi (1.9.3)
fog (1.23.0)
fog-brightbox
fog-core (~> 1.23)
fog-json
fog-softlayer
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
fog-brightbox (0.7.1)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.25.0)
builder
excon (~> 0.38)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
fog-json (1.0.0)
multi_json (~> 1.0)
fog-softlayer (0.3.25)
fog-core
fog-json
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
globalize (3.0.0)
@ -176,7 +206,7 @@ GEM
gon (4.0.0)
actionpack (>= 2.3.0)
json
grape (0.9.0)
grape (0.10.1)
activesupport
builder
hashie (>= 2.1.0)
@ -192,8 +222,10 @@ GEM
hooks (0.3.3)
htmldiff (0.0.1)
i18n (0.6.11)
ice_nine (0.11.0)
ice_nine (0.11.1)
inflecto (0.0.2)
interception (0.3)
ipaddress (0.8.0)
iso8601 (0.8.2)
journey (1.0.4)
json (1.8.1)
@ -218,7 +250,7 @@ GEM
metaclass (0.0.1)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
mini_portile (0.6.2)
minisyntax (0.2.3)
mocha (0.13.3)
metaclass (~> 0.0.1)
@ -227,8 +259,11 @@ GEM
multi_xml (0.5.5)
mysql2 (0.3.11)
net-ldap (0.8.0)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
non-stupid-digest-assets (1.0.4)
object-daddy (1.1.1)
oj (2.1.6)
@ -304,17 +339,17 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.0.0)
reform (1.1.1)
reform (1.2.4)
activemodel
disposable (~> 0.0.5)
representable (~> 2.0.3)
uber (~> 0.0.8)
representable (2.0.4)
representable (~> 2.1.0)
uber (~> 0.0.11)
representable (2.1.3)
multi_json
nokogiri
uber (~> 0.0.7)
request_store (1.1.0)
roar (1.0.0.beta2)
roar (1.0.0)
representable (>= 2.0.1, <= 3.0.0)
rspec (2.99.0)
rspec-core (~> 2.99.0)
@ -387,7 +422,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.42)
uber (0.0.10)
uber (0.0.12)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@ -395,7 +430,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
virtus (1.0.3)
virtus (1.0.4)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
@ -418,6 +453,7 @@ DEPENDENCIES
bourbon (~> 4.0)
capybara (~> 2.3.0)
capybara-screenshot
carrierwave (~> 0.10.0)
cocaine
codeclimate-test-reporter
coderay (~> 1.0.5)
@ -431,9 +467,10 @@ DEPENDENCIES
delayed_job_active_record (= 0.3.3)
factory_girl_rails (~> 4.0)
faker
fog (~> 1.23.0)
globalize
gon (~> 4.0)
grape (~> 0.9.0)
grape (~> 0.10.1)
gravatar_image_tag (~> 1.2.0)
htmldiff
i18n (>= 0.6.8)
@ -468,9 +505,9 @@ DEPENDENCIES
rails_autolink
rb-readline (~> 0.5.1)
rdoc (>= 2.4.2)
reform (~> 1.1.1)
reform (~> 1.2.4)
request_store
roar (~> 1.0.0.beta2)
roar (~> 1.0.0)
rspec (~> 2.99.0)
rspec-activemodel-mocks
rspec-example_disabler!

@ -1,6 +1,6 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.

@ -1,7 +1,7 @@
#!/usr/bin/env rake
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
/*-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
@ -28,7 +28,7 @@
@import global/all
#errorExplanation, div.flash, .nodata, .warning
#errorExplanation, .flash, .nodata, .warning
padding: 4px
margin: 0 0 10px 0
color: $content_flash_msg_font_color
@ -36,13 +36,13 @@
%absolute-layout-mode &
height: $content-flash-height
div.flash.error a:link, div.flash.warning a:link, div.flash.notice a:link, #errorExplanation a:link,
div.flash.error a:hover, div.flash.warning a:hover, div.flash.notice a:hover, #errorExplanation a:hover
.flash.error a:link, .flash.warning a:link, .flash.notice a:link, #errorExplanation a:link,
.flash.error a:hover, .flash.warning a:hover, .flash.notice a:hover, #errorExplanation a:hover
@include default-font-normal($content_flash_msg_font_color)
text-decoration: none
cursor: default
div.flash
.flash
display: none
&.ng-leave
@ -61,11 +61,14 @@ div.flash
h2, p
@extend .hidden-for-sighted
div.flash.error, #errorExplanation
.flash.error, #errorExplanation
background-color: $content_flash_error_msg_bg_color
div.flash.notice
.flash.notice
background-color: $content_flash_notice_msg_bg_color
div.flash.warning, .nodata, .warning
.flash.warning, .nodata, .warning
background-color: $content_flash_warning_msg_bg_color
.flash.permanent
display: block

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -47,7 +47,7 @@
&.default
span
font-style: italic
&:hover
&.editable:hover
outline: 1px solid #cacaca
cursor: pointer
.editing-link-wrapper a
@ -137,18 +137,26 @@
&.type-select2
display: inline-block
width: 344px
.select2-display-none
display: none
.ui-select-choices
max-height: 100px
input[type='text']
width: 100%
.ined-errors
bottom: -49px
left: -26px
bottom: -41px
left: 119px
width: 225px
.ined-controls
bottom: -28px
bottom: -27px
left: 0
.ined-edit
height: 75px
height: 175px
.ined-read-value
position: relative
display: block
margin: 3px
&:hover
&.editable:hover
outline: 1px solid #cacaca
.editing-link-wrapper
position: absolute

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
@ -37,8 +37,12 @@
color: inherit
.add-relation
.related-issue-candidates ul li
width: 400px
text-overflow: ellipsis
white-space: nowrap
overflow: hidden
.select2
width: 350px
.select2-display-none
display: none
.select2-drop
width: 350px
top: auto
input[type='text']
width: 100%

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.

@ -1,6 +1,6 @@
/*-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save