Permalink
Browse files

resolved confrict

  • Loading branch information...
teppei machida
teppei machida committed Jul 8, 2012
2 parents 4099624 + 3a87896 commit 0e9b3eecf0e640471b8ecff26d20fde836c2d310
Showing with 1,528 additions and 667 deletions.
  1. +3 −1 .gitignore
  2. +22 −1 Gemfile
  3. +105 −39 Gemfile.lock
  4. BIN app/assets/images/{dummy.png → fallback/default.png}
  5. BIN app/assets/images/fallback/thumb_default.png
  6. 0 app/assets/javascripts/{activities.js.coffee → comments.js.coffee}
  7. +2 −2 app/assets/javascripts/parties.js.coffee
  8. +36 −1 app/assets/stylesheets/sass/parties.css.sass
  9. +0 −76 app/controllers/activities_controller.rb
  10. +76 −0 app/controllers/comments_controller.rb
  11. +0 −2 app/helpers/activities_helper.rb
  12. +2 −0 app/helpers/comments_helper.rb
  13. +0 −6 app/models/activity.rb
  14. +19 −0 app/models/authentication.rb
  15. +18 −0 app/models/comment.rb
  16. +21 −3 app/models/join.rb
  17. +14 −2 app/models/party.rb
  18. +51 −5 app/models/task.rb
  19. +34 −5 app/models/user.rb
  20. +52 −0 app/uploaders/image_uploader.rb
  21. +0 −7 app/views/activities/_activity.html.haml
  22. +0 −2 app/views/activities/create.js.erb
  23. +0 −1 app/views/activities/destroy.js.erb
  24. +0 −6 app/views/activities/edit.html.erb
  25. +0 −25 app/views/activities/index.html.erb
  26. +0 −5 app/views/activities/new.html.erb
  27. +0 −15 app/views/activities/show.html.erb
  28. +7 −0 app/views/comments/_comment.html.haml
  29. +4 −4 app/views/{activities → comments}/_form.html.erb
  30. +2 −0 app/views/comments/create.js.erb
  31. +1 −0 app/views/comments/destroy.js.erb
  32. +6 −0 app/views/comments/edit.html.erb
  33. +25 −0 app/views/comments/index.html.erb
  34. +5 −0 app/views/comments/new.html.erb
  35. +15 −0 app/views/comments/show.html.erb
  36. +1 −1 app/views/parties/index.html.haml
  37. +2 −2 app/views/parties/show.html.haml
  38. +10 −1 app/views/settings/_form.html.haml
  39. +12 −1 app/views/tasks/_task.html.haml
  40. +2 −3 config/initializers/devise.rb
  41. +1 −1 config/routes.rb
  42. +2 −2 db/migrate/{20120519100019_create_activities.rb → 20120519100019_create_comments.rb}
  43. +8 −8 db/schema.rb
  44. +12 −12 public/parties_show.html
  45. +164 −0 spec/controllers/comments_controller_spec.rb
  46. +164 −0 spec/controllers/joins_controller_spec.rb
  47. +164 −0 spec/controllers/parties_controller_spec.rb
  48. +167 −0 spec/controllers/tasks_controller_spec.rb
  49. +27 −0 spec/controllers/users_controller_spec.rb
  50. +9 −0 spec/factories/comments.rb
  51. +13 −0 spec/factories/joins.rb
  52. +9 −0 spec/factories/parties.rb
  53. +12 −0 spec/factories/tasks.rb
  54. +10 −0 spec/factories/users.rb
  55. +10 −0 spec/models/comment_spec.rb
  56. +17 −0 spec/models/join_spec.rb
  57. +23 −0 spec/models/party_spec.rb
  58. +62 −0 spec/models/task_spec.rb
  59. +20 −0 spec/models/user_spec.rb
  60. +11 −0 spec/requests/comments_spec.rb
  61. +11 −0 spec/requests/joins_spec.rb
  62. +11 −0 spec/requests/parties_spec.rb
  63. +11 −0 spec/requests/tasks_spec.rb
  64. +11 −0 spec/requests/users_spec.rb
  65. +32 −0 spec/spec_helper.rb
  66. 0 test/fixtures/.gitkeep
  67. +0 −9 test/fixtures/activities.yml
  68. +0 −7 test/fixtures/authentications.yml
  69. +0 −9 test/fixtures/joins.yml
  70. +0 −11 test/fixtures/parties.yml
  71. +0 −15 test/fixtures/tasks.yml
  72. +0 −9 test/fixtures/users.yml
  73. 0 test/functional/.gitkeep
  74. +0 −49 test/functional/activities_controller_test.rb
  75. +0 −49 test/functional/joins_controller_test.rb
  76. +0 −49 test/functional/parties_controller_test.rb
  77. +0 −14 test/functional/sessions_controller_test.rb
  78. +0 −14 test/functional/settings_controller_test.rb
  79. +0 −49 test/functional/tasks_controller_test.rb
  80. +0 −49 test/functional/users_controller_test.rb
  81. 0 test/integration/.gitkeep
  82. +0 −12 test/performance/browsing_test.rb
  83. +0 −13 test/test_helper.rb
  84. 0 test/unit/.gitkeep
  85. +0 −7 test/unit/activity_test.rb
  86. +0 −7 test/unit/authentication_test.rb
  87. +0 −4 test/unit/helpers/activities_helper_test.rb
  88. +0 −4 test/unit/helpers/joins_helper_test.rb
  89. +0 −4 test/unit/helpers/parties_helper_test.rb
  90. +0 −4 test/unit/helpers/sessions_helper_test.rb
  91. +0 −4 test/unit/helpers/settings_helper_test.rb
  92. +0 −4 test/unit/helpers/tasks_helper_test.rb
  93. +0 −4 test/unit/helpers/users_helper_test.rb
  94. +0 −7 test/unit/join_test.rb
  95. +0 −7 test/unit/party_test.rb
  96. +0 −7 test/unit/task_test.rb
  97. +0 −7 test/unit/user_test.rb
View
@@ -15,6 +15,8 @@
/tmp
.rvmrc
+.rspec
.sass-cache/
-public/assets/
+public/assets/
+public/uploads/
View
23 Gemfile
@@ -25,13 +25,34 @@ gem 'jquery-rails'
gem 'best_in_place'
gem 'devise'
-gem 'oa-oauth', :require => "omniauth/oauth"
+#gem 'oa-oauth', :require => "omniauth/oauth"
+
+gem 'carrierwave'
+gem "rmagick"
group :development do
gem 'sqlite3'
+ gem 'annotate', '~> 2.4.1.beta'
gem 'erb2haml'
end
+group :development, :test do
+ gem 'rspec-rails', '2.10.0'
+ gem 'guard-rspec', '0.5.5'
+ gem 'guard-spork', '0.3.2'
+ gem 'spork', '0.9.0'
+end
+
+group :test do
+ gem 'capybara', '1.1.2'
+ gem 'rb-fsevent', '0.4.3.1', require: false
+ gem 'growl', '1.0.3'
+ gem 'factory_girl_rails', '1.4.0'
+ gem 'cucumber-rails', '1.2.1', require: false
+ gem 'database_cleaner', '0.7.0'
+ gem 'shoulda-matchers'
+end
+
group :production do
gem 'pg'
end
View
@@ -29,74 +29,101 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
+ annotate (2.4.1.beta1)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- best_in_place (1.0.6)
+ best_in_place (1.1.2)
jquery-rails
rails (~> 3.1)
builder (3.0.0)
+ capybara (1.1.2)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (~> 2.0)
+ xpath (~> 0.1.4)
+ carrierwave (0.6.2)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ childprocess (0.3.3)
+ ffi (~> 1.0.6)
chunky_png (1.2.5)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
- compass (0.12.1)
+ coffee-script-source (1.3.3)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- compass-rails (1.0.1)
- compass (~> 0.12.0)
- devise (1.4.5)
+ compass-rails (1.0.3)
+ compass (>= 0.12.2, < 0.14)
+ cucumber (1.2.1)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.11.0)
+ json (>= 1.4.6)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
+ database_cleaner (0.7.0)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
+ diff-lcs (1.1.3)
erb2haml (0.1.2)
haml
hpricot
ruby_parser
erubis (2.7.0)
- execjs (1.3.1)
+ execjs (1.4.0)
multi_json (~> 1.0)
- faraday (0.6.1)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
+ factory_girl (2.3.2)
+ activesupport
+ factory_girl_rails (1.4.0)
+ factory_girl (~> 2.3.0)
+ railties (>= 3.0.0)
+ ffi (1.0.11)
fssm (0.2.9)
- haml (3.1.4)
+ gherkin (2.11.1)
+ json (>= 1.4.6)
+ growl (1.0.3)
+ guard (1.0.3)
+ ffi (>= 0.5.0)
+ thor (>= 0.14.6)
+ guard-rspec (0.5.5)
+ guard (>= 0.8.4)
+ guard-spork (0.3.2)
+ guard (>= 0.8.4)
+ spork (>= 0.8.4)
+ haml (3.1.6)
hike (1.2.1)
hpricot (0.8.6)
i18n (0.6.0)
- journey (1.0.3)
+ journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.7.0)
+ json (1.7.3)
libv8 (3.3.10.4)
+ libwebsocket (0.1.3)
+ addressable
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.3.4)
- multipart-post (1.1.5)
- nokogiri (1.4.7)
- oa-core (0.2.4)
- oa-oauth (0.2.4)
- faraday (~> 0.6.1)
- multi_json (>= 0.0.5)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.4)
- oauth (~> 0.4.0)
- oauth2 (~> 0.4.1)
- oauth (0.4.6)
- oauth2 (0.4.1)
- faraday (~> 0.6.1)
- multi_json (>= 0.0.5)
- orm_adapter (0.0.5)
- pg (0.13.2)
+ mime-types (1.19)
+ multi_json (1.3.6)
+ nokogiri (1.5.5)
+ orm_adapter (0.3.0)
+ pg (0.14.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -121,16 +148,40 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
+ rb-fsevent (0.4.3.1)
rdoc (3.12)
json (~> 1.4)
+ rmagick (2.13.1)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.1)
+ rspec-expectations (2.10.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.10.0)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
- sass (3.1.16)
+ rubyzip (0.9.9)
+ sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ selenium-webdriver (2.24.0)
+ childprocess (>= 0.2.5)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
+ rubyzip
sexp_processor (3.2.0)
+ shoulda-matchers (1.2.0)
+ activesupport (>= 3.0.0)
+ spork (0.9.0)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -144,26 +195,41 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.4)
+ uglifier (1.2.6)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- warden (1.0.5)
+ multi_json (~> 1.3)
+ warden (1.2.1)
rack (>= 1.0)
+ xpath (0.1.4)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
+ annotate (~> 2.4.1.beta)
best_in_place
+ capybara (= 1.1.2)
+ carrierwave
coffee-rails (~> 3.2.1)
compass-rails
+ cucumber-rails (= 1.2.1)
+ database_cleaner (= 0.7.0)
devise
erb2haml
+ factory_girl_rails (= 1.4.0)
+ growl (= 1.0.3)
+ guard-rspec (= 0.5.5)
+ guard-spork (= 0.3.2)
jquery-rails
- oa-oauth
pg
rails (= 3.2.3)
+ rb-fsevent (= 0.4.3.1)
+ rmagick
+ rspec-rails (= 2.10.0)
sass-rails (~> 3.2.3)
+ shoulda-matchers
+ spork (= 0.9.0)
sqlite3
therubyracer
uglifier (>= 1.0.3)
Binary file not shown.
@@ -18,7 +18,7 @@ $ ->
$(".member .header .selectstate").toggle()
$(".doing").click ->
$(".current .actions").toggle()
- $(".activities .label").click ->
- $(".activities ul").toggle()
+ $(".comments .label").click ->
+ $(".comments ul").toggle()
$("#notice").css "left", $(window).width() / 2 - $("#notice").width() / 2
$("#notice").delay(2000).fadeOut "slow"
@@ -239,6 +239,41 @@ body.parties_show
.activities
+activities
+ .comments
+ clear: both
+ +clearfix
+ .add
+ padding: 10px 10px 0 10px
+ ul
+ li
+ +clearfix
+ border-bottom: dotted #666 1px
+ display: block
+ padding: 14px 10px
+ &:first-child
+ padding: 14px 10px
+ &:last-child
+ border: none
+ .icon
+ float: left
+ padding: 0 8px 0 0
+ a
+ width: 36px
+ height: 36px
+ padding: 3px
+ background: rgba(0, 0, 0, .2)
+ +border-radius(21px)
+ display: block
+ +box-shadow(#495051 0 1px 0)
+ img
+ width: 36px
+ height: auto
+ +border-radius(18px)
+ p
+ font-size: 13px
+ line-height: 1.6
+
+>>>>>>> 3a87896a141829a5ffa448b42fb14071609b7eec
.backlog
clear: both
+clearfix
@@ -414,4 +449,4 @@ body.parties_show
display: block
float: left
.activities
- +activities
+ +activities
Oops, something went wrong.

0 comments on commit 0e9b3ee

Please sign in to comment.