social_stream 0.15.8 → 0.16.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. data/README.rdoc +1 -1
  2. data/base/app/models/user.rb +1 -1
  3. data/base/app/views/devise/registrations/_edit_user.html.erb +26 -0
  4. data/base/app/views/devise/registrations/edit.html.erb +2 -1
  5. data/base/app/views/posts/_post_focus_search.html.erb +2 -2
  6. data/base/app/views/posts/_post_global_search.html.erb +2 -2
  7. data/base/config/locales/en.yml +4 -0
  8. data/base/db/migrate/20111221103509_add_language_field.rb +13 -0
  9. data/base/lib/social_stream/base/version.rb +1 -1
  10. data/documents/lib/social_stream/documents/version.rb +1 -1
  11. data/documents/social_stream-documents.gemspec +2 -2
  12. data/events/app/assets/javascripts/0_init.js +4 -0
  13. data/events/app/assets/javascripts/events.js.coffee +66 -0
  14. data/events/app/assets/stylesheets/events.css.scss +37 -0
  15. data/events/app/controllers/events_controller.rb +40 -0
  16. data/events/app/controllers/rooms_controller.rb +7 -0
  17. data/events/app/models/event.rb +53 -0
  18. data/events/app/models/room.rb +8 -0
  19. data/events/app/views/events/_event.html.erb +1 -0
  20. data/events/app/views/events/_new.html.erb +40 -0
  21. data/events/app/views/events/_sidebar_calendar.html.erb +26 -0
  22. data/events/app/views/events/create.js.erb +21 -0
  23. data/events/app/views/events/destroy.js.erb +1 -0
  24. data/events/app/views/events/index.html.erb +96 -0
  25. data/events/app/views/rooms/_form.html.erb +31 -0
  26. data/events/app/views/rooms/_index.html.erb +10 -0
  27. data/events/app/views/rooms/_settings.html.erb +23 -0
  28. data/events/app/views/rooms/create.js.erb +7 -0
  29. data/events/app/views/rooms/destroy.js.erb +1 -0
  30. data/events/config/locales/en.yml +34 -4
  31. data/events/config/locales/es.yml +34 -4
  32. data/events/config/routes.rb +1 -0
  33. data/events/db/migrate/20111101193523_create_events.rb +13 -0
  34. data/events/db/migrate/20111120104349_create_rooms.rb +26 -0
  35. data/events/db/migrate/20111204155637_add_scheduler.rb +33 -0
  36. data/events/db/migrate/20111218203314_change_scheduler.rb +11 -0
  37. data/events/lib/social_stream/events/ability.rb +13 -0
  38. data/events/lib/social_stream/events/engine.rb +17 -0
  39. data/events/lib/social_stream/events/models/actor.rb +13 -0
  40. data/events/lib/social_stream/events/version.rb +1 -1
  41. data/events/lib/social_stream/views/settings/events.rb +18 -0
  42. data/events/lib/social_stream-events.rb +15 -0
  43. data/events/social_stream-events.gemspec +6 -10
  44. data/events/vendor/assets/images/boxy-ne.png +0 -0
  45. data/events/vendor/assets/images/boxy-nw.png +0 -0
  46. data/events/vendor/assets/images/boxy-se.png +0 -0
  47. data/events/vendor/assets/images/boxy-sw.png +0 -0
  48. data/events/vendor/assets/javascripts/fullcalendar.js +12 -10
  49. data/events/vendor/assets/javascripts/gcal.js +2 -2
  50. data/events/vendor/assets/javascripts/jquery.boxy.js +570 -0
  51. data/events/vendor/assets/javascripts/sprintf.js +183 -0
  52. data/events/vendor/assets/stylesheets/boxy.css +49 -0
  53. data/events/vendor/assets/stylesheets/fullcalendar.css +7 -10
  54. data/events/vendor/assets/stylesheets/fullcalendar.print.css +4 -4
  55. data/lib/social_stream/version.rb +1 -1
  56. data/linkser/app/assets/javascripts/linkser.js.erb +7 -3
  57. data/linkser/app/models/link.rb +2 -0
  58. data/linkser/app/views/links/_link.html.erb +1 -1
  59. data/linkser/app/views/links/_link_preview.html.erb +6 -0
  60. data/linkser/db/migrate/20111219122952_add_width_height_to_link.rb +15 -0
  61. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  62. data/linkser/social_stream-linkser.gemspec +1 -1
  63. data/social_stream.gemspec +4 -4
  64. metadata +61 -42
  65. data/events/db/migrate/20110910161707_create_social_stream_events.rb +0 -54
  66. data/events/db/migrate/20111102145626_add_more_fields_to_events.rb +0 -20
  67. data/events/db/migrate/20111104165944_add_more_fields_to_sessions.rb +0 -13
  68. data/events/db/migrate/20111104182420_add_details_to_events.rb +0 -18
  69. data/events/db/migrate/20111209120019_reset_events.rb +0 -18
  70. data/events/vendor/assets/javascripts/jquery.ad-gallery.js +0 -850
  71. data/events/vendor/assets/javascripts/jquery.ad-gallery.pack.js +0 -10
  72. data/events/vendor/assets/stylesheets/ad_next.png +0 -0
  73. data/events/vendor/assets/stylesheets/ad_prev.png +0 -0
  74. data/events/vendor/assets/stylesheets/ad_scroll_back.png +0 -0
  75. data/events/vendor/assets/stylesheets/ad_scroll_forward.png +0 -0
  76. data/events/vendor/assets/stylesheets/jquery.ad-gallery.css +0 -171
  77. data/events/vendor/assets/stylesheets/loader.gif +0 -0
  78. data/events/vendor/assets/stylesheets/social_stream-events.css +0 -273
@@ -0,0 +1,183 @@
1
+ /**
2
+ sprintf() for JavaScript 0.7-beta1
3
+ http://www.diveintojavascript.com/projects/javascript-sprintf
4
+
5
+ Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
6
+ All rights reserved.
7
+
8
+ Redistribution and use in source and binary forms, with or without
9
+ modification, are permitted provided that the following conditions are met:
10
+ * Redistributions of source code must retain the above copyright
11
+ notice, this list of conditions and the following disclaimer.
12
+ * Redistributions in binary form must reproduce the above copyright
13
+ notice, this list of conditions and the following disclaimer in the
14
+ documentation and/or other materials provided with the distribution.
15
+ * Neither the name of sprintf() for JavaScript nor the
16
+ names of its contributors may be used to endorse or promote products
17
+ derived from this software without specific prior written permission.
18
+
19
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22
+ DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
23
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
24
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29
+
30
+
31
+ Changelog:
32
+ 2010.09.06 - 0.7-beta1
33
+ - features: vsprintf, support for named placeholders
34
+ - enhancements: format cache, reduced global namespace pollution
35
+
36
+ 2010.05.22 - 0.6:
37
+ - reverted to 0.4 and fixed the bug regarding the sign of the number 0
38
+ Note:
39
+ Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
40
+ who warned me about a bug in 0.5, I discovered that the last update was
41
+ a regress. I appologize for that.
42
+
43
+ 2010.05.09 - 0.5:
44
+ - bug fix: 0 is now preceeded with a + sign
45
+ - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
46
+ - switched from GPL to BSD license
47
+
48
+ 2007.10.21 - 0.4:
49
+ - unit test and patch (David Baird)
50
+
51
+ 2007.09.17 - 0.3:
52
+ - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
53
+
54
+ 2007.09.11 - 0.2:
55
+ - feature: added argument swapping
56
+
57
+ 2007.04.03 - 0.1:
58
+ - initial release
59
+ **/
60
+
61
+ var sprintf = (function() {
62
+ function get_type(variable) {
63
+ return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
64
+ }
65
+ function str_repeat(input, multiplier) {
66
+ for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
67
+ return output.join('');
68
+ }
69
+
70
+ var str_format = function() {
71
+ if (!str_format.cache.hasOwnProperty(arguments[0])) {
72
+ str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
73
+ }
74
+ return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
75
+ };
76
+
77
+ str_format.format = function(parse_tree, argv) {
78
+ var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
79
+ for (i = 0; i < tree_length; i++) {
80
+ node_type = get_type(parse_tree[i]);
81
+ if (node_type === 'string') {
82
+ output.push(parse_tree[i]);
83
+ }
84
+ else if (node_type === 'array') {
85
+ match = parse_tree[i]; // convenience purposes only
86
+ if (match[2]) { // keyword argument
87
+ arg = argv[cursor];
88
+ for (k = 0; k < match[2].length; k++) {
89
+ if (!arg.hasOwnProperty(match[2][k])) {
90
+ throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
91
+ }
92
+ arg = arg[match[2][k]];
93
+ }
94
+ }
95
+ else if (match[1]) { // positional argument (explicit)
96
+ arg = argv[match[1]];
97
+ }
98
+ else { // positional argument (implicit)
99
+ arg = argv[cursor++];
100
+ }
101
+
102
+ if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
103
+ throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
104
+ }
105
+ switch (match[8]) {
106
+ case 'b': arg = arg.toString(2); break;
107
+ case 'c': arg = String.fromCharCode(arg); break;
108
+ case 'd': arg = parseInt(arg, 10); break;
109
+ case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
110
+ case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
111
+ case 'o': arg = arg.toString(8); break;
112
+ case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
113
+ case 'u': arg = Math.abs(arg); break;
114
+ case 'x': arg = arg.toString(16); break;
115
+ case 'X': arg = arg.toString(16).toUpperCase(); break;
116
+ }
117
+ arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
118
+ pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
119
+ pad_length = match[6] - String(arg).length;
120
+ pad = match[6] ? str_repeat(pad_character, pad_length) : '';
121
+ output.push(match[5] ? arg + pad : pad + arg);
122
+ }
123
+ }
124
+ return output.join('');
125
+ };
126
+
127
+ str_format.cache = {};
128
+
129
+ str_format.parse = function(fmt) {
130
+ var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
131
+ while (_fmt) {
132
+ if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
133
+ parse_tree.push(match[0]);
134
+ }
135
+ else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
136
+ parse_tree.push('%');
137
+ }
138
+ else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
139
+ if (match[2]) {
140
+ arg_names |= 1;
141
+ var field_list = [], replacement_field = match[2], field_match = [];
142
+ if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
143
+ field_list.push(field_match[1]);
144
+ while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
145
+ if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
146
+ field_list.push(field_match[1]);
147
+ }
148
+ else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
149
+ field_list.push(field_match[1]);
150
+ }
151
+ else {
152
+ throw('[sprintf] huh?');
153
+ }
154
+ }
155
+ }
156
+ else {
157
+ throw('[sprintf] huh?');
158
+ }
159
+ match[2] = field_list;
160
+ }
161
+ else {
162
+ arg_names |= 2;
163
+ }
164
+ if (arg_names === 3) {
165
+ throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
166
+ }
167
+ parse_tree.push(match);
168
+ }
169
+ else {
170
+ throw('[sprintf] huh?');
171
+ }
172
+ _fmt = _fmt.substring(match[0].length);
173
+ }
174
+ return parse_tree;
175
+ };
176
+
177
+ return str_format;
178
+ })();
179
+
180
+ var vsprintf = function(fmt, argv) {
181
+ argv.unshift(fmt);
182
+ return sprintf.apply(null, argv);
183
+ };
@@ -0,0 +1,49 @@
1
+ .boxy-wrapper { position: absolute; }
2
+ .boxy-wrapper.fixed { position: fixed; }
3
+
4
+ /* Modal */
5
+
6
+ .boxy-modal-blackout { position: absolute; background-color: black; left: 0; top: 0; }
7
+
8
+ /* Border */
9
+
10
+ .boxy-wrapper { empty-cells: show; }
11
+ .boxy-wrapper .top-left,
12
+ .boxy-wrapper .top-right,
13
+ .boxy-wrapper .bottom-right,
14
+ .boxy-wrapper .bottom-left { width: 10px; height: 10px; padding: 0 }
15
+
16
+ .boxy-wrapper .top-left { background: url('boxy-nw.png'); }
17
+ .boxy-wrapper .top-right { background: url('boxy-ne.png'); }
18
+ .boxy-wrapper .bottom-right { background: url('boxy-se.png'); }
19
+ .boxy-wrapper .bottom-left { background: url('boxy-sw.png'); }
20
+
21
+ /* IE6+7 hacks for the border. IE7 should support this natively but fails in conjuction with modal blackout bg. */
22
+ /* NB: these must be absolute paths or URLs to your images */
23
+ .boxy-wrapper .top-left { #background: none; #filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='boxy-nw.png'); }
24
+ .boxy-wrapper .top-right { #background: none; #filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='boxy-ne.png'); }
25
+ .boxy-wrapper .bottom-right { #background: none; #filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='boxy-se.png'); }
26
+ .boxy-wrapper .bottom-left { #background: none; #filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='boxy-sw.png'); }
27
+
28
+ .boxy-wrapper .top,
29
+ .boxy-wrapper .bottom { height: 10px; background-color: black; opacity: 0.6; filter: alpha(opacity=60); padding: 0 }
30
+
31
+ .boxy-wrapper .left,
32
+ .boxy-wrapper .right { width: 10px; background-color: black; opacity: 0.6; filter: alpha(opacity=60); padding: 0 }
33
+
34
+ /* Title bar */
35
+
36
+ .boxy-wrapper .title-bar { background-color: black; padding: 6px; position: relative; }
37
+ .boxy-wrapper .title-bar.dragging { cursor: move; }
38
+ .boxy-wrapper .title-bar h2 { font-size: 12px; color: white; line-height: 1; margin: 0; padding: 0; font-weight: normal; }
39
+ .boxy-wrapper .title-bar .close { color: white; position: absolute; top: 6px; right: 6px; font-size: 90%; line-height: 1; }
40
+
41
+ /* Content Region */
42
+
43
+ .boxy-inner { background-color: white; padding: 0 }
44
+ .boxy-content { padding: 15px; }
45
+
46
+ /* Question Boxes */
47
+
48
+ .boxy-wrapper .question { width: 350px; min-height: 80px; }
49
+ .boxy-wrapper .answers { text-align: right; }
@@ -1,11 +1,11 @@
1
1
  /*
2
- * FullCalendar v1.5.1 Stylesheet
2
+ * FullCalendar v1.5.2 Stylesheet
3
3
  *
4
4
  * Copyright (c) 2011 Adam Shaw
5
5
  * Dual licensed under the MIT and GPL licenses, located in
6
6
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
7
7
  *
8
- * Date: Sat Apr 9 14:09:51 2011 -0700
8
+ * Date: Sun Aug 21 22:06:09 2011 -0700
9
9
  *
10
10
  */
11
11
 
@@ -133,8 +133,8 @@ html .fc,
133
133
 
134
134
  .fc-cell-overlay { /* semi-transparent rectangle while dragging */
135
135
  background: #9cf;
136
- /*opacity: .2;*/
137
- /*filter: alpha(opacity=20); /* for IE */
136
+ opacity: .2;
137
+ filter: alpha(opacity=20); /* for IE */
138
138
  }
139
139
 
140
140
 
@@ -279,10 +279,9 @@ a.fc-event {
279
279
  }
280
280
 
281
281
  .fc-event-skin {
282
- border-color: #1F4A75; /* default BORDER color */
283
- background-color: #1F4A75; /* default BACKGROUND color */
282
+ border-color: #36c; /* default BORDER color */
283
+ background-color: #36c; /* default BACKGROUND color */
284
284
  color: #fff; /* default TEXT color */
285
-
286
285
  }
287
286
 
288
287
  .fc-event-inner {
@@ -297,7 +296,6 @@ a.fc-event {
297
296
  .fc-event-time,
298
297
  .fc-event-title {
299
298
  padding: 0 1px;
300
- color:#fff;
301
299
  }
302
300
 
303
301
  .fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
@@ -591,8 +589,7 @@ table.fc-border-separate {
591
589
  height: 100%;
592
590
  background: #fff;
593
591
  opacity: .3;
594
-
595
-
592
+ filter: alpha(opacity=30);
596
593
  }
597
594
 
598
595
  .fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
@@ -1,5 +1,5 @@
1
1
  /*
2
- * FullCalendar v1.5.1 Print Stylesheet
2
+ * FullCalendar v1.5.2 Print Stylesheet
3
3
  *
4
4
  * Include this stylesheet on your page to get a more printer-friendly calendar.
5
5
  * When including this stylesheet, use the media='print' attribute of the <link> tag.
@@ -9,7 +9,7 @@
9
9
  * Dual licensed under the MIT and GPL licenses, located in
10
10
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
11
11
  *
12
- * Date: Sat Apr 9 14:09:51 2011 -0700
12
+ * Date: Sun Aug 21 22:06:09 2011 -0700
13
13
  *
14
14
  */
15
15
 
@@ -18,8 +18,8 @@
18
18
  -----------------------------------------------------*/
19
19
 
20
20
  .fc-event-skin {
21
- /*background: none !important;
22
- color: #000 !important; */
21
+ background: none !important;
22
+ color: #000 !important;
23
23
  }
24
24
 
25
25
  /* horizontal events */
@@ -1,3 +1,3 @@
1
1
  module SocialStream
2
- VERSION = "0.15.8".freeze
2
+ VERSION = "0.16.1".freeze
3
3
  end
@@ -50,10 +50,14 @@ SocialStream.Linkser.initiate = function() {
50
50
  }
51
51
  }
52
52
 
53
- SocialStream.Linkser.openCallback = function(id,url){
54
- $("#" + id).html($('<iframe>').attr('src',url).attr('width','470').attr('height','353'));
53
+ SocialStream.Linkser.openCallback = function(id,url,w,h){
54
+ var height='353';
55
+ if(w>0 && h>0) {
56
+ height=470*h/w;
57
+ }
58
+ $("#" + id).html($('<iframe>').attr('src',url).attr('width','470').attr('height',height));
55
59
  }
56
60
 
57
61
  $(function(){
58
62
  SocialStream.Linkser.initiate();
59
- });
63
+ });
@@ -23,6 +23,8 @@ class Link < ActiveRecord::Base
23
23
  if r and r.type and r.url
24
24
  self.callback_url = r.url
25
25
  end
26
+ self.width = r.width if r and r.width
27
+ self.height = r.height if r and r.height
26
28
  if linkser_object.ogp and linkser_object.ogp.image
27
29
  self.image = linkser_object.ogp.image
28
30
  elsif linkser_object.images and linkser_object.images.first
@@ -7,7 +7,7 @@
7
7
  <%= javascript_tag do %>
8
8
  $("#link_<%= link.id.to_s %> img").each(function(){
9
9
  $(this).click(function(){
10
- SocialStream.Linkser.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>");
10
+ SocialStream.Linkser.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
11
11
  });
12
12
  });
13
13
 
@@ -24,5 +24,11 @@
24
24
  <% if link.callback_url %>
25
25
  <%= hidden_field_tag "link[callback_url]", link.callback_url %>
26
26
  <% end %>
27
+ <% if link.width %>
28
+ <%= hidden_field_tag "link[width]", link.width %>
29
+ <% end %>
30
+ <% if link.height %>
31
+ <%= hidden_field_tag "link[height]", link.height %>
32
+ <% end %>
27
33
  </div>
28
34
  <% end %>
@@ -0,0 +1,15 @@
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
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Linkser
3
- VERSION = "0.0.6".freeze
3
+ VERSION = "0.1.0".freeze
4
4
  end
5
5
  end
@@ -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', '~> 0.10.9')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
16
16
  s.add_runtime_dependency('linkser', '~> 0.0.8')
17
17
  # Development Gem dependencies
18
18
  s.add_development_dependency('sqlite3-ruby')
@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
11
11
  s.files = `git ls-files`.split("\n")
12
12
 
13
13
  # Gem dependencies
14
- s.add_runtime_dependency('social_stream-base', '~> 0.10.11')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.5.2')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.2.0')
17
- s.add_runtime_dependency('social_stream-linkser', '~> 0.0.6')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.6.0')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.3.0')
17
+ s.add_runtime_dependency('social_stream-linkser', '~> 0.1.0')
18
18
 
19
19
  # Development Gem dependencies
20
20
  #
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.8
4
+ version: 0.16.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,55 +10,55 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-12-19 00:00:00.000000000Z
13
+ date: 2011-12-21 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &84191910 !ruby/object:Gem::Requirement
17
+ requirement: &81048520 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.10.11
22
+ version: 0.11.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *84191910
25
+ version_requirements: *81048520
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &84355590 !ruby/object:Gem::Requirement
28
+ requirement: &81048140 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.5.2
33
+ version: 0.6.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *84355590
36
+ version_requirements: *81048140
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &84435670 !ruby/object:Gem::Requirement
39
+ requirement: &81047780 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- version: 0.2.0
44
+ version: 0.3.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *84435670
47
+ version_requirements: *81047780
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &84438660 !ruby/object:Gem::Requirement
50
+ requirement: &81047300 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
54
54
  - !ruby/object:Gem::Version
55
- version: 0.0.6
55
+ version: 0.1.0
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *84438660
58
+ version_requirements: *81047300
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: capybara
61
- requirement: &84440690 !ruby/object:Gem::Requirement
61
+ requirement: &81046550 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 0.3.9
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *84440690
69
+ version_requirements: *81046550
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: sqlite3
72
- requirement: &84470630 !ruby/object:Gem::Requirement
72
+ requirement: &81046250 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *84470630
80
+ version_requirements: *81046250
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: rspec-rails
83
- requirement: &84934430 !ruby/object:Gem::Requirement
83
+ requirement: &81045830 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 2.5.0
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *84934430
91
+ version_requirements: *81045830
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: factory_girl
94
- requirement: &85093480 !ruby/object:Gem::Requirement
94
+ requirement: &81045520 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ~>
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: 1.3.2
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *85093480
102
+ version_requirements: *81045520
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: forgery
105
- requirement: &85725910 !ruby/object:Gem::Requirement
105
+ requirement: &80949110 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 0.3.6
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *85725910
113
+ version_requirements: *80949110
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: ci_reporter
116
- requirement: &86188010 !ruby/object:Gem::Requirement
116
+ requirement: &80948750 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,7 +121,7 @@ dependencies:
121
121
  version: 1.6.4
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *86188010
124
+ version_requirements: *80948750
125
125
  description: Social Stream is a Ruby on Rails engine for building social network websites.
126
126
  It supports contacts, posts, file uploads, private messages and many more.
127
127
  email:
@@ -612,6 +612,7 @@ files:
612
612
  - base/db/migrate/20110712142140_remove_permission_function.rb
613
613
  - base/db/migrate/20110912074426_add_reject_relation.rb
614
614
  - base/db/migrate/20111124100618_object_actors.rb
615
+ - base/db/migrate/20111221103509_add_language_field.rb
615
616
  - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
616
617
  - base/lib/acts_as_taggable_on/social_stream.rb
617
618
  - base/lib/generators/social_stream/base/install_generator.rb
@@ -942,36 +943,54 @@ files:
942
943
  - events/Gemfile
943
944
  - events/README.rdoc
944
945
  - events/Rakefile
946
+ - events/app/assets/javascripts/0_init.js
947
+ - events/app/assets/javascripts/events.js.coffee
945
948
  - events/app/assets/javascripts/social_stream-events.js
949
+ - events/app/assets/stylesheets/events.css.scss
946
950
  - events/app/assets/stylesheets/social_stream-events.css
951
+ - events/app/controllers/events_controller.rb
952
+ - events/app/controllers/rooms_controller.rb
953
+ - events/app/models/event.rb
954
+ - events/app/models/room.rb
955
+ - events/app/views/events/_event.html.erb
956
+ - events/app/views/events/_new.html.erb
957
+ - events/app/views/events/_sidebar_calendar.html.erb
958
+ - events/app/views/events/create.js.erb
959
+ - events/app/views/events/destroy.js.erb
960
+ - events/app/views/events/index.html.erb
961
+ - events/app/views/rooms/_form.html.erb
962
+ - events/app/views/rooms/_index.html.erb
963
+ - events/app/views/rooms/_settings.html.erb
964
+ - events/app/views/rooms/create.js.erb
965
+ - events/app/views/rooms/destroy.js.erb
947
966
  - events/config/locales/en.yml
948
967
  - events/config/locales/es.yml
949
968
  - events/config/routes.rb
950
- - events/db/migrate/20110910161707_create_social_stream_events.rb
951
- - events/db/migrate/20111102145626_add_more_fields_to_events.rb
952
- - events/db/migrate/20111104165944_add_more_fields_to_sessions.rb
953
- - events/db/migrate/20111104182420_add_details_to_events.rb
954
- - events/db/migrate/20111209120019_reset_events.rb
969
+ - events/db/migrate/20111101193523_create_events.rb
970
+ - events/db/migrate/20111120104349_create_rooms.rb
971
+ - events/db/migrate/20111204155637_add_scheduler.rb
972
+ - events/db/migrate/20111218203314_change_scheduler.rb
955
973
  - events/lib/generators/social_stream/events/install_generator.rb
956
974
  - events/lib/social_stream-events.rb
975
+ - events/lib/social_stream/events/ability.rb
957
976
  - events/lib/social_stream/events/engine.rb
977
+ - events/lib/social_stream/events/models/actor.rb
958
978
  - events/lib/social_stream/events/version.rb
959
979
  - events/lib/social_stream/migrations/events.rb
960
980
  - events/lib/social_stream/toolbar_config/events.rb
981
+ - events/lib/social_stream/views/settings/events.rb
961
982
  - events/social_stream-events.gemspec
983
+ - events/vendor/assets/images/boxy-ne.png
984
+ - events/vendor/assets/images/boxy-nw.png
985
+ - events/vendor/assets/images/boxy-se.png
986
+ - events/vendor/assets/images/boxy-sw.png
962
987
  - events/vendor/assets/javascripts/fullcalendar.js
963
988
  - events/vendor/assets/javascripts/gcal.js
964
- - events/vendor/assets/javascripts/jquery.ad-gallery.js
965
- - events/vendor/assets/javascripts/jquery.ad-gallery.pack.js
966
- - events/vendor/assets/stylesheets/ad_next.png
967
- - events/vendor/assets/stylesheets/ad_prev.png
968
- - events/vendor/assets/stylesheets/ad_scroll_back.png
969
- - events/vendor/assets/stylesheets/ad_scroll_forward.png
989
+ - events/vendor/assets/javascripts/jquery.boxy.js
990
+ - events/vendor/assets/javascripts/sprintf.js
991
+ - events/vendor/assets/stylesheets/boxy.css
970
992
  - events/vendor/assets/stylesheets/fullcalendar.css
971
993
  - events/vendor/assets/stylesheets/fullcalendar.print.css
972
- - events/vendor/assets/stylesheets/jquery.ad-gallery.css
973
- - events/vendor/assets/stylesheets/loader.gif
974
- - events/vendor/assets/stylesheets/social_stream-events.css
975
994
  - lib/generators/social_stream/USAGE
976
995
  - lib/generators/social_stream/install_generator.rb
977
996
  - lib/social_stream.rb
@@ -1005,6 +1024,7 @@ files:
1005
1024
  - linkser/config/locales/es.yml
1006
1025
  - linkser/config/routes.rb
1007
1026
  - linkser/db/migrate/20111129100618_create_social_stream_linkser.rb
1027
+ - linkser/db/migrate/20111219122952_add_width_height_to_link.rb
1008
1028
  - linkser/lib/generators/social_stream/linkser/install_generator.rb
1009
1029
  - linkser/lib/social_stream-linkser.rb
1010
1030
  - linkser/lib/social_stream/linkser/engine.rb
@@ -1309,9 +1329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1309
1329
  version: '0'
1310
1330
  requirements: []
1311
1331
  rubyforge_project:
1312
- rubygems_version: 1.8.12
1332
+ rubygems_version: 1.8.10
1313
1333
  signing_key:
1314
1334
  specification_version: 3
1315
1335
  summary: A core for building social network websites
1316
1336
  test_files: []
1317
- has_rdoc: