Compare commits

...

7 Commits

Author SHA1 Message Date
  guange 45532b7e6b w32console 11 years ago
  guange ca287be3bb merge 11 years ago
  guange 88456379bd merge 11 years ago
  guange 67823b3bfb 解决ke高度加载问题 11 years ago
  guange 2a4a4bd034 asset启用完成 11 years ago
  guange 4019e2b29c 修改成assets方式 11 years ago
  guange 96de36802e 三个文件无用,删除 11 years ago
100 changed files with 19 additions and 23 deletions
Unified View
  1. +14
    -11
      Gemfile
  2. +5
    -6
      app/assets/javascripts/application.js
  3. +0
    -2
      app/assets/javascripts/applied_project.js
  4. +0
    -2
      app/assets/javascripts/apply_project_masters.js
  5. +0
    -2
      app/assets/javascripts/attachment_type_edit.js
  6. +0
    -0
      app/assets/javascripts/attachments.js
  7. +0
    -0
      app/assets/javascripts/avatars.js
  8. +0
    -0
      app/assets/javascripts/baiduTemplate.js
  9. +0
    -0
      app/assets/javascripts/blog.js
  10. +0
    -0
      app/assets/javascripts/bootstrap.js
  11. +0
    -0
      app/assets/javascripts/bootstrap/affix.js
  12. +0
    -0
      app/assets/javascripts/bootstrap/alert.js
  13. +0
    -0
      app/assets/javascripts/bootstrap/bootstrap.min.js
  14. +0
    -0
      app/assets/javascripts/bootstrap/button.js
  15. +0
    -0
      app/assets/javascripts/bootstrap/carousel.js
  16. +0
    -0
      app/assets/javascripts/bootstrap/collapse.js
  17. +0
    -0
      app/assets/javascripts/bootstrap/dropdown.js
  18. +0
    -0
      app/assets/javascripts/bootstrap/jquery.transition.min.js
  19. +0
    -0
      app/assets/javascripts/bootstrap/modal.js
  20. +0
    -0
      app/assets/javascripts/bootstrap/popover.js
  21. +0
    -0
      app/assets/javascripts/bootstrap/scrollspy.js
  22. +0
    -0
      app/assets/javascripts/bootstrap/tab.js
  23. +0
    -0
      app/assets/javascripts/bootstrap/tooltip.js
  24. +0
    -0
      app/assets/javascripts/bootstrap/transition.js
  25. +0
    -0
      app/assets/javascripts/ckeditor/CHANGES.md
  26. +0
    -0
      app/assets/javascripts/ckeditor/LICENSE.md
  27. +0
    -0
      app/assets/javascripts/ckeditor/README.md
  28. +0
    -0
      app/assets/javascripts/ckeditor/adapters/jquery.js
  29. +0
    -0
      app/assets/javascripts/ckeditor/build-config.js
  30. +0
    -0
      app/assets/javascripts/ckeditor/ckeditor.js
  31. +0
    -0
      app/assets/javascripts/ckeditor/config.js
  32. +0
    -0
      app/assets/javascripts/ckeditor/contents.css
  33. +0
    -0
      app/assets/javascripts/ckeditor/lang/af.js
  34. +0
    -0
      app/assets/javascripts/ckeditor/lang/ar.js
  35. +0
    -0
      app/assets/javascripts/ckeditor/lang/bg.js
  36. +0
    -0
      app/assets/javascripts/ckeditor/lang/bn.js
  37. +0
    -0
      app/assets/javascripts/ckeditor/lang/bs.js
  38. +0
    -0
      app/assets/javascripts/ckeditor/lang/ca.js
  39. +0
    -0
      app/assets/javascripts/ckeditor/lang/cs.js
  40. +0
    -0
      app/assets/javascripts/ckeditor/lang/cy.js
  41. +0
    -0
      app/assets/javascripts/ckeditor/lang/da.js
  42. +0
    -0
      app/assets/javascripts/ckeditor/lang/de.js
  43. +0
    -0
      app/assets/javascripts/ckeditor/lang/el.js
  44. +0
    -0
      app/assets/javascripts/ckeditor/lang/en-au.js
  45. +0
    -0
      app/assets/javascripts/ckeditor/lang/en-ca.js
  46. +0
    -0
      app/assets/javascripts/ckeditor/lang/en-gb.js
  47. +0
    -0
      app/assets/javascripts/ckeditor/lang/en.js
  48. +0
    -0
      app/assets/javascripts/ckeditor/lang/eo.js
  49. +0
    -0
      app/assets/javascripts/ckeditor/lang/es.js
  50. +0
    -0
      app/assets/javascripts/ckeditor/lang/et.js
  51. +0
    -0
      app/assets/javascripts/ckeditor/lang/eu.js
  52. +0
    -0
      app/assets/javascripts/ckeditor/lang/fa.js
  53. +0
    -0
      app/assets/javascripts/ckeditor/lang/fi.js
  54. +0
    -0
      app/assets/javascripts/ckeditor/lang/fo.js
  55. +0
    -0
      app/assets/javascripts/ckeditor/lang/fr-ca.js
  56. +0
    -0
      app/assets/javascripts/ckeditor/lang/fr.js
  57. +0
    -0
      app/assets/javascripts/ckeditor/lang/gl.js
  58. +0
    -0
      app/assets/javascripts/ckeditor/lang/gu.js
  59. +0
    -0
      app/assets/javascripts/ckeditor/lang/he.js
  60. +0
    -0
      app/assets/javascripts/ckeditor/lang/hi.js
  61. +0
    -0
      app/assets/javascripts/ckeditor/lang/hr.js
  62. +0
    -0
      app/assets/javascripts/ckeditor/lang/hu.js
  63. +0
    -0
      app/assets/javascripts/ckeditor/lang/id.js
  64. +0
    -0
      app/assets/javascripts/ckeditor/lang/is.js
  65. +0
    -0
      app/assets/javascripts/ckeditor/lang/it.js
  66. +0
    -0
      app/assets/javascripts/ckeditor/lang/ja.js
  67. +0
    -0
      app/assets/javascripts/ckeditor/lang/ka.js
  68. +0
    -0
      app/assets/javascripts/ckeditor/lang/km.js
  69. +0
    -0
      app/assets/javascripts/ckeditor/lang/ko.js
  70. +0
    -0
      app/assets/javascripts/ckeditor/lang/ku.js
  71. +0
    -0
      app/assets/javascripts/ckeditor/lang/lt.js
  72. +0
    -0
      app/assets/javascripts/ckeditor/lang/lv.js
  73. +0
    -0
      app/assets/javascripts/ckeditor/lang/mk.js
  74. +0
    -0
      app/assets/javascripts/ckeditor/lang/mn.js
  75. +0
    -0
      app/assets/javascripts/ckeditor/lang/ms.js
  76. +0
    -0
      app/assets/javascripts/ckeditor/lang/nb.js
  77. +0
    -0
      app/assets/javascripts/ckeditor/lang/nl.js
  78. +0
    -0
      app/assets/javascripts/ckeditor/lang/no.js
  79. +0
    -0
      app/assets/javascripts/ckeditor/lang/pl.js
  80. +0
    -0
      app/assets/javascripts/ckeditor/lang/pt-br.js
  81. +0
    -0
      app/assets/javascripts/ckeditor/lang/pt.js
  82. +0
    -0
      app/assets/javascripts/ckeditor/lang/ro.js
  83. +0
    -0
      app/assets/javascripts/ckeditor/lang/ru.js
  84. +0
    -0
      app/assets/javascripts/ckeditor/lang/si.js
  85. +0
    -0
      app/assets/javascripts/ckeditor/lang/sk.js
  86. +0
    -0
      app/assets/javascripts/ckeditor/lang/sl.js
  87. +0
    -0
      app/assets/javascripts/ckeditor/lang/sq.js
  88. +0
    -0
      app/assets/javascripts/ckeditor/lang/sr-latn.js
  89. +0
    -0
      app/assets/javascripts/ckeditor/lang/sr.js
  90. +0
    -0
      app/assets/javascripts/ckeditor/lang/sv.js
  91. +0
    -0
      app/assets/javascripts/ckeditor/lang/th.js
  92. +0
    -0
      app/assets/javascripts/ckeditor/lang/tr.js
  93. +0
    -0
      app/assets/javascripts/ckeditor/lang/ug.js
  94. +0
    -0
      app/assets/javascripts/ckeditor/lang/uk.js
  95. +0
    -0
      app/assets/javascripts/ckeditor/lang/vi.js
  96. +0
    -0
      app/assets/javascripts/ckeditor/lang/zh-cn.js
  97. +0
    -0
      app/assets/javascripts/ckeditor/lang/zh.js
  98. +0
    -0
      app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
  99. +0
    -0
      app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
  100. +0
    -0
      app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js

+ 14
- 11
Gemfile View File

@@ -44,20 +44,23 @@ group :development do
gem 'grape-swagger' gem 'grape-swagger'
gem 'better_errors', '~> 1.1.0' gem 'better_errors', '~> 1.1.0'
gem 'rack-mini-profiler', '~> 0.9.3' gem 'rack-mini-profiler', '~> 0.9.3'
gem 'win32console'
if RUBY_PLATFORM =~ /w32/
gem 'win32console'
end
end end
group :development, :test do
unless RUBY_PLATFORM =~ /w32/
gem 'pry-rails'
if RUBY_VERSION >= '2.0.0'
gem 'pry-byebug'
end
gem 'pry-stack_explorer'
if RUBY_PLATFORM =~ /darwin/
gem 'puma'
unless RUBY_PLATFORM =~ /w32/
gem 'pry-rails'
if RUBY_VERSION >= '2.0.0'
gem 'pry-byebug'
end end
gem 'pry-stack_explorer'
if RUBY_PLATFORM =~ /darwin/
#gem 'puma'
end end
end
group :development, :test do
gem 'rspec-rails', '~> 3.0' gem 'rspec-rails', '~> 3.0'
gem 'factory_girl_rails' gem 'factory_girl_rails'
@@ -70,7 +73,7 @@ group :assets do
gem 'coffee-rails', '~> 3.2.1' gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes # See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platforms => :ruby
#gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3' gem 'uglifier', '>= 1.0.3'
end end


public/javascripts/application.js → app/assets/javascripts/application.js View File

@@ -1,9 +1,8 @@
//= require_directory ./rateable
//= require jquery.min
//= require jquery.infinitescroll

/* Redmine - project management software
Copyright (C) 2006-2013 Jean-Philippe Lang */
//= require jquery-1.8.3-ui-1.9.2-ujs-2.0.3
//= require jquery.colorbox-min
//= require kindeditor
//= require pasteimg
//= require init_activity_KindEditor


function cleanArray (actual){ function cleanArray (actual){
var newArray = new Array(); var newArray = new Array();

+ 0
- 2
app/assets/javascripts/applied_project.js View File

@@ -1,2 +0,0 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.

+ 0
- 2
app/assets/javascripts/apply_project_masters.js View File

@@ -1,2 +0,0 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.

+ 0
- 2
app/assets/javascripts/attachment_type_edit.js View File

@@ -1,2 +0,0 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.

public/javascripts/attachments.js → app/assets/javascripts/attachments.js View File


public/javascripts/avatars.js → app/assets/javascripts/avatars.js View File


public/javascripts/baiduTemplate.js → app/assets/javascripts/baiduTemplate.js View File


public/javascripts/blog.js → app/assets/javascripts/blog.js View File


public/javascripts/bootstrap.js → app/assets/javascripts/bootstrap.js View File


public/javascripts/bootstrap/affix.js → app/assets/javascripts/bootstrap/affix.js View File


public/javascripts/bootstrap/alert.js → app/assets/javascripts/bootstrap/alert.js View File


public/javascripts/bootstrap/bootstrap.min.js → app/assets/javascripts/bootstrap/bootstrap.min.js View File


public/javascripts/bootstrap/button.js → app/assets/javascripts/bootstrap/button.js View File


public/javascripts/bootstrap/carousel.js → app/assets/javascripts/bootstrap/carousel.js View File


public/javascripts/bootstrap/collapse.js → app/assets/javascripts/bootstrap/collapse.js View File


public/javascripts/bootstrap/dropdown.js → app/assets/javascripts/bootstrap/dropdown.js View File


public/javascripts/bootstrap/jquery.transition.min.js → app/assets/javascripts/bootstrap/jquery.transition.min.js View File


public/javascripts/bootstrap/modal.js → app/assets/javascripts/bootstrap/modal.js View File


public/javascripts/bootstrap/popover.js → app/assets/javascripts/bootstrap/popover.js View File


public/javascripts/bootstrap/scrollspy.js → app/assets/javascripts/bootstrap/scrollspy.js View File


public/javascripts/bootstrap/tab.js → app/assets/javascripts/bootstrap/tab.js View File


public/javascripts/bootstrap/tooltip.js → app/assets/javascripts/bootstrap/tooltip.js View File


public/javascripts/bootstrap/transition.js → app/assets/javascripts/bootstrap/transition.js View File


public/javascripts/ckeditor/CHANGES.md → app/assets/javascripts/ckeditor/CHANGES.md View File


public/javascripts/ckeditor/LICENSE.md → app/assets/javascripts/ckeditor/LICENSE.md View File


public/javascripts/ckeditor/README.md → app/assets/javascripts/ckeditor/README.md View File


public/javascripts/ckeditor/adapters/jquery.js → app/assets/javascripts/ckeditor/adapters/jquery.js View File


public/javascripts/ckeditor/build-config.js → app/assets/javascripts/ckeditor/build-config.js View File


public/javascripts/ckeditor/ckeditor.js → app/assets/javascripts/ckeditor/ckeditor.js View File


public/javascripts/ckeditor/config.js → app/assets/javascripts/ckeditor/config.js View File


public/javascripts/ckeditor/contents.css → app/assets/javascripts/ckeditor/contents.css View File


public/javascripts/ckeditor/lang/af.js → app/assets/javascripts/ckeditor/lang/af.js View File


public/javascripts/ckeditor/lang/ar.js → app/assets/javascripts/ckeditor/lang/ar.js View File


public/javascripts/ckeditor/lang/bg.js → app/assets/javascripts/ckeditor/lang/bg.js View File


public/javascripts/ckeditor/lang/bn.js → app/assets/javascripts/ckeditor/lang/bn.js View File


public/javascripts/ckeditor/lang/bs.js → app/assets/javascripts/ckeditor/lang/bs.js View File


public/javascripts/ckeditor/lang/ca.js → app/assets/javascripts/ckeditor/lang/ca.js View File


public/javascripts/ckeditor/lang/cs.js → app/assets/javascripts/ckeditor/lang/cs.js View File


public/javascripts/ckeditor/lang/cy.js → app/assets/javascripts/ckeditor/lang/cy.js View File


public/javascripts/ckeditor/lang/da.js → app/assets/javascripts/ckeditor/lang/da.js View File


public/javascripts/ckeditor/lang/de.js → app/assets/javascripts/ckeditor/lang/de.js View File


public/javascripts/ckeditor/lang/el.js → app/assets/javascripts/ckeditor/lang/el.js View File


public/javascripts/ckeditor/lang/en-au.js → app/assets/javascripts/ckeditor/lang/en-au.js View File


public/javascripts/ckeditor/lang/en-ca.js → app/assets/javascripts/ckeditor/lang/en-ca.js View File


public/javascripts/ckeditor/lang/en-gb.js → app/assets/javascripts/ckeditor/lang/en-gb.js View File


public/javascripts/ckeditor/lang/en.js → app/assets/javascripts/ckeditor/lang/en.js View File


public/javascripts/ckeditor/lang/eo.js → app/assets/javascripts/ckeditor/lang/eo.js View File


public/javascripts/ckeditor/lang/es.js → app/assets/javascripts/ckeditor/lang/es.js View File


public/javascripts/ckeditor/lang/et.js → app/assets/javascripts/ckeditor/lang/et.js View File


public/javascripts/ckeditor/lang/eu.js → app/assets/javascripts/ckeditor/lang/eu.js View File


public/javascripts/ckeditor/lang/fa.js → app/assets/javascripts/ckeditor/lang/fa.js View File


public/javascripts/ckeditor/lang/fi.js → app/assets/javascripts/ckeditor/lang/fi.js View File


public/javascripts/ckeditor/lang/fo.js → app/assets/javascripts/ckeditor/lang/fo.js View File


public/javascripts/ckeditor/lang/fr-ca.js → app/assets/javascripts/ckeditor/lang/fr-ca.js View File


public/javascripts/ckeditor/lang/fr.js → app/assets/javascripts/ckeditor/lang/fr.js View File


public/javascripts/ckeditor/lang/gl.js → app/assets/javascripts/ckeditor/lang/gl.js View File


public/javascripts/ckeditor/lang/gu.js → app/assets/javascripts/ckeditor/lang/gu.js View File


public/javascripts/ckeditor/lang/he.js → app/assets/javascripts/ckeditor/lang/he.js View File


public/javascripts/ckeditor/lang/hi.js → app/assets/javascripts/ckeditor/lang/hi.js View File


public/javascripts/ckeditor/lang/hr.js → app/assets/javascripts/ckeditor/lang/hr.js View File


public/javascripts/ckeditor/lang/hu.js → app/assets/javascripts/ckeditor/lang/hu.js View File


public/javascripts/ckeditor/lang/id.js → app/assets/javascripts/ckeditor/lang/id.js View File


public/javascripts/ckeditor/lang/is.js → app/assets/javascripts/ckeditor/lang/is.js View File


public/javascripts/ckeditor/lang/it.js → app/assets/javascripts/ckeditor/lang/it.js View File


public/javascripts/ckeditor/lang/ja.js → app/assets/javascripts/ckeditor/lang/ja.js View File


public/javascripts/ckeditor/lang/ka.js → app/assets/javascripts/ckeditor/lang/ka.js View File


public/javascripts/ckeditor/lang/km.js → app/assets/javascripts/ckeditor/lang/km.js View File


public/javascripts/ckeditor/lang/ko.js → app/assets/javascripts/ckeditor/lang/ko.js View File


public/javascripts/ckeditor/lang/ku.js → app/assets/javascripts/ckeditor/lang/ku.js View File


public/javascripts/ckeditor/lang/lt.js → app/assets/javascripts/ckeditor/lang/lt.js View File


public/javascripts/ckeditor/lang/lv.js → app/assets/javascripts/ckeditor/lang/lv.js View File


public/javascripts/ckeditor/lang/mk.js → app/assets/javascripts/ckeditor/lang/mk.js View File


public/javascripts/ckeditor/lang/mn.js → app/assets/javascripts/ckeditor/lang/mn.js View File


public/javascripts/ckeditor/lang/ms.js → app/assets/javascripts/ckeditor/lang/ms.js View File


public/javascripts/ckeditor/lang/nb.js → app/assets/javascripts/ckeditor/lang/nb.js View File


public/javascripts/ckeditor/lang/nl.js → app/assets/javascripts/ckeditor/lang/nl.js View File


public/javascripts/ckeditor/lang/no.js → app/assets/javascripts/ckeditor/lang/no.js View File


public/javascripts/ckeditor/lang/pl.js → app/assets/javascripts/ckeditor/lang/pl.js View File


public/javascripts/ckeditor/lang/pt-br.js → app/assets/javascripts/ckeditor/lang/pt-br.js View File


public/javascripts/ckeditor/lang/pt.js → app/assets/javascripts/ckeditor/lang/pt.js View File


public/javascripts/ckeditor/lang/ro.js → app/assets/javascripts/ckeditor/lang/ro.js View File


public/javascripts/ckeditor/lang/ru.js → app/assets/javascripts/ckeditor/lang/ru.js View File


public/javascripts/ckeditor/lang/si.js → app/assets/javascripts/ckeditor/lang/si.js View File


public/javascripts/ckeditor/lang/sk.js → app/assets/javascripts/ckeditor/lang/sk.js View File


public/javascripts/ckeditor/lang/sl.js → app/assets/javascripts/ckeditor/lang/sl.js View File


public/javascripts/ckeditor/lang/sq.js → app/assets/javascripts/ckeditor/lang/sq.js View File


public/javascripts/ckeditor/lang/sr-latn.js → app/assets/javascripts/ckeditor/lang/sr-latn.js View File


public/javascripts/ckeditor/lang/sr.js → app/assets/javascripts/ckeditor/lang/sr.js View File


public/javascripts/ckeditor/lang/sv.js → app/assets/javascripts/ckeditor/lang/sv.js View File


public/javascripts/ckeditor/lang/th.js → app/assets/javascripts/ckeditor/lang/th.js View File


public/javascripts/ckeditor/lang/tr.js → app/assets/javascripts/ckeditor/lang/tr.js View File


public/javascripts/ckeditor/lang/ug.js → app/assets/javascripts/ckeditor/lang/ug.js View File


public/javascripts/ckeditor/lang/uk.js → app/assets/javascripts/ckeditor/lang/uk.js View File


public/javascripts/ckeditor/lang/vi.js → app/assets/javascripts/ckeditor/lang/vi.js View File


public/javascripts/ckeditor/lang/zh-cn.js → app/assets/javascripts/ckeditor/lang/zh-cn.js View File


public/javascripts/ckeditor/lang/zh.js → app/assets/javascripts/ckeditor/lang/zh.js View File


public/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js → app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js View File


public/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt → app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt View File


public/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js → app/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js View File


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

Loading…
Cancel
Save