social_stream 2.2.1 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (85) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -1
  3. data/base/app/assets/javascripts/social_stream/comment.js +1 -1
  4. data/base/app/assets/javascripts/social_stream/search_header.js +26 -4
  5. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -0
  6. data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +1 -1
  7. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass +5 -3
  8. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_devise.css.sass +7 -37
  9. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_frontpage.css.sass +4 -2
  10. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass +6 -3
  11. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-767px-max.css.sass +9 -5
  12. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-768px-979px.css.sass +3 -4
  13. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +3 -2
  14. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +1 -2
  15. data/base/app/controllers/groups_controller.rb +4 -0
  16. data/base/app/controllers/home_controller.rb +15 -0
  17. data/base/app/controllers/search_controller.rb +3 -3
  18. data/base/app/decorators/avatars_controller_decorator.rb +1 -0
  19. data/base/app/overrides/avatars/_crop/add_actor_id.rb +4 -0
  20. data/base/app/overrides/avatars/_form/add_actor_id.rb +4 -0
  21. data/base/app/views/contacts/_new_modal.html.erb +2 -2
  22. data/base/app/views/devise/confirmations/new.html.erb +14 -9
  23. data/base/app/views/devise/passwords/edit.html.erb +23 -26
  24. data/base/app/views/devise/passwords/new.html.erb +7 -3
  25. data/base/app/views/devise/registrations/_edit_user.html.erb +1 -1
  26. data/base/app/views/devise/registrations/new.html.erb +4 -8
  27. data/base/app/views/devise/shared/_links.erb +1 -3
  28. data/base/app/views/groups/_form.html.erb +2 -1
  29. data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb +1 -1
  30. data/base/app/views/layouts/_header_signed_in.erb +22 -26
  31. data/base/app/views/profiles/_personal_edit.html.erb +2 -2
  32. data/base/config/locales/de.yml +7 -0
  33. data/base/config/locales/devise.de.yml +61 -0
  34. data/base/config/locales/devise.fr.yml +61 -0
  35. data/base/config/locales/devise.hu.yml +60 -0
  36. data/base/config/locales/devise.nl.yml +60 -0
  37. data/base/config/locales/en.yml +5 -1
  38. data/base/config/locales/es.yml +8 -1
  39. data/base/config/locales/fr.yml +7 -0
  40. data/base/config/locales/hu.yml +22 -15
  41. data/base/config/locales/nl.yml +7 -0
  42. data/base/config/locales/pt.yml +7 -0
  43. data/base/config/locales/zh.yml +7 -0
  44. data/base/lib/social_stream/base/autoload.rb +1 -0
  45. data/base/lib/social_stream/base/version.rb +1 -1
  46. data/base/lib/social_stream/controllers/authorship.rb +2 -1
  47. data/base/lib/social_stream/controllers/avatars.rb +14 -0
  48. data/base/lib/social_stream/controllers/helpers.rb +3 -3
  49. data/base/lib/social_stream/controllers/objects.rb +6 -7
  50. data/base/lib/tasks/i18n.rake +148 -0
  51. data/base/social_stream-base.gemspec +2 -1
  52. data/config/locales/en.yml +2 -1
  53. data/config/locales/es.yml +2 -1
  54. data/documents/app/controllers/documents_controller.rb +26 -16
  55. data/documents/app/models/document.rb +4 -3
  56. data/documents/app/models/video.rb +11 -9
  57. data/documents/app/views/audios/_audio_show.html.erb +1 -1
  58. data/documents/app/views/videos/_video_show.html.erb +1 -1
  59. data/documents/lib/social_stream/documents/version.rb +1 -1
  60. data/documents/social_stream-documents.gemspec +2 -1
  61. data/events/lib/social_stream/events/version.rb +1 -1
  62. data/events/social_stream-events.gemspec +2 -1
  63. data/lib/social_stream/version.rb +1 -1
  64. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  65. data/linkser/social_stream-linkser.gemspec +2 -1
  66. data/oauth2_server/app/models/site/client.rb +16 -0
  67. data/oauth2_server/app/views/site/clients/_edit.html.erb +6 -0
  68. data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +1 -1
  69. data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +1 -2
  70. data/oauth2_server/app/views/site/clients/_form.html.erb +1 -1
  71. data/oauth2_server/config/locales/en.yml +1 -1
  72. data/oauth2_server/config/locales/es.yml +2 -1
  73. data/oauth2_server/config/locales/zh.yml +1 -0
  74. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  75. data/oauth2_server/social_stream-oauth2_server.gemspec +2 -1
  76. data/ostatus/app/controllers/remote_subjects_controller.rb +1 -1
  77. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  78. data/ostatus/social_stream-ostatus.gemspec +2 -1
  79. data/places/social_stream-places.gemspec +1 -0
  80. data/presence/lib/social_stream/presence/version.rb +1 -1
  81. data/presence/social_stream-presence.gemspec +2 -1
  82. data/social_stream.gemspec +7 -7
  83. metadata +25 -18
  84. data/base/app/views/home/index.js.erb +0 -5
  85. data/lib/tasks/i18n.rake +0 -75
@@ -1,5 +0,0 @@
1
- $('#timeline').replaceWith("<%= escape_javascript render(:partial => 'activities/timeline', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
2
-
3
- setActivityPrivacyTooltips();
4
-
5
- $.scrollTo('#timeline', 1500,{axis:'y'});
@@ -1,75 +0,0 @@
1
- namespace :i18n do
2
- desc "Synchronize i18n files"
3
- task "sync" do
4
- require 'yaml'
5
- require 'social_stream/components'
6
-
7
- Hash.class_eval do
8
- def sync(h)
9
- en_hash = h.dup
10
-
11
- each_key do |self_key|
12
- en_val = en_hash.delete(self_key)
13
-
14
- case en_val
15
- when NilClass
16
- delete(self_key)
17
- when Hash
18
- if self[self_key].is_a?(Hash)
19
- self[self_key].sync(en_val)
20
- else
21
- self[self_key] = en_val
22
- end
23
- when String
24
- if self[self_key].nil?
25
- self[self_key] = en_val
26
- end
27
- else
28
- raise "Unkown key type #{ en_val.inspect }"
29
- end
30
- end
31
-
32
- # Merge missing keys
33
- merge! en_hash
34
-
35
- # Order alphabetically
36
- replace sort_by{ |k, v| k }.inject({}){ |h, a| h[a.first] = a.last; h }
37
- end
38
- end
39
-
40
- SocialStream::ALL_COMPONENTS.each do |c|
41
- path = "#{ c }/config/locales/"
42
-
43
- files = Dir[path + '*'].select{ |f| f =~ /\/\w+\.yml$/ }
44
-
45
- en = files.find{ |f| f =~ /\/en.yml$/ }
46
- files.delete(en)
47
-
48
- en_h = Psych.load_file(en)
49
-
50
- files.each do |f|
51
- h = Psych.load_file(f)
52
-
53
- # Leave language_name at the begining of the hash
54
- if c == "base"
55
- orig_h = h.first.last
56
- orig_en_h = en_h.first.last.dup
57
-
58
- language_name = orig_h.delete('language_name')
59
- language_name_en = orig_en_h.delete('language_name')
60
- language_name ||= language_name_en
61
-
62
- orig_h.sync orig_en_h
63
-
64
- h.first.last.replace({ 'language_name' => language_name }.merge!(orig_h))
65
- else
66
- h.first.last.sync en_h.first.last
67
- end
68
-
69
- Psych.dump h, File.open(f, 'w')
70
- end
71
-
72
- Psych.dump en_h, File.open(en, 'w')
73
- end
74
- end
75
- end