social_stream 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. checksums.yaml +4 -4
  2. data/base/app/assets/javascripts/social_stream-base.js +1 -0
  3. data/base/app/assets/javascripts/social_stream/relation_customs.js +2 -1
  4. data/base/app/assets/stylesheets/social_stream-base.css.sass +1 -0
  5. data/base/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +1 -4
  6. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +2 -0
  7. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass +1 -0
  8. data/base/app/assets/stylesheets/social_stream/base/logo/_logo-in.css +8 -7
  9. data/base/app/assets/stylesheets/social_stream/base/modals/layout/_modals.css.sass +4 -1
  10. data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +7 -6
  11. data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +14 -6
  12. data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass +1 -4
  13. data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -3
  14. data/base/app/views/layouts/application.html.erb +3 -3
  15. data/base/app/views/profiles/_personal.html.erb +16 -10
  16. data/base/app/views/profiles/_tags.html.erb +1 -1
  17. data/base/app/views/relation/customs/_index.html.erb +18 -0
  18. data/base/app/views/relation/customs/_list.html.erb +2 -1
  19. data/base/app/views/relation/customs/index.html.erb +2 -16
  20. data/base/config/locales/en.yml +5 -1
  21. data/base/config/locales/es.yml +4 -2
  22. data/base/config/locales/pt.yml +7 -3
  23. data/base/config/locales/zh.yml +5 -2
  24. data/base/lib/inherited_resources/social_stream.rb +11 -14
  25. data/base/lib/social_stream/base/engine.rb +1 -1
  26. data/base/lib/social_stream/base/version.rb +1 -1
  27. data/base/lib/social_stream/controllers/objects.rb +2 -4
  28. data/base/social_stream-base.gemspec +2 -2
  29. data/base/vendor/assets/javascripts/bootstrap-modal.js +1 -0
  30. data/base/vendor/assets/javascripts/bootstrap-scroll-modal.js +276 -0
  31. data/base/vendor/assets/stylesheets/bootstrap-scroll-modal.css +70 -0
  32. data/documents/app/views/common_documents/_new_button.html.erb +1 -1
  33. data/documents/lib/social_stream/documents/version.rb +1 -1
  34. data/documents/social_stream-documents.gemspec +1 -1
  35. data/events/app/assets/javascripts/social_stream/calendar.js.erb +1 -1
  36. data/events/app/assets/stylesheets/social_stream/events/calendar/_calendar.css.sass +0 -5
  37. data/events/app/assets/stylesheets/social_stream/events/calendar/_calendar_modal.css.sass +11 -3
  38. data/events/app/views/events/_new.html.erb +7 -4
  39. data/events/lib/social_stream/events/version.rb +1 -1
  40. data/events/social_stream-events.gemspec +1 -1
  41. data/lib/social_stream/version.rb +1 -1
  42. data/oauth2_server/app/assets/images/step_1.png +0 -0
  43. data/oauth2_server/app/assets/images/step_2.png +0 -0
  44. data/oauth2_server/app/assets/stylesheets/social_stream-oauth2_server.css.sass +2 -0
  45. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass +47 -32
  46. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +15 -1
  47. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass +5 -0
  48. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass +13 -16
  49. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +55 -34
  50. data/oauth2_server/app/controllers/site/clients_controller.rb +18 -0
  51. data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +17 -0
  52. data/oauth2_server/app/decorators/social_stream/base/users_controller_decorator.rb +8 -0
  53. data/oauth2_server/app/models/oauth2_token.rb +1 -1
  54. data/oauth2_server/app/overrides/layouts/_header_dropdown_menu/applications_entry.html.erb.deface +1 -1
  55. data/oauth2_server/app/views/site/clients/_form.html.erb +38 -38
  56. data/oauth2_server/app/views/site/clients/_form_step1.html.erb +7 -0
  57. data/oauth2_server/app/views/site/clients/_form_step2.html.erb +20 -0
  58. data/oauth2_server/app/views/site/clients/_list.html.erb +24 -0
  59. data/oauth2_server/app/views/site/clients/edit.html.erb +14 -0
  60. data/oauth2_server/app/views/site/clients/index.html.erb +44 -27
  61. data/oauth2_server/app/views/site/clients/new.html.erb +2 -2
  62. data/oauth2_server/app/views/site/clients/show.html.erb +104 -42
  63. data/oauth2_server/config/locales/en.yml +7 -0
  64. data/oauth2_server/config/locales/es.yml +7 -0
  65. data/oauth2_server/lib/social_stream/oauth2_server/token_endpoint.rb +23 -22
  66. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  67. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  68. data/presence/app/assets/stylesheets/social_stream/presence/_wrapper-chatBox.css.sass +1 -0
  69. data/presence/lib/social_stream/presence/version.rb +1 -1
  70. data/presence/social_stream-presence.gemspec +1 -1
  71. data/social_stream.gemspec +5 -5
  72. data/spec/dummy/config/initializers/devise.rb +1 -1
  73. metadata +24 -17
  74. data/contacts/_contacts.css.sass +0 -64
  75. data/contacts/layouts/_contacts.css.sass +0 -177
  76. data/contacts/responsive/_responsive-1200px-min.css.sass +0 -29
  77. data/contacts/responsive/_responsive-767px-max.css.sass +0 -88
  78. data/contacts/responsive/_responsive-768px-979px.css.sass +0 -14
data/contacts/responsive/_responsive-1200px-min.css.sass DELETED
@@ -1,29 +0,0 @@
1
- s//
2
- // Responsive: Large desktop and up
3
- // --------------------------------------------------
4
-
5
-
6
- @media (min-width: 1200px)
7
-
8
- #contacts
9
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
10
- .contacts
11
- .contact-list
12
- clear: both
13
- min-height: 700px
14
- padding-bottom: 50px
15
-
16
- #relation_customs
17
- width: 80%
18
- .relation_customs
19
- h2
20
- margin-bottom: 20px
21
- .relation_list
22
- .relation_custom
23
- .actions
24
- margin-top: 9px
25
- #permissions
26
- .permissions ul li
27
- input
28
- &[type="checkbox"]
29
- margin: 0
data/contacts/responsive/_responsive-767px-max.css.sass DELETED
@@ -1,88 +0,0 @@
1
- //
2
- // Responsive: Landscape phone to desktop/tablet
3
- // --------------------------------------------------
4
-
5
-
6
- @media (max-width: 767px)
7
-
8
- #contacts
9
- .contacts
10
- width: 100% !important
11
- margin-left: 0
12
-
13
- #relation_customs
14
- .relation_customs
15
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
16
- @include gradient-vertical($startColor: #fff, $endColor: rgba(250, 250, 250, .01))
17
- @include border-radius(5px)
18
- margin-top: 20px
19
- margin-left: 0
20
- h2.colorfont
21
- padding-bottom: 1px
22
- color: #d9d9d9
23
- margin-top: 0px
24
- padding-top: 16px
25
- height: 23px
26
- span.colorfont-overlay
27
- top: 17px !important
28
- margin-left: 10px
29
- color: #f1f1f1
30
- .relation_list
31
- padding-left: 10px !important
32
- width: 41% !important
33
- input
34
- &[type="radio"]
35
- margin-right: 0px
36
- label
37
- @include ellipsis
38
- width: 50%
39
- #permissions
40
- .permissions ul li
41
- label
42
- @include ellipsis
43
- width: 84%
44
- // UP TO LANDSCAPE PHONE
45
- // ---------------------
46
-
47
- @media (max-width: 480px)
48
-
49
- #contacts
50
- .contacts
51
- width: 100% !important
52
- margin-left: 0
53
- input
54
- &[type="text"]
55
- width: 94% !important
56
- .contact
57
- width: 96% !important
58
- margin-left: 0 !important
59
- .avatar
60
- padding-right: 0px
61
- width: 30% !important
62
- img
63
- width: 84% !important
64
- .data
65
- width: 64% !important
66
- margin-left: 0 !important
67
- .name
68
- font-size: 140%
69
- margin-top: 7px
70
- .info
71
- font-size: 11px
72
- color: #ccc
73
- z-index: 1
74
- font-size: 100%
75
- padding-left: 9px
76
- margin-bottom: 9px
77
- .add
78
- margin-top: 2px
79
- .x
80
- margin-top: -45px
81
- font-size: 18px
82
- #relation_customs
83
- .relation_list
84
- padding-left: 10px !important
85
- .edit_name
86
- .edit_relation_custom
87
- #relation_custom_name
88
- width: 54% !important
data/contacts/responsive/_responsive-768px-979px.css.sass DELETED
@@ -1,14 +0,0 @@
1
- //
2
- // Responsive: Tablet to desktop
3
- // --------------------------------------------------
4
-
5
-
6
- @media (min-width: 768px) and (max-width: 979px)
7
-
8
- #contacts
9
- .contacts
10
- .tab-content
11
- .contact-list
12
- clear: both
13
- min-height: 700px
14
- padding-bottom: 50px