RubyGems - social_stream - Versions diffs - 2.1.1 → 2.2.0 - Mend

social_stream 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (188) hide show

checksums.yaml +4 -4
data/Gemfile +5 -2
data/LICENSE +1 -1
data/base/Rakefile +3 -17
data/base/app/assets/images/flags/de.png +0 -0
data/base/app/assets/images/flags/fr.png +0 -0
data/base/app/assets/images/flags/hu.png +0 -0
data/base/app/assets/images/flags/nl.png +0 -0
data/base/app/assets/javascripts/social_stream/actor.js +34 -0
data/base/app/assets/javascripts/social_stream/contact.js +40 -5
data/base/app/assets/javascripts/social_stream/flash.js +6 -1
data/base/app/assets/javascripts/social_stream/group.js +6 -5
data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
data/base/app/controllers/actors_controller.rb +25 -0
data/base/app/controllers/contacts_controller.rb +38 -8
data/base/app/controllers/groups_controller.rb +2 -21
data/base/app/controllers/profiles_controller.rb +4 -0
data/base/app/controllers/settings_controller.rb +12 -2
data/base/app/controllers/users_controller.rb +0 -8
data/base/app/helpers/contacts_helper.rb +8 -0
data/base/app/models/activity.rb +19 -6
data/base/app/models/actor.rb +49 -11
data/base/app/models/contact.rb +12 -5
data/base/app/models/group.rb +13 -11
data/base/app/models/permission.rb +30 -0
data/base/app/models/relation.rb +17 -7
data/base/app/models/relation/custom.rb +2 -40
data/base/app/models/relation/follow.rb +8 -2
data/base/app/models/relation/owner.rb +10 -0
data/base/app/models/relation/single.rb +7 -4
data/base/app/models/site.rb +1 -1
data/base/app/models/tie.rb +8 -4
data/base/app/views/contacts/_add_button.html.erb +9 -0
data/base/app/views/contacts/_button.html.erb +3 -3
data/base/app/views/contacts/_button_multiple.html.erb +4 -0
data/base/app/views/contacts/_button_simple.html.erb +17 -0
data/base/app/views/contacts/_new_modal.html.erb +22 -0
data/base/app/views/contacts/destroy.js.erb +5 -4
data/base/app/views/contacts/update.js.erb +5 -4
data/base/app/views/devise/confirmations/new.html.erb +14 -9
data/base/app/views/frontpage/_presentation.html.erb +2 -2
data/base/app/views/groups/_form.html.erb +20 -20
data/base/app/views/groups/show.html.erb +5 -5
data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
data/base/app/views/layouts/_header_signed_in.erb +3 -3
data/base/app/views/layouts/_logo_in.html.erb +1 -1
data/base/app/views/layouts/application.html.erb +2 -0
data/base/app/views/permissions/_list.html.erb +1 -1
data/base/app/views/profiles/_avatar.html.erb +1 -5
data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
data/base/app/views/profiles/_comunication-info.html.erb +2 -36
data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
data/base/app/views/profiles/_edit_icon.html.erb +0 -1
data/base/app/views/profiles/_experience.html.erb +1 -6
data/base/app/views/profiles/_experience_edit.html.erb +5 -0
data/base/app/views/profiles/_personal.html.erb +1 -39
data/base/app/views/profiles/_personal_edit.html.erb +31 -0
data/base/app/views/profiles/_profile_edit.html.erb +7 -0
data/base/app/views/profiles/_tags.html.erb +1 -4
data/base/app/views/profiles/_tags_edit.html.erb +4 -0
data/base/app/views/profiles/edit.html.erb +24 -0
data/base/app/views/settings/_notifications.html.erb +12 -4
data/base/app/views/users/show.html.erb +5 -5
data/base/config/locales/de.yml +654 -0
data/base/config/locales/en.yml +20 -9
data/base/config/locales/es.yml +151 -140
data/base/config/locales/fr.yml +656 -0
data/base/config/locales/hu.yml +653 -0
data/base/config/locales/nl.yml +656 -0
data/base/config/locales/pt.yml +250 -239
data/base/config/locales/rails.de.yml +203 -0
data/base/config/locales/rails.fr.yml +222 -0
data/base/config/locales/rails.hu.yml +199 -0
data/base/config/locales/rails.nl.yml +199 -0
data/base/config/locales/zh.yml +214 -202
data/base/config/routes.rb +22 -30
data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
data/base/lib/rails/social_stream.rb +2 -0
data/base/lib/social_stream/base.rb +27 -7
data/base/lib/social_stream/base/ability.rb +3 -5
data/base/lib/social_stream/base/autoload.rb +1 -0
data/base/lib/social_stream/base/version.rb +1 -1
data/base/lib/social_stream/controllers/authorship.rb +18 -0
data/base/lib/social_stream/controllers/helpers.rb +18 -4
data/base/lib/social_stream/controllers/objects.rb +2 -8
data/base/lib/social_stream/controllers/subjects.rb +9 -2
data/base/lib/social_stream/models/supertype.rb +2 -0
data/base/lib/social_stream/population/activity_object.rb +6 -8
data/base/lib/social_stream/routing/mapper.rb +52 -0
data/base/social_stream-base.gemspec +4 -7
data/base/spec/controllers/groups_controller_spec.rb +19 -8
data/base/spec/controllers/posts_controller_spec.rb +114 -147
data/base/spec/models/post_authorization_spec.rb +190 -204
data/base/spec/models/post_spec.rb +17 -63
data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
data/documents/Rakefile +1 -6
data/documents/config/locales/de.yml +93 -0
data/documents/config/locales/es.yml +2 -2
data/documents/config/locales/fr.yml +93 -0
data/documents/config/locales/hu.yml +93 -0
data/documents/config/locales/nl.yml +93 -0
data/documents/config/locales/zh.yml +4 -4
data/documents/config/routes.rb +7 -9
data/documents/lib/social_stream/documents/version.rb +1 -1
data/documents/social_stream-documents.gemspec +4 -4
data/events/Rakefile +1 -6
data/events/config/locales/es.yml +3 -3
data/events/config/locales/zh.yml +3 -3
data/events/lib/social_stream/events/models/actor.rb +2 -1
data/events/lib/social_stream/events/version.rb +1 -1
data/events/social_stream-events.gemspec +1 -1
data/lib/generators/social_stream/install_generator.rb +1 -0
data/lib/social_stream.rb +1 -0
data/lib/social_stream/version.rb +1 -1
data/lib/tasks/i18n.rake +22 -2
data/linkser/Rakefile +1 -6
data/linkser/config/locales/de.yml +17 -0
data/linkser/config/locales/es.yml +2 -2
data/linkser/config/locales/fr.yml +17 -0
data/linkser/config/locales/hu.yml +17 -0
data/linkser/config/locales/nl.yml +17 -0
data/linkser/config/locales/zh.yml +2 -2
data/linkser/lib/social_stream/linkser/version.rb +1 -1
data/linkser/social_stream-linkser.gemspec +1 -1
data/oauth2_server/Rakefile +1 -6
data/oauth2_server/app/assets/images/step_1.png +0 -0
data/oauth2_server/app/assets/images/step_2.png +0 -0
data/oauth2_server/app/assets/images/step_3.png +0 -0
data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
data/oauth2_server/app/models/relation/manager.rb +1 -10
data/oauth2_server/app/models/site/client.rb +4 -2
data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
data/oauth2_server/config/locales/en.yml +19 -0
data/oauth2_server/config/locales/es.yml +23 -4
data/oauth2_server/config/locales/zh.yml +32 -13
data/oauth2_server/config/routes.rb +3 -1
data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
data/ostatus/Rakefile +1 -6
data/ostatus/config/locales/zh.yml +8 -8
data/ostatus/lib/social_stream-ostatus.rb +3 -0
data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
data/ostatus/social_stream-ostatus.gemspec +1 -1
data/places/config/locales/es.yml +51 -51
data/presence/config/locales/es.yml +48 -48
data/presence/config/locales/zh.yml +48 -48
data/presence/lib/social_stream/presence/version.rb +1 -1
data/presence/social_stream-presence.gemspec +1 -1
data/social_stream.gemspec +8 -7
metadata +60 -29
data/base/app/assets/javascripts/social_stream/follow.js +0 -28
data/base/app/controllers/followers_controller.rb +0 -34
data/base/app/helpers/followers_helper.rb +0 -5
data/base/app/views/contacts/_link_follow.html.erb +0 -16
data/base/app/views/followers/destroy.js.erb +0 -1
data/base/app/views/followers/index.html.erb +0 -30
data/base/app/views/followers/update.js.erb +0 -3
data/base/app/views/frontpage/_characteristics.html.erb +0 -23
data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
data/base/spec/controllers/followers_controller_spec.rb +0 -37

data/documents/Rakefile CHANGED

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 require 'rdoc/task'
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task :default => :rdoc
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/documents/config/locales/de.yml ADDED

@@ -0,0 +1,93 @@
+---
+de:
+  activerecord:
+    attributes:
+      document:
+        title: Titel
+    models:
+      document: File
+  audio:
+    confirm_delete: Audio löschen?
+    mine: Meine Audios
+    name: Audio
+    not_mine: Audios
+    one: Ein Audio
+    other: audios
+    processing: Audio clip wird verarbeitet. Bitte warten...
+    title:
+      one: Audio
+      other: Audios
+  details:
+    msg: Siehe Details...
+  document:
+    actions:
+      delete: Löschen
+      details: Details
+      download: Download
+      edit: Bearbeiten
+    all: Alle Files
+    by: by %{author}
+    confirm_delete: File löschen?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: File
+    info:
+      author: Author
+      date:
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
+      description:
+        title: Beschreibung
+      file:
+        title: Upload
+      size: Size
+      tags: Tags
+      title:
+        title: Titel
+    mine: Meine Files
+    name: File
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Files
+    one: Ein File
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: Alle
+    title:
+      input: File title
+      one: File
+      other: Files
+  picture:
+    confirm_delete: Bild löschen?
+    mine: Meine Bilder
+    name: Bild
+    not_mine: Bilder
+    one: Ein Bild
+    other: pictures
+    title:
+      one: Bild
+      other: Bilder
+  resource:
+    all: Alle Ressourcen
+    confirm_delete: Ressource löschen?
+    mine: Meine Ressourcen
+    not_mine: Ressourcen
+    title: Ressourcen
+  video:
+    confirm_delete: Video löschen?
+    mine: Meine Videos
+    name: Video
+    not_mine: Videos
+    one: Ein Video
+    other: videos
+    processing: Video wird verarbeitet. Bitte warten...
+    title:
+      one: Video
+      other: Videos

data/documents/config/locales/es.yml CHANGED

@@ -40,9 +40,9 @@ es:
         updated_at: Última modificación
       description: Descripción
       file: Fichero
-      title: Título
       size: Size
       tags: Tags
+      title: Título
     mine: Mis ficheros
     name: fichero
     new:
@@ -74,9 +74,9 @@ es:
   resource:
     all: Todos los recursos
     confirm_delete: ¿Borrar recursos?
-    title: Recursos
     mine: Mis recursos
     not_mine: Recursos
+    title: Recursos
   video:
     confirm_delete: ¿Borrar vídeo?
     mine: Mis vídeos

data/documents/config/locales/fr.yml ADDED

@@ -0,0 +1,93 @@
+---
+fr:
+  activerecord:
+    attributes:
+      document:
+        title: Titre
+    models:
+      document: File
+  audio:
+    confirm_delete: Supprimer les clips audio ?
+    mine: Mes clips audio
+    name: clip audio
+    not_mine: Clips audio
+    one: un clip audio
+    other: audios
+    processing: Traitement du clip audio en cours. Veuillez patienter...
+    title:
+      one: Clip audio
+      other: Clips audio
+  details:
+    msg: Plus d'infos...
+  document:
+    actions:
+      delete: Supprimer
+      details: Détails
+      download: Télécharger
+      edit: Éditer
+    all: Tous les fichiers
+    by: by %{author}
+    confirm_delete: Supprimer le fichier ?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: Fichier
+    info:
+      author: Author
+      date:
+        created_at: Publication créée à
+        updated_at: Publication mise à jour à
+      description:
+        title: Description
+      file:
+        title: Publier
+      size: Size
+      tags: Tags
+      title:
+        title: Titre
+    mine: Mes fichiers
+    name: fichier
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Fichiers
+    one: un fichier
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: Tous
+    title:
+      input: File title
+      one: Fichier
+      other: Fichiers
+  picture:
+    confirm_delete: Supprimer la photo ?
+    mine: Mes photos
+    name: photo
+    not_mine: Photos
+    one: une photo
+    other: pictures
+    title:
+      one: Photo
+      other: Photos
+  resource:
+    all: Toutes les ressources
+    confirm_delete: Supprimer la ressource ?
+    mine: Mes ressources
+    not_mine: Ressources
+    title: Ressources
+  video:
+    confirm_delete: Supprimer la vidéo ?
+    mine: Mes vidéos
+    name: vidéo
+    not_mine: Vidéos
+    one: une vidéo
+    other: videos
+    processing: Traitement de la vidéo en cours. Veuillez patienter...
+    title:
+      one: Vidéo
+      other: Vidéos

data/documents/config/locales/hu.yml ADDED

@@ -0,0 +1,93 @@
+---
+hu:
+  activerecord:
+    attributes:
+      document:
+        title: Cím
+    models:
+      document: File
+  audio:
+    confirm_delete: Kikapcsolod a hangot?
+    mine: Saját hangok
+    name: hang
+    not_mine: Hangok
+    one: egy hang
+    other: audios
+    processing: Audió klip feldolgozása. Kérlek, várj…
+    title:
+      one: Hang
+      other: Hangok
+  details:
+    msg: Részletek...
+  document:
+    actions:
+      delete: Törlés
+      details: Részletek
+      download: Letöltés
+      edit: Szekesztés
+    all: Minden fájl
+    by: by %{author}
+    confirm_delete: Törlöd a fájlt?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: Fájl
+    info:
+      author: Author
+      date:
+        created_at: Létrehozva
+        updated_at: Frissítve
+      description:
+        title: Leírás
+      file:
+        title: Feltöltés
+      size: Size
+      tags: Tags
+      title:
+        title: Cím
+    mine: Saját fájljaim
+    name: fájl
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Fájlok
+    one: egy fájl
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: Összes
+    title:
+      input: File title
+      one: Fájl
+      other: Fájlok
+  picture:
+    confirm_delete: Törlöd a képet?
+    mine: Saját képeim
+    name: kép
+    not_mine: Képek
+    one: egy kép
+    other: pictures
+    title:
+      one: Kép
+      other: Képek
+  resource:
+    all: Összes erőforrás
+    confirm_delete: Törlöd az erőforrást?
+    mine: Saját erőforrásaim
+    not_mine: Erőforrások
+    title: Erőforrások
+  video:
+    confirm_delete: Törlöd a videót?
+    mine: Saját vieóim
+    name: videó
+    not_mine: Videók
+    one: egy videó
+    other: videos
+    processing: A videó feldolgozás alatt van. Kérjük, várj...
+    title:
+      one: Videó
+      other: Videók

data/documents/config/locales/nl.yml ADDED

@@ -0,0 +1,93 @@
+---
+nl:
+  activerecord:
+    attributes:
+      document:
+        title: Titel
+    models:
+      document: File
+  audio:
+    confirm_delete: Audio verwijderen?
+    mine: Mijn audio’s
+    name: audio
+    not_mine: Audio’s
+    one: een audio
+    other: audios
+    processing: Bezig met bewerken audioclip. Wachten...
+    title:
+      one: Audio
+      other: Audio’s
+  details:
+    msg: Zie bijzonderheden...
+  document:
+    actions:
+      delete: Verwijderen
+      details: Bijzonderheden
+      download: Downloaden
+      edit: Bewerken
+    all: Alle bestanden
+    by: by %{author}
+    confirm_delete: Bestand verwijderen?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: Bestand
+    info:
+      author: Author
+      date:
+        created_at: Gecreëerd op
+        updated_at: Geüpdatet op
+      description:
+        title: Beschrijving
+      file:
+        title: Uploaden
+      size: Size
+      tags: Tags
+      title:
+        title: Titel
+    mine: Mijn bestanden
+    name: bestand
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Bestanden
+    one: een bestand
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: Alle
+    title:
+      input: File title
+      one: Bestand
+      other: Bestanden
+  picture:
+    confirm_delete: Afbeelding verwijderen?
+    mine: Mijn afbeeldingen
+    name: afbeelding
+    not_mine: Afbeeldingen
+    one: een afbeelding
+    other: pictures
+    title:
+      one: Afbeelding
+      other: Afbeeldingen
+  resource:
+    all: Alle Leermiddelen
+    confirm_delete: Leermiddel verwijderen?
+    mine: Mijn leermiddelen
+    not_mine: Leermiddelen
+    title: Leermiddelen
+  video:
+    confirm_delete: Video verwijderen?
+    mine: Mijn video’s
+    name: video
+    not_mine: Video’s
+    one: een video
+    other: videos
+    processing: Bezig met bewerken van video. Wachten...
+    title:
+      one: Video
+      other: Video’s

data/documents/config/locales/zh.yml CHANGED

@@ -8,15 +8,15 @@ zh:
       document: File
   audio:
     confirm_delete: Delete audio?
-    title:
-      one: Audio
-      other: Audios
     mine: My audios
     name: audio
     not_mine: Audios
     one: an audio
     other: audios
     processing: Processing audio clip. Please wait...
+    title:
+      one: Audio
+      other: Audios
   details:
     msg: See details...
   document:
@@ -74,9 +74,9 @@ zh:
   resource:
     all: All Resources
     confirm_delete: Delete resource?
-    title: Resources
     mine: My resources
     not_mine: Resources
+    title: Resources
   video:
     confirm_delete: Delete video?
     mine: My videos

data/documents/config/routes.rb CHANGED

@@ -9,16 +9,14 @@ Rails.application.routes.draw do
   end
   # Social Stream subjects configured in config/initializers/social_stream.rb
-  SocialStream.subjects.each do |actor|
-    resources actor.to_s.pluralize do
-      resources :pictures
-      resources :audios
-      resources :videos
+  route_subjects do
+    resources :pictures
+    resources :audios
+    resources :videos
-      resources :documents do
-        get "search",   :on => :collection
-        get "download", :on => :member
-      end
+    resources :documents do
+      get "search",   :on => :collection
+      get "download", :on => :member
     end
   end
 end