social_stream 2.0.0.beta3 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +3 -44
- data/base/app/assets/javascripts/social_stream/object.js +4 -4
- data/base/app/assets/javascripts/social_stream/tag.js +1 -2
- data/base/app/assets/javascripts/social_stream/wall.js +6 -2
- data/base/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +4 -1
- data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +12 -13
- data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +48 -31
- data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -2
- data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +4 -11
- data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +1 -25
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +0 -18
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +1 -15
- data/base/app/controllers/conversations_controller.rb +0 -12
- data/base/app/views/devise/sessions/new.html.erb +1 -0
- data/base/app/views/layouts/_header_signed_out.erb +0 -2
- data/base/app/views/permissions/_index.html.erb +1 -1
- data/base/app/views/profiles/_avatar.html.erb +10 -11
- data/base/app/views/profiles/_comunication-info.html.erb +36 -36
- data/base/app/views/profiles/_experience.html.erb +16 -16
- data/base/app/views/profiles/_personal.html.erb +9 -11
- data/base/app/views/profiles/_profile.html.erb +25 -33
- data/base/app/views/profiles/_tags.html.erb +9 -8
- data/base/config/locales/en.yml +3 -3
- data/base/config/locales/es.yml +38 -7
- data/base/lib/generators/social_stream/base/templates/initializer.rb +1 -5
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/controllers/objects.rb +5 -3
- data/base/lib/tasks/db/populate.rake +1 -0
- data/base/social_stream-base.gemspec +1 -1
- data/documents/app/assets/javascripts/social_stream/documents.wall.js +1 -3
- data/documents/app/controllers/documents_controller.rb +1 -1
- data/documents/app/helpers/documents_helper.rb +1 -5
- data/documents/app/views/audios/_audio_processed.html.erb +4 -0
- data/documents/app/views/documents/search.html.erb +1 -3
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/social_stream-documents.gemspec +1 -1
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +2 -2
- data/lib/social_stream/version.rb +1 -1
- data/linkser/app/assets/javascripts/social_stream/linkser.wall.js +2 -4
- data/linkser/lib/social_stream/linkser/version.rb +1 -1
- data/linkser/social_stream-linkser.gemspec +1 -1
- data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
- data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
- data/ostatus/app/assets/images/logos/medium/remote_subject.png +0 -0
- data/ostatus/app/assets/images/logos/small/remote_subject.png +0 -0
- data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
- data/ostatus/social_stream-ostatus.gemspec +1 -1
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +7 -7
- metadata +18 -18
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
|
|
31
31
|
# Slug generation
|
32
32
|
s.add_runtime_dependency('stringex', '~> 1.5.1')
|
33
33
|
# Avatar attachments
|
34
|
-
s.add_runtime_dependency('avatars_for_rails', '~> 1.0.
|
34
|
+
s.add_runtime_dependency('avatars_for_rails', '~> 1.0.7')
|
35
35
|
# jQuery
|
36
36
|
s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
|
37
37
|
# Select2 javascript library
|
@@ -37,9 +37,7 @@ SocialStream.Documents.Wall = (function(SS, $, undefined) {
|
|
37
37
|
$('#new_document_description').show().val($('#post_text').val());
|
38
38
|
|
39
39
|
SocialStream.Wall.changeAction($(this).attr('data-path'));
|
40
|
-
|
41
|
-
SocialStream.Wall.changeOwner('document');
|
42
|
-
SocialStream.Wall.changeRelationSelect('document');
|
40
|
+
SocialStream.Wall.changeParams('document');
|
43
41
|
|
44
42
|
$('.wall_input input[type=file]').trigger('click');
|
45
43
|
});
|
@@ -45,8 +45,8 @@ class DocumentsController < ApplicationController
|
|
45
45
|
|
46
46
|
def show
|
47
47
|
respond_to do |format|
|
48
|
-
format.json {render :json => resource }
|
49
48
|
format.html {render :action => :show}
|
49
|
+
format.json {render :json => resource }
|
50
50
|
format.any {
|
51
51
|
path = resource.file.path(params[:style] || params[:format])
|
52
52
|
|
@@ -9,11 +9,7 @@ module DocumentsHelper
|
|
9
9
|
|
10
10
|
format = style.respond_to?('[]') && style[:format] || document.format
|
11
11
|
|
12
|
-
|
13
|
-
polymorphic_path document, format: format, style: size
|
14
|
-
else
|
15
|
-
icon document, size
|
16
|
-
end
|
12
|
+
polymorphic_path(document, format: format, style: size)
|
17
13
|
end
|
18
14
|
|
19
15
|
# Return the right icon based on {#document}'s mime type
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
16
16
|
s.add_runtime_dependency('paperclip','~> 3.3.0')
|
17
17
|
s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
|
18
18
|
s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
|
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
16
|
-
s.add_runtime_dependency('rails-scheduler', '~> 0.1.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
16
|
+
s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
|
17
17
|
|
18
18
|
# Development Gem dependencies
|
19
19
|
s.add_development_dependency('sqlite3-ruby')
|
@@ -16,8 +16,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
|
|
16
16
|
$("#link_url").val($("#post_text").val());
|
17
17
|
$("#link_loaded").val(false);
|
18
18
|
SS.Wall.changeAction($('#link_preview_loading').attr('data-link_path'));
|
19
|
-
SS.Wall.
|
20
|
-
SS.Wall.changeRelationSelect('link');
|
19
|
+
SS.Wall.changeParams('link');
|
21
20
|
|
22
21
|
if(this.currentValue != this.lastValue) {
|
23
22
|
showLoading();
|
@@ -57,8 +56,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
|
|
57
56
|
$("#link_preview").hide().html('');
|
58
57
|
$("#link_url").val("");
|
59
58
|
SS.Wall.changeAction();
|
60
|
-
SS.Wall.
|
61
|
-
SS.Wall.changeRelationSelect('post');
|
59
|
+
SS.Wall.changeParams('post');
|
62
60
|
|
63
61
|
if (options.postText) {
|
64
62
|
$('#post_text').val('');
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
16
16
|
s.add_runtime_dependency('linkser', '~> 0.0.12')
|
17
17
|
# Development Gem dependencies
|
18
18
|
s.add_development_dependency('sqlite3-ruby')
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
16
16
|
s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
|
17
17
|
|
18
18
|
s.add_development_dependency('rspec-rails', '~> 2.8.0')
|
Binary file
|
Binary file
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
16
16
|
s.add_runtime_dependency('proudhon','>= 0.3.6')
|
17
17
|
s.add_runtime_dependency('nokogiri','> 1.4.4')
|
18
18
|
|
data/social_stream.gemspec
CHANGED
@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.files = `git ls-files`.split("\n")
|
11
11
|
|
12
12
|
# Gem dependencies
|
13
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0
|
14
|
-
s.add_runtime_dependency('social_stream-documents', '~> 2.0.0
|
15
|
-
s.add_runtime_dependency('social_stream-events', '~> 2.0.0
|
16
|
-
s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0
|
17
|
-
s.add_runtime_dependency('social_stream-presence', '~> 2.0.0
|
18
|
-
s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0
|
19
|
-
s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.0
|
13
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
|
14
|
+
s.add_runtime_dependency('social_stream-documents', '~> 2.0.0')
|
15
|
+
s.add_runtime_dependency('social_stream-events', '~> 2.0.0')
|
16
|
+
s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0')
|
17
|
+
s.add_runtime_dependency('social_stream-presence', '~> 2.0.0')
|
18
|
+
s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0')
|
19
|
+
s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.0')
|
20
20
|
|
21
21
|
# Development Gem dependencies
|
22
22
|
#
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.0
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GING - DIT - UPM
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-05-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: social_stream-base
|
@@ -16,98 +16,98 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.0.0
|
19
|
+
version: 2.0.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 2.0.0
|
26
|
+
version: 2.0.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: social_stream-documents
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - ~>
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 2.0.0
|
33
|
+
version: 2.0.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - ~>
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 2.0.0
|
40
|
+
version: 2.0.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: social_stream-events
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - ~>
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 2.0.0
|
47
|
+
version: 2.0.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 2.0.0
|
54
|
+
version: 2.0.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: social_stream-linkser
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - ~>
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 2.0.0
|
61
|
+
version: 2.0.0
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - ~>
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 2.0.0
|
68
|
+
version: 2.0.0
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: social_stream-presence
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - ~>
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: 2.0.0
|
75
|
+
version: 2.0.0
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - ~>
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: 2.0.0
|
82
|
+
version: 2.0.0
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: social_stream-ostatus
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - ~>
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: 2.0.0
|
89
|
+
version: 2.0.0
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - ~>
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: 2.0.0
|
96
|
+
version: 2.0.0
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: social_stream-oauth2_server
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - ~>
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 2.0.0
|
103
|
+
version: 2.0.0
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - ~>
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: 2.0.0
|
110
|
+
version: 2.0.0
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: capybara
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1651,9 +1651,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1651
1651
|
version: '0'
|
1652
1652
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1653
1653
|
requirements:
|
1654
|
-
- - '
|
1654
|
+
- - '>='
|
1655
1655
|
- !ruby/object:Gem::Version
|
1656
|
-
version:
|
1656
|
+
version: '0'
|
1657
1657
|
requirements: []
|
1658
1658
|
rubyforge_project:
|
1659
1659
|
rubygems_version: 2.0.0
|