social_stream 0.24.1 → 0.25.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. data/base/app/assets/javascripts/social_stream.action.js +40 -0
  2. data/base/app/assets/javascripts/social_stream.comments.js +26 -1
  3. data/base/app/assets/javascripts/social_stream.timeline.js +15 -7
  4. data/base/app/assets/javascripts/social_stream.wall.js.erb +1 -0
  5. data/base/app/assets/stylesheets/social_stream-base.css.scss +13 -0
  6. data/base/app/models/activity.rb +5 -1
  7. data/base/app/models/activity_action.rb +6 -0
  8. data/base/app/models/activity_object.rb +131 -9
  9. data/base/app/models/actor.rb +2 -0
  10. data/base/app/models/channel.rb +0 -1
  11. data/base/app/models/comment.rb +0 -6
  12. data/base/app/views/activity_actions/_update.js.erb +11 -0
  13. data/base/app/views/activity_actions/create.js.erb +1 -1
  14. data/base/app/views/activity_actions/update.js.erb +1 -1
  15. data/base/app/views/comments/create.js.erb +1 -1
  16. data/base/app/views/posts/create.js.erb +1 -1
  17. data/base/db/migrate/20120111141717_create_social_stream.rb +265 -0
  18. data/base/db/migrate/20120326083509_object_channels_to_actions.rb +45 -0
  19. data/base/lib/social_stream/ability/base.rb +2 -2
  20. data/base/lib/social_stream/base/version.rb +1 -1
  21. data/base/lib/social_stream/controllers/cancan_devise_integration.rb +9 -5
  22. data/base/lib/social_stream/models/object.rb +0 -72
  23. data/base/lib/social_stream/models/subject.rb +2 -1
  24. data/base/lib/social_stream/models/subtype.rb +6 -1
  25. data/base/spec/controllers/groups_controller_spec.rb +6 -0
  26. data/base/spec/factories/post.rb +6 -0
  27. data/base/spec/models/activity_action_spec.rb +35 -0
  28. data/documents/app/assets/javascripts/social_stream.video.js.erb +2 -1
  29. data/documents/app/controllers/documents_controller.rb +4 -1
  30. data/documents/app/models/document.rb +10 -0
  31. data/documents/app/models/video.rb +17 -1
  32. data/documents/app/views/videos/_video_processed.html.erb +1 -0
  33. data/documents/app/views/videos/_video_show.html.erb +2 -1
  34. data/documents/db/migrate/{20110615143707_create_social_stream_documents.rb → 20120109155431_create_social_stream_documents.rb} +9 -11
  35. data/documents/lib/social_stream/documents/engine.rb +1 -0
  36. data/documents/lib/social_stream/documents/version.rb +1 -1
  37. data/documents/social_stream-documents.gemspec +1 -1
  38. data/events/app/assets/javascripts/social_stream.calendar.js.erb +15 -9
  39. data/events/app/assets/javascripts/social_stream.events.action.js +31 -0
  40. data/events/db/migrate/20111218203314_create_events.rb +33 -0
  41. data/events/db/migrate/20120330131859_create_social_stream_events.rb +10 -0
  42. data/events/lib/social_stream/events/version.rb +1 -1
  43. data/events/social_stream-events.gemspec +1 -1
  44. data/lib/social_stream/version.rb +1 -1
  45. data/lib/tasks/migrations.rake +2 -0
  46. data/linkser/app/views/links/create.js.erb +1 -1
  47. data/linkser/db/migrate/{20111129100618_create_social_stream_linkser.rb → 20111219122952_create_social_stream_linkser.rb} +4 -7
  48. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  49. data/linkser/social_stream-linkser.gemspec +1 -1
  50. data/presence/db/migrate/20120330132148_create_social_stream_presence.rb +10 -0
  51. data/presence/lib/social_stream/presence/version.rb +1 -1
  52. data/presence/social_stream-presence.gemspec +1 -1
  53. data/social_stream.gemspec +5 -5
  54. metadata +42 -54
  55. data/base/app/assets/stylesheets/social_stream-base.css +0 -5
  56. data/base/app/views/activity_actions/_update_form.js.erb +0 -2
  57. data/base/db/migrate/20110610112023_create_social_stream.rb +0 -319
  58. data/base/db/migrate/20110705103202_empty_ties_count.rb +0 -17
  59. data/base/db/migrate/20110712090343_remove_spheres.rb +0 -30
  60. data/base/db/migrate/20110712142140_remove_permission_function.rb +0 -26
  61. data/base/db/migrate/20110912074426_add_reject_relation.rb +0 -29
  62. data/base/db/migrate/20111124100618_object_actors.rb +0 -52
  63. data/base/db/migrate/20111221103509_add_language_field.rb +0 -13
  64. data/base/db/migrate/20120103103125_add_channels.rb +0 -88
  65. data/base/db/migrate/20120109081509_update_notify_permissions.rb +0 -15
  66. data/base/db/migrate/20120111120920_remove_language_default.rb +0 -9
  67. data/base/db/migrate/20120111141717_activity_channels.rb +0 -74
  68. data/documents/db/migrate/20110922173707_add_file_processing_to_document.rb +0 -9
  69. data/documents/db/migrate/20111005112707_add_title_and_description_to_document.rb +0 -11
  70. data/documents/db/migrate/20120109155431_document_object_type.rb +0 -16
  71. data/events/db/migrate/20111101193523_create_events.rb +0 -13
  72. data/events/db/migrate/20111120104349_create_rooms.rb +0 -26
  73. data/events/db/migrate/20111204155637_add_scheduler.rb +0 -33
  74. data/events/db/migrate/20111218203314_change_scheduler.rb +0 -11
  75. data/linkser/db/migrate/20111219122952_add_width_height_to_link.rb +0 -15
data/events/db/migrate/20111204155637_add_scheduler.rb DELETED
@@ -1,33 +0,0 @@
1
- class AddScheduler < ActiveRecord::Migration
2
-
3
- class EventSchedulerMigration < ActiveRecord::Base
4
- self.record_timestamps = false
5
- set_table_name "events"
6
- end
7
-
8
- def up
9
- change_table :events do |t|
10
- t.date :start_date
11
- t.date :end_date
12
- t.integer :frequency, :default => 0
13
- t.integer :interval
14
- t.integer :interval_flag, :default => 0
15
- end
16
-
17
- EventSchedulerMigration.all.each do |e|
18
- e.start_date = e.start_at
19
- e.end_date = e.end_at
20
- e.save!
21
- end
22
- end
23
-
24
- def down
25
- change_table :events do |t|
26
- t.remove :start_date
27
- t.remove :end_date
28
- t.remove :frequency
29
- t.remove :interval
30
- t.remove :interval_flag
31
- end
32
- end
33
- end
data/events/db/migrate/20111218203314_change_scheduler.rb DELETED
@@ -1,11 +0,0 @@
1
- class ChangeScheduler < ActiveRecord::Migration
2
- def up
3
- rename_column :events, :interval_flag, :days
4
- add_column :events, :interval_flag, :integer, :default => 0
5
- end
6
-
7
- def down
8
- rename_column :events, :days, :interval_flag
9
- remove_column :events, :interval_flag
10
- end
11
- end
data/linkser/db/migrate/20111219122952_add_width_height_to_link.rb DELETED
@@ -1,15 +0,0 @@
1
- class AddWidthHeightToLink < ActiveRecord::Migration
2
- def self.up
3
- change_table "links" do |t|
4
- t.integer "width", :default => 470
5
- t.integer "height", :default => 353
6
- end
7
- end
8
-
9
- def self.down
10
- change_table :links do |t|
11
- t.remove "width"
12
- t.remove "height"
13
- end
14
- end
15
- end