social_stream 2.1.1 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (188) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -2
  3. data/LICENSE +1 -1
  4. data/base/Rakefile +3 -17
  5. data/base/app/assets/images/flags/de.png +0 -0
  6. data/base/app/assets/images/flags/fr.png +0 -0
  7. data/base/app/assets/images/flags/hu.png +0 -0
  8. data/base/app/assets/images/flags/nl.png +0 -0
  9. data/base/app/assets/javascripts/social_stream/actor.js +34 -0
  10. data/base/app/assets/javascripts/social_stream/contact.js +40 -5
  11. data/base/app/assets/javascripts/social_stream/flash.js +6 -1
  12. data/base/app/assets/javascripts/social_stream/group.js +6 -5
  13. data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
  14. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
  15. data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
  16. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
  17. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
  18. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
  19. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
  20. data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
  21. data/base/app/controllers/actors_controller.rb +25 -0
  22. data/base/app/controllers/contacts_controller.rb +38 -8
  23. data/base/app/controllers/groups_controller.rb +2 -21
  24. data/base/app/controllers/profiles_controller.rb +4 -0
  25. data/base/app/controllers/settings_controller.rb +12 -2
  26. data/base/app/controllers/users_controller.rb +0 -8
  27. data/base/app/helpers/contacts_helper.rb +8 -0
  28. data/base/app/models/activity.rb +19 -6
  29. data/base/app/models/actor.rb +49 -11
  30. data/base/app/models/contact.rb +12 -5
  31. data/base/app/models/group.rb +13 -11
  32. data/base/app/models/permission.rb +30 -0
  33. data/base/app/models/relation.rb +17 -7
  34. data/base/app/models/relation/custom.rb +2 -40
  35. data/base/app/models/relation/follow.rb +8 -2
  36. data/base/app/models/relation/owner.rb +10 -0
  37. data/base/app/models/relation/single.rb +7 -4
  38. data/base/app/models/site.rb +1 -1
  39. data/base/app/models/tie.rb +8 -4
  40. data/base/app/views/contacts/_add_button.html.erb +9 -0
  41. data/base/app/views/contacts/_button.html.erb +3 -3
  42. data/base/app/views/contacts/_button_multiple.html.erb +4 -0
  43. data/base/app/views/contacts/_button_simple.html.erb +17 -0
  44. data/base/app/views/contacts/_new_modal.html.erb +22 -0
  45. data/base/app/views/contacts/destroy.js.erb +5 -4
  46. data/base/app/views/contacts/update.js.erb +5 -4
  47. data/base/app/views/devise/confirmations/new.html.erb +14 -9
  48. data/base/app/views/frontpage/_presentation.html.erb +2 -2
  49. data/base/app/views/groups/_form.html.erb +20 -20
  50. data/base/app/views/groups/show.html.erb +5 -5
  51. data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
  52. data/base/app/views/layouts/_header_signed_in.erb +3 -3
  53. data/base/app/views/layouts/_logo_in.html.erb +1 -1
  54. data/base/app/views/layouts/application.html.erb +2 -0
  55. data/base/app/views/permissions/_list.html.erb +1 -1
  56. data/base/app/views/profiles/_avatar.html.erb +1 -5
  57. data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
  58. data/base/app/views/profiles/_comunication-info.html.erb +2 -36
  59. data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
  60. data/base/app/views/profiles/_edit_icon.html.erb +0 -1
  61. data/base/app/views/profiles/_experience.html.erb +1 -6
  62. data/base/app/views/profiles/_experience_edit.html.erb +5 -0
  63. data/base/app/views/profiles/_personal.html.erb +1 -39
  64. data/base/app/views/profiles/_personal_edit.html.erb +31 -0
  65. data/base/app/views/profiles/_profile_edit.html.erb +7 -0
  66. data/base/app/views/profiles/_tags.html.erb +1 -4
  67. data/base/app/views/profiles/_tags_edit.html.erb +4 -0
  68. data/base/app/views/profiles/edit.html.erb +24 -0
  69. data/base/app/views/settings/_notifications.html.erb +12 -4
  70. data/base/app/views/users/show.html.erb +5 -5
  71. data/base/config/locales/de.yml +654 -0
  72. data/base/config/locales/en.yml +20 -9
  73. data/base/config/locales/es.yml +151 -140
  74. data/base/config/locales/fr.yml +656 -0
  75. data/base/config/locales/hu.yml +653 -0
  76. data/base/config/locales/nl.yml +656 -0
  77. data/base/config/locales/pt.yml +250 -239
  78. data/base/config/locales/rails.de.yml +203 -0
  79. data/base/config/locales/rails.fr.yml +222 -0
  80. data/base/config/locales/rails.hu.yml +199 -0
  81. data/base/config/locales/rails.nl.yml +199 -0
  82. data/base/config/locales/zh.yml +214 -202
  83. data/base/config/routes.rb +22 -30
  84. data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
  85. data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
  86. data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
  87. data/base/lib/rails/social_stream.rb +2 -0
  88. data/base/lib/social_stream/base.rb +27 -7
  89. data/base/lib/social_stream/base/ability.rb +3 -5
  90. data/base/lib/social_stream/base/autoload.rb +1 -0
  91. data/base/lib/social_stream/base/version.rb +1 -1
  92. data/base/lib/social_stream/controllers/authorship.rb +18 -0
  93. data/base/lib/social_stream/controllers/helpers.rb +18 -4
  94. data/base/lib/social_stream/controllers/objects.rb +2 -8
  95. data/base/lib/social_stream/controllers/subjects.rb +9 -2
  96. data/base/lib/social_stream/models/supertype.rb +2 -0
  97. data/base/lib/social_stream/population/activity_object.rb +6 -8
  98. data/base/lib/social_stream/routing/mapper.rb +52 -0
  99. data/base/social_stream-base.gemspec +4 -7
  100. data/base/spec/controllers/groups_controller_spec.rb +19 -8
  101. data/base/spec/controllers/posts_controller_spec.rb +114 -147
  102. data/base/spec/models/post_authorization_spec.rb +190 -204
  103. data/base/spec/models/post_spec.rb +17 -63
  104. data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
  105. data/documents/Rakefile +1 -6
  106. data/documents/config/locales/de.yml +93 -0
  107. data/documents/config/locales/es.yml +2 -2
  108. data/documents/config/locales/fr.yml +93 -0
  109. data/documents/config/locales/hu.yml +93 -0
  110. data/documents/config/locales/nl.yml +93 -0
  111. data/documents/config/locales/zh.yml +4 -4
  112. data/documents/config/routes.rb +7 -9
  113. data/documents/lib/social_stream/documents/version.rb +1 -1
  114. data/documents/social_stream-documents.gemspec +4 -4
  115. data/events/Rakefile +1 -6
  116. data/events/config/locales/es.yml +3 -3
  117. data/events/config/locales/zh.yml +3 -3
  118. data/events/lib/social_stream/events/models/actor.rb +2 -1
  119. data/events/lib/social_stream/events/version.rb +1 -1
  120. data/events/social_stream-events.gemspec +1 -1
  121. data/lib/generators/social_stream/install_generator.rb +1 -0
  122. data/lib/social_stream.rb +1 -0
  123. data/lib/social_stream/version.rb +1 -1
  124. data/lib/tasks/i18n.rake +22 -2
  125. data/linkser/Rakefile +1 -6
  126. data/linkser/config/locales/de.yml +17 -0
  127. data/linkser/config/locales/es.yml +2 -2
  128. data/linkser/config/locales/fr.yml +17 -0
  129. data/linkser/config/locales/hu.yml +17 -0
  130. data/linkser/config/locales/nl.yml +17 -0
  131. data/linkser/config/locales/zh.yml +2 -2
  132. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  133. data/linkser/social_stream-linkser.gemspec +1 -1
  134. data/oauth2_server/Rakefile +1 -6
  135. data/oauth2_server/app/assets/images/step_1.png +0 -0
  136. data/oauth2_server/app/assets/images/step_2.png +0 -0
  137. data/oauth2_server/app/assets/images/step_3.png +0 -0
  138. data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
  139. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
  140. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
  141. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
  142. data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
  143. data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
  144. data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
  145. data/oauth2_server/app/models/relation/manager.rb +1 -10
  146. data/oauth2_server/app/models/site/client.rb +4 -2
  147. data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
  148. data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
  149. data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
  150. data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
  151. data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
  152. data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
  153. data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
  154. data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
  155. data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
  156. data/oauth2_server/config/locales/en.yml +19 -0
  157. data/oauth2_server/config/locales/es.yml +23 -4
  158. data/oauth2_server/config/locales/zh.yml +32 -13
  159. data/oauth2_server/config/routes.rb +3 -1
  160. data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
  161. data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
  162. data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
  163. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  164. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  165. data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
  166. data/ostatus/Rakefile +1 -6
  167. data/ostatus/config/locales/zh.yml +8 -8
  168. data/ostatus/lib/social_stream-ostatus.rb +3 -0
  169. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  170. data/ostatus/social_stream-ostatus.gemspec +1 -1
  171. data/places/config/locales/es.yml +51 -51
  172. data/presence/config/locales/es.yml +48 -48
  173. data/presence/config/locales/zh.yml +48 -48
  174. data/presence/lib/social_stream/presence/version.rb +1 -1
  175. data/presence/social_stream-presence.gemspec +1 -1
  176. data/social_stream.gemspec +8 -7
  177. metadata +60 -29
  178. data/base/app/assets/javascripts/social_stream/follow.js +0 -28
  179. data/base/app/controllers/followers_controller.rb +0 -34
  180. data/base/app/helpers/followers_helper.rb +0 -5
  181. data/base/app/views/contacts/_link_follow.html.erb +0 -16
  182. data/base/app/views/followers/destroy.js.erb +0 -1
  183. data/base/app/views/followers/index.html.erb +0 -30
  184. data/base/app/views/followers/update.js.erb +0 -3
  185. data/base/app/views/frontpage/_characteristics.html.erb +0 -23
  186. data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
  187. data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
  188. data/base/spec/controllers/followers_controller_spec.rb +0 -37
@@ -2,68 +2,68 @@
2
2
  es:
3
3
  chat:
4
4
  connecting: Conectando
5
- reconnecting: Reconectando
6
5
  disconnected: Desconectado
7
- unableconnect: Fuera de servicio
8
- title: Chat
6
+ game:
7
+ accept: Aceptar
8
+ call: '{{name}} quiere iniciar una partida de {{game}}'
9
+ cancel: '{{name}} canceló la partida'
10
+ clientIssue: El cliente de {{name}} no tiene juegos
11
+ deny: Rechazar
12
+ finish: '{{name}} ha cerrado el juego'
13
+ guestOffline: Imposible conectar. {{name}} está desconectado
14
+ offline: Imposible conectar. Estás desconectado
15
+ rejected: '{{name}} ha rechazado tu invitación'
16
+ rejectedBusy: '{{name}} está ocupado'
17
+ unable: Imposible iniciar partida.
18
+ unknown: Respuesta desconocida
19
+ waiting: Esperando respuesta...
20
+ muc:
21
+ group: Grupo {{group}}
22
+ join: '{{nick}} ha entrado en la sala.'
23
+ joinError: "No se pudo acceder a la sala. \n {{errorMsg}}"
24
+ joining: Accediendo...
25
+ leave: '{{nick}} se ha ido de la sala.'
26
+ occupants: Miembros
27
+ offline: Estás desconectado
28
+ notify:
29
+ guestOffline: '{{name}} está desconectado'
30
+ offline: Estás desconectado
9
31
  password: Contraseña
10
- zerousers: No hay contactos conectados
32
+ reconnecting: Reconectando
11
33
  search: Buscar contactos
12
- zerocontacts: No se encontró ningún contacto
34
+ settings:
35
+ checkbox: Activar o desactivar chat
36
+ title: Activación y configuración del chat de Social Stream
37
+ update: Guardar configuración
13
38
  status:
14
- choose: Establecer estado
15
39
  available: Disponible
16
40
  away: Ausente
41
+ choose: Establecer estado
17
42
  dnd: No molestar
18
43
  offline: Desconectado
19
- settings:
20
- title: Activación y configuración del chat de Social Stream
21
- checkbox: Activar o desactivar chat
22
- update: Guardar configuración
23
- notify:
24
- offline: Estás desconectado
25
- guestOffline: '{{name}} está desconectado'
44
+ title: Chat
45
+ unableconnect: Fuera de servicio
26
46
  videochat:
27
- disconnected: Videochat desconectado
28
- disconnecting: Videochat desconectando...
29
- negotiating: Negociando...
30
- connectingWait: Conectando...
47
+ accept: Aceptar
48
+ call: '{{name}} quiere iniciar una videollamada'
49
+ cancel: '{{name}} canceló la videollamada'
50
+ clientIssue: El cliente de {{name}} no soporta videochat
31
51
  connecting: Conectando con el servidor...
32
- waiting: Esperando respuesta...
33
- establishing: Estableciendo conexión...
52
+ connectingWait: Conectando...
34
53
  connnected: Videochat conectado
35
- unable: Imposible iniciar videochat
36
- serverIssue: 'Error del servidor: Respuesta inválida'
37
- call: '{{name}} quiere iniciar una videollamada'
38
- rejected: '{{name}} ha rechazado tu llamada'
39
- rejectedBusy: '{{name}} está ocupado'
40
- accept: Aceptar
41
54
  deny: Rechazar
42
- clientIssue: El cliente de {{name}} no soporta videochat
55
+ disconnected: Videochat desconectado
56
+ disconnecting: Videochat desconectando...
57
+ establishing: Estableciendo conexión...
43
58
  guestOffline: Imposible conectar. {{name}} está desconectado
59
+ negotiating: Negociando...
44
60
  offline: Imposible conectar. Estás desconectado
45
- cancel: '{{name}} canceló la videollamada'
61
+ rejected: '{{name}} ha rechazado tu llamada'
62
+ rejectedBusy: '{{name}} está ocupado'
46
63
  requirements: No tienes los requisitos minimos para iniciar la aplicación de
47
64
  videoconferencia. Por favor, actualiza a la última versión de Flash.
48
- muc:
49
- group: Grupo {{group}}
50
- join: '{{nick}} ha entrado en la sala.'
51
- leave: '{{nick}} se ha ido de la sala.'
52
- occupants: Miembros
53
- joining: Accediendo...
54
- joinError: "No se pudo acceder a la sala. \n {{errorMsg}}"
55
- offline: Estás desconectado
56
- game:
57
- call: '{{name}} quiere iniciar una partida de {{game}}'
58
- accept: Aceptar
59
- deny: Rechazar
60
- offline: Imposible conectar. Estás desconectado
61
- guestOffline: Imposible conectar. {{name}} está desconectado
62
- unable: Imposible iniciar partida.
63
- rejected: '{{name}} ha rechazado tu invitación'
64
- rejectedBusy: '{{name}} está ocupado'
65
- cancel: '{{name}} canceló la partida'
66
- finish: '{{name}} ha cerrado el juego'
65
+ serverIssue: 'Error del servidor: Respuesta inválida'
66
+ unable: Imposible iniciar videochat
67
67
  waiting: Esperando respuesta...
68
- unknown: Respuesta desconocida
69
- clientIssue: El cliente de {{name}} no tiene juegos
68
+ zerocontacts: No se encontró ningún contacto
69
+ zerousers: No hay contactos conectados
@@ -2,68 +2,68 @@
2
2
  zh:
3
3
  chat:
4
4
  connecting: Connecting
5
- reconnecting: Reconnecting
6
5
  disconnected: Disconnected
7
- unableconnect: Out of Service
8
- title: Chat
6
+ game:
7
+ accept: Accept
8
+ call: '{{name}} wants to play a {{game}} game'
9
+ cancel: '{{name}} cancel the invitation'
10
+ clientIssue: '{{name}}''s client not support games'
11
+ deny: Deny
12
+ finish: '{{name}} close the game'
13
+ guestOffline: Unable to connect. {{name}} is offline
14
+ offline: Unable to connect. You are offline
15
+ rejected: '{{name}} has rejected your invitation'
16
+ rejectedBusy: '{{name}} is busy'
17
+ unable: Unable to init game.
18
+ unknown: Unknown response
19
+ waiting: Waiting for response...
20
+ muc:
21
+ group: '{{group}} group'
22
+ join: '{{nick}} joined in the room.'
23
+ joinError: "You can't join in the room \n {{errorMsg}}"
24
+ joining: Joining...
25
+ leave: '{{nick}} has left the room.'
26
+ occupants: Occupants
27
+ offline: You are offline
28
+ notify:
29
+ guestOffline: '{{name}} is offline'
30
+ offline: You are offline
9
31
  password: Password
10
- zerousers: No users connected
32
+ reconnecting: Reconnecting
11
33
  search: Search contacts
12
- zerocontacts: No contacts found
34
+ settings:
35
+ checkbox: Enable or disable Social Stream Chat
36
+ title: Enable and configure Social Stream Chat
37
+ update: Update Settings
13
38
  status:
14
- choose: Choose status
15
39
  available: Available
16
40
  away: Away
41
+ choose: Choose status
17
42
  dnd: Busy
18
43
  offline: Offline
19
- settings:
20
- title: Enable and configure Social Stream Chat
21
- checkbox: Enable or disable Social Stream Chat
22
- update: Update Settings
23
- notify:
24
- offline: You are offline
25
- guestOffline: '{{name}} is offline'
44
+ title: Chat
45
+ unableconnect: Out of Service
26
46
  videochat:
27
- disconnected: Videochat disconnected
28
- disconnecting: Videochat disconnecting...
29
- negotiating: Negotiating...
30
- connectingWait: Connecting...
47
+ accept: Accept
48
+ call: '{{name}} wants to start a video call'
49
+ cancel: '{{name}} cancel the videocall'
50
+ clientIssue: '{{name}}''s client not support videochat'
31
51
  connecting: Connecting to the server...
32
- waiting: Waiting for response...
33
- establishing: Establishing...
52
+ connectingWait: Connecting...
34
53
  connnected: Videochat connected.
35
- unable: Unable to init videochat.
36
- serverIssue: 'Server Error: Invalid response'
37
- call: '{{name}} wants to start a video call'
38
- rejected: '{{name}} has rejected your call'
39
- rejectedBusy: '{{name}} is busy'
40
- accept: Accept
41
54
  deny: Deny
42
- clientIssue: '{{name}}''s client not support videochat'
55
+ disconnected: Videochat disconnected
56
+ disconnecting: Videochat disconnecting...
57
+ establishing: Establishing...
43
58
  guestOffline: Unable to connect. {{name}} is offline
59
+ negotiating: Negotiating...
44
60
  offline: Unable to connect. You are offline
45
- cancel: '{{name}} cancel the videocall'
61
+ rejected: '{{name}} has rejected your call'
62
+ rejectedBusy: '{{name}} is busy'
46
63
  requirements: You don't have the minimum requirements to run videocall application.
47
64
  Please upgrade to the latest version of Flash.
48
- muc:
49
- group: '{{group}} group'
50
- join: '{{nick}} joined in the room.'
51
- leave: '{{nick}} has left the room.'
52
- occupants: Occupants
53
- joining: Joining...
54
- joinError: "You can't join in the room \n {{errorMsg}}"
55
- offline: You are offline
56
- game:
57
- call: '{{name}} wants to play a {{game}} game'
58
- accept: Accept
59
- deny: Deny
60
- offline: Unable to connect. You are offline
61
- guestOffline: Unable to connect. {{name}} is offline
62
- unable: Unable to init game.
63
- rejected: '{{name}} has rejected your invitation'
64
- rejectedBusy: '{{name}} is busy'
65
- cancel: '{{name}} cancel the invitation'
66
- finish: '{{name}} close the game'
65
+ serverIssue: 'Server Error: Invalid response'
66
+ unable: Unable to init videochat.
67
67
  waiting: Waiting for response...
68
- unknown: Unknown response
69
- clientIssue: '{{name}}''s client not support games'
68
+ zerocontacts: No contacts found
69
+ zerousers: No users connected
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Presence
3
- VERSION = "2.1.0"
3
+ VERSION = "2.2.0"
4
4
  end
5
5
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  # Gem dependencies
22
- s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
22
+ s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
23
23
 
24
24
  s.add_runtime_dependency "xmpp4r"
25
25
 
@@ -8,15 +8,16 @@ Gem::Specification.new do |s|
8
8
  s.authors = [ "GING - DIT - UPM" ]
9
9
  s.homepage = "http://social-stream.dit.upm.es/"
10
10
  s.files = `git ls-files`.split("\n")
11
+ s.license = 'MIT'
11
12
 
12
13
  # Gem dependencies
13
- s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
14
- s.add_runtime_dependency('social_stream-documents', '~> 2.1.0')
15
- s.add_runtime_dependency('social_stream-events', '~> 2.1.0')
16
- s.add_runtime_dependency('social_stream-linkser', '~> 2.1.0')
17
- s.add_runtime_dependency('social_stream-presence', '~> 2.1.0')
18
- s.add_runtime_dependency('social_stream-ostatus', '~> 2.1.0')
19
- s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.1.1')
14
+ s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 2.2.0')
16
+ s.add_runtime_dependency('social_stream-events', '~> 2.2.0')
17
+ s.add_runtime_dependency('social_stream-linkser', '~> 2.2.0')
18
+ s.add_runtime_dependency('social_stream-presence', '~> 2.2.0')
19
+ s.add_runtime_dependency('social_stream-ostatus', '~> 2.2.0')
20
+ s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.2.0')
20
21
 
21
22
  # Development Gem dependencies
22
23
  #
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.1.1
4
+ version: 2.2.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-07-31 00:00:00.000000000 Z
11
+ date: 2013-08-01 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.1.0
19
+ version: 2.2.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.1.0
26
+ version: 2.2.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.1.0
33
+ version: 2.2.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.1.0
40
+ version: 2.2.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.1.0
47
+ version: 2.2.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.1.0
54
+ version: 2.2.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.1.0
61
+ version: 2.2.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.1.0
68
+ version: 2.2.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.1.0
75
+ version: 2.2.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.1.0
82
+ version: 2.2.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.1.0
89
+ version: 2.2.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.1.0
96
+ version: 2.2.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.1.1
103
+ version: 2.2.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.1.1
110
+ version: 2.2.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: capybara
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -274,8 +274,12 @@ files:
274
274
  - base/app/assets/images/cleditor/toolbar.gif
275
275
  - base/app/assets/images/facebook.png
276
276
  - base/app/assets/images/fiware.png
277
+ - base/app/assets/images/flags/de.png
277
278
  - base/app/assets/images/flags/en.png
278
279
  - base/app/assets/images/flags/es.png
280
+ - base/app/assets/images/flags/fr.png
281
+ - base/app/assets/images/flags/hu.png
282
+ - base/app/assets/images/flags/nl.png
279
283
  - base/app/assets/images/flags/pt.png
280
284
  - base/app/assets/images/group.png
281
285
  - base/app/assets/images/header-logo-index.png
@@ -303,6 +307,7 @@ files:
303
307
  - base/app/assets/images/user.png
304
308
  - base/app/assets/javascripts/social_stream-base.js
305
309
  - base/app/assets/javascripts/social_stream/action.js
310
+ - base/app/assets/javascripts/social_stream/actor.js
306
311
  - base/app/assets/javascripts/social_stream/audience.js
307
312
  - base/app/assets/javascripts/social_stream/callback.js
308
313
  - base/app/assets/javascripts/social_stream/comment.js
@@ -310,7 +315,6 @@ files:
310
315
  - base/app/assets/javascripts/social_stream/conversation.js
311
316
  - base/app/assets/javascripts/social_stream/explore.js
312
317
  - base/app/assets/javascripts/social_stream/flash.js
313
- - base/app/assets/javascripts/social_stream/follow.js
314
318
  - base/app/assets/javascripts/social_stream/group.js
315
319
  - base/app/assets/javascripts/social_stream/message.js.erb
316
320
  - base/app/assets/javascripts/social_stream/notification.js
@@ -458,6 +462,7 @@ files:
458
462
  - base/app/assets/stylesheets/social_stream/fonts/opensans/opensans-regular.ttf
459
463
  - base/app/controllers/activities_controller.rb
460
464
  - base/app/controllers/activity_actions_controller.rb
465
+ - base/app/controllers/actors_controller.rb
461
466
  - base/app/controllers/api_controller.rb
462
467
  - base/app/controllers/audience_controller.rb
463
468
  - base/app/controllers/authentications_controller.rb
@@ -465,7 +470,6 @@ files:
465
470
  - base/app/controllers/contacts_controller.rb
466
471
  - base/app/controllers/conversations_controller.rb
467
472
  - base/app/controllers/explore_controller.rb
468
- - base/app/controllers/followers_controller.rb
469
473
  - base/app/controllers/frontpage_controller.rb
470
474
  - base/app/controllers/groups_controller.rb
471
475
  - base/app/controllers/home_controller.rb
@@ -488,7 +492,6 @@ files:
488
492
  - base/app/helpers/activity_actions_helper.rb
489
493
  - base/app/helpers/contacts_helper.rb
490
494
  - base/app/helpers/explore_helper.rb
491
- - base/app/helpers/followers_helper.rb
492
495
  - base/app/helpers/groups_helper.rb
493
496
  - base/app/helpers/layouts_helper.rb
494
497
  - base/app/helpers/location_helper.rb
@@ -522,6 +525,7 @@ files:
522
525
  - base/app/models/relation.rb
523
526
  - base/app/models/relation/custom.rb
524
527
  - base/app/models/relation/follow.rb
528
+ - base/app/models/relation/owner.rb
525
529
  - base/app/models/relation/public.rb
526
530
  - base/app/models/relation/reject.rb
527
531
  - base/app/models/relation/single.rb
@@ -565,10 +569,13 @@ files:
565
569
  - base/app/views/comments/_search_result.html.erb
566
570
  - base/app/views/comments/create.js.erb
567
571
  - base/app/views/comments/destroy.js.erb
572
+ - base/app/views/contacts/_add_button.html.erb
568
573
  - base/app/views/contacts/_button.html.erb
574
+ - base/app/views/contacts/_button_multiple.html.erb
575
+ - base/app/views/contacts/_button_simple.html.erb
569
576
  - base/app/views/contacts/_contact.html.erb
570
577
  - base/app/views/contacts/_form.html.erb
571
- - base/app/views/contacts/_link_follow.html.erb
578
+ - base/app/views/contacts/_new_modal.html.erb
572
579
  - base/app/views/contacts/_pendings.html.erb
573
580
  - base/app/views/contacts/_suggestions.html.erb
574
581
  - base/app/views/contacts/destroy.js.erb
@@ -615,10 +622,6 @@ files:
615
622
  - base/app/views/explore/_timeline.html.erb
616
623
  - base/app/views/explore/_trending.html.erb
617
624
  - base/app/views/explore/index.html.erb
618
- - base/app/views/followers/destroy.js.erb
619
- - base/app/views/followers/index.html.erb
620
- - base/app/views/followers/update.js.erb
621
- - base/app/views/frontpage/_characteristics.html.erb
622
625
  - base/app/views/frontpage/_presentation.html.erb
623
626
  - base/app/views/frontpage/_presentation_default.html.erb
624
627
  - base/app/views/frontpage/_sponsor.html.erb
@@ -700,13 +703,20 @@ files:
700
703
  - base/app/views/posts/destroy.js.erb
701
704
  - base/app/views/posts/show.html.erb
702
705
  - base/app/views/profiles/_avatar.html.erb
706
+ - base/app/views/profiles/_avatar_edit.html.erb
703
707
  - base/app/views/profiles/_comunication-info.html.erb
708
+ - base/app/views/profiles/_comunication-info_edit.html.erb
704
709
  - base/app/views/profiles/_edit_icon.html.erb
705
710
  - base/app/views/profiles/_empty.html.erb
706
711
  - base/app/views/profiles/_experience.html.erb
712
+ - base/app/views/profiles/_experience_edit.html.erb
707
713
  - base/app/views/profiles/_personal.html.erb
714
+ - base/app/views/profiles/_personal_edit.html.erb
708
715
  - base/app/views/profiles/_profile.html.erb
716
+ - base/app/views/profiles/_profile_edit.html.erb
709
717
  - base/app/views/profiles/_tags.html.erb
718
+ - base/app/views/profiles/_tags_edit.html.erb
719
+ - base/app/views/profiles/edit.html.erb
710
720
  - base/app/views/profiles/show.html.erb
711
721
  - base/app/views/profiles/update.js.erb
712
722
  - base/app/views/relation/customs/_custom.html.erb
@@ -760,11 +770,19 @@ files:
760
770
  - base/app/views/users/show.html.erb
761
771
  - base/app/views/users/show.js.erb
762
772
  - base/app/views/users/show.xml.builder
773
+ - base/config/locales/de.yml
763
774
  - base/config/locales/devise.es.yml
764
775
  - base/config/locales/en.yml
765
776
  - base/config/locales/es.yml
777
+ - base/config/locales/fr.yml
778
+ - base/config/locales/hu.yml
779
+ - base/config/locales/nl.yml
766
780
  - base/config/locales/pt.yml
781
+ - base/config/locales/rails.de.yml
767
782
  - base/config/locales/rails.es.yml
783
+ - base/config/locales/rails.fr.yml
784
+ - base/config/locales/rails.hu.yml
785
+ - base/config/locales/rails.nl.yml
768
786
  - base/config/locales/rails.pt.yml
769
787
  - base/config/locales/zh.yml
770
788
  - base/config/routes.rb
@@ -772,6 +790,8 @@ files:
772
790
  - base/db/migrate/20130125100112_sites_as_actor.rb
773
791
  - base/db/migrate/20130212092035_main_activity_object_properties.rb
774
792
  - base/db/migrate/20130305101231_move_avatars.rb
793
+ - base/db/migrate/20130708152633_set_group_owners.rb
794
+ - base/db/migrate/20130723133530_actor_notification_settings.rb
775
795
  - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
776
796
  - base/lib/acts_as_taggable_on/social_stream.rb
777
797
  - base/lib/generators/social_stream/base/install_generator.rb
@@ -823,6 +843,7 @@ files:
823
843
  - base/lib/social_stream/base/engine.rb
824
844
  - base/lib/social_stream/base/thinking-sphinx.rb
825
845
  - base/lib/social_stream/base/version.rb
846
+ - base/lib/social_stream/controllers/authorship.rb
826
847
  - base/lib/social_stream/controllers/cancan_devise_integration.rb
827
848
  - base/lib/social_stream/controllers/helpers.rb
828
849
  - base/lib/social_stream/controllers/i18n_integration.rb
@@ -841,9 +862,8 @@ files:
841
862
  - base/lib/social_stream/population/actor.rb
842
863
  - base/lib/social_stream/population/power_law.rb
843
864
  - base/lib/social_stream/population/timestamps.rb
844
- - base/lib/social_stream/routing/constraints/custom.rb
845
- - base/lib/social_stream/routing/constraints/follow.rb
846
865
  - base/lib/social_stream/routing/constraints/resque.rb
866
+ - base/lib/social_stream/routing/mapper.rb
847
867
  - base/lib/social_stream/search.rb
848
868
  - base/lib/social_stream/test_helpers.rb
849
869
  - base/lib/social_stream/test_helpers/controllers.rb
@@ -859,7 +879,6 @@ files:
859
879
  - base/spec/controllers/comments_controller_spec.rb
860
880
  - base/spec/controllers/contacts_controller_spec.rb
861
881
  - base/spec/controllers/explore_controller_spec.rb
862
- - base/spec/controllers/followers_controller_spec.rb
863
882
  - base/spec/controllers/frontpage_controller_spec.rb
864
883
  - base/spec/controllers/groups_controller_spec.rb
865
884
  - base/spec/controllers/home_controller_spec.rb
@@ -1063,8 +1082,12 @@ files:
1063
1082
  - documents/app/views/videos/show.html.erb
1064
1083
  - documents/app/worker/audioencoder.rb
1065
1084
  - documents/app/worker/videoencoder.rb
1085
+ - documents/config/locales/de.yml
1066
1086
  - documents/config/locales/en.yml
1067
1087
  - documents/config/locales/es.yml
1088
+ - documents/config/locales/fr.yml
1089
+ - documents/config/locales/hu.yml
1090
+ - documents/config/locales/nl.yml
1068
1091
  - documents/config/locales/zh.yml
1069
1092
  - documents/config/routes.rb
1070
1093
  - documents/db/migrate/20120208143721_create_social_stream_documents.rb
@@ -1242,8 +1265,12 @@ files:
1242
1265
  - linkser/app/views/links/create.js.erb
1243
1266
  - linkser/app/views/links/destroy.js.erb
1244
1267
  - linkser/app/views/links/show.html.erb
1268
+ - linkser/config/locales/de.yml
1245
1269
  - linkser/config/locales/en.yml
1246
1270
  - linkser/config/locales/es.yml
1271
+ - linkser/config/locales/fr.yml
1272
+ - linkser/config/locales/hu.yml
1273
+ - linkser/config/locales/nl.yml
1247
1274
  - linkser/config/locales/zh.yml
1248
1275
  - linkser/config/routes.rb
1249
1276
  - linkser/db/migrate/20120208143739_create_social_stream_linkser.rb
@@ -1279,6 +1306,7 @@ files:
1279
1306
  - oauth2_server/app/assets/images/logos/small/site.png
1280
1307
  - oauth2_server/app/assets/images/step_1.png
1281
1308
  - oauth2_server/app/assets/images/step_2.png
1309
+ - oauth2_server/app/assets/images/step_3.png
1282
1310
  - oauth2_server/app/assets/javascripts/social_stream-oauth2_server.js
1283
1311
  - oauth2_server/app/assets/javascripts/social_stream/site_client.js
1284
1312
  - oauth2_server/app/assets/stylesheets/social_stream-oauth2_server.css.sass
@@ -1302,6 +1330,7 @@ files:
1302
1330
  - oauth2_server/app/controllers/authorizations_controller.rb
1303
1331
  - oauth2_server/app/controllers/site/clients_controller.rb
1304
1332
  - oauth2_server/app/decorators/social_stream/base/actor_decorator.rb
1333
+ - oauth2_server/app/decorators/social_stream/base/relation_decorator.rb
1305
1334
  - oauth2_server/app/decorators/social_stream/base/user_decorator.rb
1306
1335
  - oauth2_server/app/decorators/social_stream/base/users_controller_decorator.rb
1307
1336
  - oauth2_server/app/helpers/site_client_helper.rb
@@ -1317,6 +1346,7 @@ files:
1317
1346
  - oauth2_server/app/views/authorizations/error.html.erb
1318
1347
  - oauth2_server/app/views/authorizations/new.html.erb
1319
1348
  - oauth2_server/app/views/site/clients/_avatar.html.erb
1349
+ - oauth2_server/app/views/site/clients/_destroy.html.erb
1320
1350
  - oauth2_server/app/views/site/clients/_edit.html.erb
1321
1351
  - oauth2_server/app/views/site/clients/_edit_step_2.html.erb
1322
1352
  - oauth2_server/app/views/site/clients/_edit_step_3.html.erb
@@ -1665,7 +1695,8 @@ files:
1665
1695
  - spec/support/db.rb
1666
1696
  - spec/support/optimizations.rb
1667
1697
  homepage: http://social-stream.dit.upm.es/
1668
- licenses: []
1698
+ licenses:
1699
+ - MIT
1669
1700
  metadata: {}
1670
1701
  post_install_message:
1671
1702
  rdoc_options: []
@@ -1683,7 +1714,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1683
1714
  version: '0'
1684
1715
  requirements: []
1685
1716
  rubyforge_project:
1686
- rubygems_version: 2.0.0
1717
+ rubygems_version: 2.0.6
1687
1718
  signing_key:
1688
1719
  specification_version: 4
1689
1720
  summary: A core for building social network websites