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
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2246d48d29fac1f883ffe085fbd511940017487d
|
|
4
|
+
data.tar.gz: 4953ad1337cf0b17723949b6dbf5f3d541c05c15
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6286aeb288d1db1923655aa108c282a56610b58c411a4eae6e8f99c24cf39905f21b17144209fbce812b0f5324421f3dcf88790e67d3ad95347360df5b0a916b
|
|
7
|
+
data.tar.gz: 9c71b52447fef9d83bf66c71512cd9007c7c16f8d09990e4b4e512d6c3b1b53b8644e4c126b1376e97726794a580511baf7a0d10947934ddae5b460bfffef2f1
|
data/README.rdoc
CHANGED
|
@@ -4,57 +4,16 @@ Social Stream is an engine for Ruby on Rails. It provides a robust and flexible
|
|
|
4
4
|
with {social networking}[http://en.wikipedia.org/wiki/Social_network] features and {activity streams}[http://activitystrea.ms/] for building websites.
|
|
5
5
|
|
|
6
6
|
{<img src="https://secure.travis-ci.org/ging/social_stream.png" />}[http://travis-ci.org/ging/social_stream]
|
|
7
|
-
{<img src="https://codeclimate.com/
|
|
7
|
+
{<img src="https://codeclimate.com/github/ging/social_stream.png" />}[https://codeclimate.com/github/ging/social_stream]
|
|
8
8
|
|
|
9
9
|
= Social Stream components
|
|
10
10
|
|
|
11
11
|
Social Stream is divided into components. Developers can customize their social
|
|
12
|
-
network with the functionalities they need for each case.
|
|
12
|
+
network with the functionalities they need for each case. Check {current Social Stream components in Social Stream's website}[http://social-stream.dit.upm.es/started#components]
|
|
13
13
|
|
|
14
|
-
* {Base}[https://github.com/ging/social_stream/tree/master/base], basic functionalities of contacts, streams and walls,
|
|
15
|
-
along with users, groups, post and comments
|
|
16
|
-
* {Documents}[https://github.com/ging/social_stream/tree/master/documents], support for
|
|
17
|
-
activities on files: pictures, audios and videos with a HTML5 player
|
|
18
|
-
* {Events}[https://github.com/ging/social_stream/tree/master/events], sheduled events with calendar
|
|
19
|
-
* {Linkser}[https://github.com/ging/social_stream/tree/master/linkser], advanced management of links to other webpages
|
|
20
|
-
* {Presence}[https://github.com/ging/social_stream/tree/master/presence], XMPP based chat support
|
|
21
|
-
* {Ostatus}[https://github.com/ging/social_stream/tree/master/ostatus], support for social network federation
|
|
22
|
-
* {Oauth2Server}[https://github.com/ging/social_stream/tree/master/oauth2_server], authentication and authorization service based on {OAuth2}[http://oauth.net/2/]
|
|
23
|
-
|
|
24
14
|
= Installation
|
|
25
15
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
gem 'social_stream', '>= 1.0.0'
|
|
29
|
-
|
|
30
|
-
In the case you do not want some functionality, include your desired components instead.
|
|
31
|
-
For instance, the Gemfile in an application using documents and links only would contain the following:
|
|
32
|
-
|
|
33
|
-
gem 'social_stream-documents'
|
|
34
|
-
gem 'social_stream-linkser'
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
Then run:
|
|
38
|
-
|
|
39
|
-
bundle
|
|
40
|
-
|
|
41
|
-
Then:
|
|
42
|
-
|
|
43
|
-
rails generate social_stream:install
|
|
44
|
-
|
|
45
|
-
or use specific generators if you are using components.
|
|
46
|
-
|
|
47
|
-
Social Stream is not compatible with {default mass attributes protection shipped with Rails 3.2.3}[http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/], but uses the {strong_parameters gem}[https://github.com/rails/strong_parameters] that will be the default in Rails 4. Set this in your config/application.rb before running the migration command:
|
|
48
|
-
|
|
49
|
-
config.active_record.whitelist_attributes = false
|
|
50
|
-
|
|
51
|
-
Now migrate your database
|
|
52
|
-
|
|
53
|
-
rake db:migrate
|
|
54
|
-
|
|
55
|
-
Since {Social Stream}[http://github.com/ging/social_stream] depends on {Devise}[https://github.com/plataformatec/devise], make sure you follow {its setup instructions}[https://github.com/plataformatec/devise/tree/master/lib/generators/templates#readme]. Specifically, make sure you set the default URL options for your environments at <tt>config/environments/*.rb</tt> with something like:
|
|
56
|
-
|
|
57
|
-
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
|
|
16
|
+
There is a {detailed guide in Social Stream's website}[http://social-stream.dit.upm.es/started] on how to get started, install Social Stream in your Rails application and customize it.
|
|
58
17
|
|
|
59
18
|
= Documentation
|
|
60
19
|
|
|
@@ -66,12 +66,12 @@ SocialStream.Object = (function(SS, $, undefined){
|
|
|
66
66
|
return icon + ' ' + text + ' <b class="caret"></b>';
|
|
67
67
|
};
|
|
68
68
|
|
|
69
|
-
var changeRelationSelect = function(type) {
|
|
70
|
-
$('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
|
|
69
|
+
var changeRelationSelect = function(type, selector) {
|
|
70
|
+
$('[name$="[relation_ids][]"]', selector).attr('name', type + '[relation_ids][]');
|
|
71
71
|
};
|
|
72
72
|
|
|
73
|
-
var changeOwner = function(type) {
|
|
74
|
-
$('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
|
|
73
|
+
var changeOwner = function(type, selector) {
|
|
74
|
+
$('[name$="[owner_id]"]', selector).attr('name', type + '[owner_id]');
|
|
75
75
|
};
|
|
76
76
|
|
|
77
77
|
callback.register('show',
|
|
@@ -32,14 +32,13 @@ SocialStream.Tag = (function(SS, $, undefined) {
|
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
var select2InitSelection = function(element, callback) {
|
|
35
|
-
var selection = $(element).val().split(",").map(function(el) {
|
|
35
|
+
var selection = $(element).val().split(", ").map(function(el) {
|
|
36
36
|
return { id: el, text: el };
|
|
37
37
|
});
|
|
38
38
|
|
|
39
39
|
callback(selection);
|
|
40
40
|
};
|
|
41
41
|
|
|
42
|
-
|
|
43
42
|
return {
|
|
44
43
|
select2: select2
|
|
45
44
|
};
|
|
@@ -30,6 +30,11 @@ SocialStream.Wall = (function(SS, $, undefined){
|
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
+
var changeParams = function(type) {
|
|
34
|
+
SS.Object.changeOwner(type, $('.wall_input form'));
|
|
35
|
+
SS.Object.changeRelationSelect(type, $('.wall_input form'));
|
|
36
|
+
};
|
|
37
|
+
|
|
33
38
|
callback.register('show',
|
|
34
39
|
initInputAutosize,
|
|
35
40
|
SS.Object.new_);
|
|
@@ -39,7 +44,6 @@ SocialStream.Wall = (function(SS, $, undefined){
|
|
|
39
44
|
|
|
40
45
|
return callback.extend({
|
|
41
46
|
changeAction: changeAction,
|
|
42
|
-
|
|
43
|
-
changeRelationSelect: SS.Object.changeRelationSelect
|
|
47
|
+
changeParams: changeParams
|
|
44
48
|
});
|
|
45
49
|
}) (SocialStream, jQuery);
|
|
@@ -15,16 +15,19 @@
|
|
|
15
15
|
input,
|
|
16
16
|
textarea
|
|
17
17
|
background-color: #f9f9f9
|
|
18
|
-
.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
.briefing
|
|
19
|
+
background-color: white
|
|
20
|
+
color: $gray
|
|
21
|
+
span
|
|
22
|
+
@include border-radius(5px)
|
|
23
|
+
background-color: #D9EDF7
|
|
24
|
+
border: 1px solid #BCE8F1
|
|
25
|
+
color: #3A87AD
|
|
26
|
+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
|
|
24
27
|
p
|
|
28
|
+
border-top: 5px solid #f9f9f9
|
|
25
29
|
background-color: none
|
|
26
|
-
|
|
27
|
-
padding-left: 1px
|
|
30
|
+
|
|
28
31
|
|
|
29
32
|
form.edit_profile
|
|
30
33
|
input
|
|
@@ -37,11 +40,7 @@
|
|
|
37
40
|
padding-top: 14px
|
|
38
41
|
input
|
|
39
42
|
&[type="file"]
|
|
40
|
-
|
|
41
|
-
border: none
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
|
|
45
44
|
h5
|
|
46
45
|
color: $grayLighter
|
|
47
46
|
font-size: 17px
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
@import 'avatars_for_rails'
|
|
2
2
|
|
|
3
3
|
#profile
|
|
4
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
5
|
+
float: left
|
|
6
|
+
margin-left: 2%
|
|
4
7
|
#profile-info
|
|
5
8
|
@include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
6
9
|
float: left
|
|
@@ -10,25 +13,34 @@
|
|
|
10
13
|
.comunication-info,
|
|
11
14
|
.experience,
|
|
12
15
|
.avatar
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
padding:
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
17
|
+
margin-left: 0px
|
|
18
|
+
.briefing
|
|
19
|
+
padding: 1px 0px 16px
|
|
20
|
+
min-height: 32px
|
|
21
|
+
span
|
|
22
|
+
margin-left: 11px
|
|
23
|
+
padding: 3px 8px 3px 7px
|
|
24
|
+
p
|
|
25
|
+
margin: -15px 26px 0 14px
|
|
26
|
+
padding: 20px 0px 5px 0px
|
|
27
|
+
width: 100%
|
|
28
|
+
.empty
|
|
29
|
+
float: left
|
|
30
|
+
padding: 8px 27px 9px 27px
|
|
31
|
+
.update
|
|
32
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
33
|
+
background-color: $white
|
|
34
|
+
margin-left: 0px
|
|
35
|
+
padding: 12px 0px 3px 0px !important
|
|
36
|
+
form.edit_profile
|
|
37
|
+
padding: 0 14px
|
|
24
38
|
input
|
|
25
39
|
&[type="submit"]
|
|
26
40
|
float: right
|
|
27
|
-
margin-top: 10px
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
padding: 0px 27px 9px 27px
|
|
31
|
-
float: right
|
|
41
|
+
margin-top: -10px
|
|
42
|
+
margin-right: 9px
|
|
43
|
+
|
|
32
44
|
|
|
33
45
|
.personal,
|
|
34
46
|
.comunication-info,
|
|
@@ -37,21 +49,13 @@
|
|
|
37
49
|
&[type="text"],
|
|
38
50
|
&[type="tel"],
|
|
39
51
|
&[type="email"]
|
|
40
|
-
width: 95
|
|
52
|
+
width: 95% !important
|
|
41
53
|
|
|
42
54
|
|
|
43
55
|
textarea
|
|
44
|
-
width: 95
|
|
56
|
+
width: 95% !important
|
|
45
57
|
|
|
46
|
-
|
|
47
|
-
.accordion-body
|
|
48
|
-
.accordion-inner
|
|
49
|
-
form
|
|
50
|
-
margin: 0 0 10px
|
|
51
|
-
input
|
|
52
|
-
&[type="submit"]
|
|
53
|
-
float: right
|
|
54
|
-
margin-top: 2px
|
|
58
|
+
|
|
55
59
|
.experience
|
|
56
60
|
.briefing
|
|
57
61
|
p
|
|
@@ -72,12 +76,13 @@
|
|
|
72
76
|
margin: 16px
|
|
73
77
|
p
|
|
74
78
|
@include border-radius (15px)
|
|
75
|
-
margin: -15px 11px 0
|
|
76
|
-
padding: 12px 10px 11px
|
|
79
|
+
margin: -15px 11px 0 5px
|
|
80
|
+
padding: 12px 10px 11px 27px
|
|
77
81
|
width: 325px
|
|
82
|
+
.update
|
|
83
|
+
margin-left: 22px
|
|
84
|
+
|
|
78
85
|
|
|
79
|
-
.accordion
|
|
80
|
-
margin-top: 20px
|
|
81
86
|
|
|
82
87
|
|
|
83
88
|
#profile_birthday_3i,
|
|
@@ -91,5 +96,17 @@
|
|
|
91
96
|
display: inline
|
|
92
97
|
h4
|
|
93
98
|
display: inline-block
|
|
99
|
+
.update
|
|
100
|
+
.jcrop-holder
|
|
101
|
+
width: 100% !important
|
|
102
|
+
div
|
|
103
|
+
img
|
|
104
|
+
max-width: 90%
|
|
105
|
+
max-height: 90%
|
|
106
|
+
margin: 0 auto
|
|
107
|
+
position: relative
|
|
108
|
+
div
|
|
109
|
+
img
|
|
110
|
+
visibility: hidden !important
|
|
94
111
|
|
|
95
112
|
|
|
@@ -19,7 +19,9 @@
|
|
|
19
19
|
.comunication-info,
|
|
20
20
|
.experience,
|
|
21
21
|
.avatar
|
|
22
|
-
|
|
22
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
23
|
+
.update
|
|
24
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
23
25
|
|
|
24
26
|
|
|
25
27
|
|
|
@@ -29,14 +31,5 @@
|
|
|
29
31
|
|
|
30
32
|
@media (max-width: 480px)
|
|
31
33
|
|
|
32
|
-
|
|
33
|
-
#profile-info
|
|
34
|
-
.tags,
|
|
35
|
-
.personal,
|
|
36
|
-
.comunication-info,
|
|
37
|
-
.experience,
|
|
38
|
-
.avatar
|
|
39
|
-
width: 96% !important
|
|
40
|
-
.accordion-heading
|
|
41
|
-
min-height: 40px
|
|
34
|
+
|
|
42
35
|
|
|
@@ -10,13 +10,12 @@
|
|
|
10
10
|
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
11
11
|
|
|
12
12
|
#profile-info
|
|
13
|
-
@include grid-core-span(
|
|
14
|
-
float: left !important
|
|
15
|
-
margin: 0 0 0 2.5% !important
|
|
16
|
-
width: 80% !important
|
|
13
|
+
@include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
17
14
|
.tags,
|
|
18
15
|
.personal,
|
|
19
16
|
.comunication-info,
|
|
20
17
|
.experience,
|
|
21
18
|
.avatar
|
|
22
|
-
|
|
19
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
20
|
+
.update
|
|
21
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass
CHANGED
|
@@ -96,31 +96,7 @@
|
|
|
96
96
|
a
|
|
97
97
|
font-size: 16px !important
|
|
98
98
|
|
|
99
|
-
|
|
100
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
101
|
-
margin-left: 0px
|
|
102
|
-
#toolbar
|
|
103
|
-
@include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
104
|
-
float: left
|
|
105
|
-
margin-left: 0px
|
|
106
|
-
#profile-info
|
|
107
|
-
@include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
108
|
-
float: left
|
|
109
|
-
margin-left: 2%
|
|
110
|
-
.tags,
|
|
111
|
-
.personal,
|
|
112
|
-
.comunication-info,
|
|
113
|
-
.experience,
|
|
114
|
-
.avatar
|
|
115
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
116
|
-
margin-left: 0px
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
.update
|
|
120
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
99
|
+
|
|
124
100
|
|
|
125
101
|
#documents
|
|
126
102
|
#toolbar
|
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass
CHANGED
|
@@ -70,24 +70,6 @@
|
|
|
70
70
|
|
|
71
71
|
|
|
72
72
|
|
|
73
|
-
#profile
|
|
74
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
75
|
-
margin-left: 0px
|
|
76
|
-
|
|
77
|
-
#profile-info
|
|
78
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
79
|
-
float: none
|
|
80
|
-
margin: 0px auto 0px
|
|
81
|
-
.tags,
|
|
82
|
-
.personal,
|
|
83
|
-
.comunication-info,
|
|
84
|
-
.experience,
|
|
85
|
-
.avatar
|
|
86
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
87
|
-
.update
|
|
88
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
89
|
-
|
|
90
|
-
|
|
91
73
|
|
|
92
74
|
#relation_customs
|
|
93
75
|
#toolbar
|
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass
CHANGED
|
@@ -55,21 +55,7 @@
|
|
|
55
55
|
width: 127px
|
|
56
56
|
margin-left: 3px
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
60
|
-
|
|
61
|
-
#profile-info
|
|
62
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
63
|
-
float: none
|
|
64
|
-
margin: 0px auto 0px
|
|
65
|
-
.tags,
|
|
66
|
-
.personal,
|
|
67
|
-
.comunication-info,
|
|
68
|
-
.experience,
|
|
69
|
-
.avatar
|
|
70
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
71
|
-
.update
|
|
72
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
58
|
+
|
|
73
59
|
|
|
74
60
|
|
|
75
61
|
|
|
@@ -27,18 +27,6 @@ class ConversationsController < ApplicationController
|
|
|
27
27
|
@receipts.mark_as_read
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
-
def new
|
|
31
|
-
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
def edit
|
|
35
|
-
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
def create
|
|
39
|
-
|
|
40
|
-
end
|
|
41
|
-
|
|
42
30
|
def update
|
|
43
31
|
if params[:untrash].present?
|
|
44
32
|
@conversation.untrash(@actor)
|