social_stream 2.0.1 → 2.0.2

data/contacts/responsive/_responsive-768px-979px.css.sass

@@ -0,0 +1,14 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px)
+
+  #contacts
+    .contacts
+      .tab-content
+        .contact-list
+          clear: both
+          min-height: 700px
+          padding-bottom: 50px

data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass

@@ -1,35 +1,7 @@
-#new_document-modal
-  .modal-body
-    max-height: 520px  
-    padding: 0 15px 15px 15px
-    .tags
-      .select2-container
-        width: 98.5%
-    form.new_site_client
-      margin-left: 0px
-      width: 100%
-      .name,
-      .url
-        margin-left: 0px
-        width: 100%
-    input
-      &[type="file"]
-        line-height: 0px
-  #new_file
-    label 
-      font-size: 22px
-      font-weight: bold
-      color: #CCC
-    form.new_document
-      section
-        border-bottom: 1px dashed #CCC
-        padding-top: 15px
-        padding-bottom: 15px
-      #document_file
-        @include ellipsis
-      .description
-        textarea
-          height: 100px
-      input
-        &[type="submit"]
-          margin: 8px 0 0
+#new_file
+  @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  float: left
+  margin-left: 2.5%
+  h5
+    font-size: 28px
+    color: $red

data/documents/app/assets/stylesheets/social_stream/documents/documents/_documents.css.sass

@@ -1,7 +1,6 @@
-#repository
-  .repository
-    h1
-      @include colorfont-big-size
-    .btn
-      @include btn-primary
-
+.documents,
+.repository
+  h1
+    @include colorfont-big-size
+  .btn
+    @include btn-primary

data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass

@@ -1,4 +1,5 @@
-div.repository
+div.repository,
+.documents
   @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
   float: left
   margin-left: 2.5%
@@ -28,7 +29,7 @@ section.repository
   .tab-content
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
     padding-bottom: 100px
-
+  
   .repository-list
     .document,
     .picture,
@@ -52,7 +53,20 @@ section.repository
       margin-left: 44px
 
 .documents
-  clear: both
+
+  input
+    &[type="text"]
+      width: 24% !important
+      display: inline
+      margin-top: 20px
+      float: left
+      margin-left: 20px
+  .btn
+    float: right
+    width: auto
+    display: inline-block
+    margin: 23px 16px 0 -14px
+
 #new_document-modal
   .modal-body
     input

data/documents/app/assets/stylesheets/social_stream/documents/explore/layout/_explore-documents.css.sass

@@ -1,6 +1,7 @@
 #search-results,
 .repository-list-net,
-.repository-list
+.repository-list,
+.documents
   .picture,
   .audio,
   .video,

data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass

@@ -4,10 +4,11 @@
 #jp_interface_audio_290
   border: none
 
-div.jp-progress
+.jp-progress
   width: 98.5% !important
-  border-bottom: 2px solid #ddd
-  border-right: 2px solid #666
+  border-bottom: 2px solid #444 !important
+  border-right: 2px solid #666 !important
+  background-color: #333 !important
   div.jp-seek-bar
     background: none
     width: 100%

data/documents/app/overrides/repositories/_filter/add_new_document_button.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after "code[erb-loud]:contains('text_field_tag')" -->
+
+<%= render partial: 'common_documents/new_button',
+           locals: { owner: profile_or_current_subject } %>

data/documents/app/views/common_documents/_index.html.erb

@@ -3,27 +3,31 @@
 <% end %>
 
 <%= render partial: 'toolbar/profile', locals: { :subject => profile_or_current_subject } %>
+<div class="documents">
+  <h1 class="colorfont">
+    <%= t 'document.title.other' %>
+  </h1>
 
-<%= render partial: 'common_documents/filter' %>
+  <%= render partial: 'common_documents/filter' %>
 
-<%= render partial: 'common_documents/new_button',
-           locals: { owner: profile_or_current_subject } %>
+  <%= render partial: 'common_documents/new_button',
+             locals: { owner: profile_or_current_subject } %>
 
-<section class="documents">
-  <%= render partial: 'common_documents/list',
-             locals: { documents: collection } %>
-</section>
-
-  
-<nav class="documents">
-  <%= render partial: 'layouts/more',
-             locals: {
-               path: polymorphic_path([profile_subject, Document.new ]),
-               per_page: Document.default_per_page,
-               total: collection.total_count
-             } %>
-</nav>
+  <section class="documents">
+    <%= render partial: 'common_documents/list',
+               locals: { documents: collection } %>
+  </section>
 
+    
+  <nav class="documents">
+    <%= render partial: 'layouts/more',
+               locals: {
+                 path: polymorphic_path([profile_subject, Document.new ]),
+                 per_page: Document.default_per_page,
+                 total: collection.total_count
+               } %>
+  </nav>
+</div>
 
 <%= javascript_tag do %>
 $(function() {

data/documents/app/views/documents/index.html.erb

@@ -1,5 +1,4 @@
 <section id="documents">
-  <h1><%= t 'document.title.other' %></h1>
 
   <% if profile_or_current_subject.present? %>
     <%= render :partial => 'common_documents/index', :locals => { :documents => collection } %>

data/documents/app/views/documents/new.html.erb

@@ -2,8 +2,10 @@
   <%= "#{ current_subject.name }: #{ t('document.new.title') }" %>
 <% end %>
 
-<%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
+<section id="new_document">
+  <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
 
-<h1><%= t 'document.new.title' %></h1>
+  <h1><%= t 'document.new.title' %></h1>
 
-<%= render partial: 'common_documents/form', locals: { document: @document } %>
+  <%= render partial: 'common_documents/form', locals: { document: @document } %>
+</section>

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.1".freeze
+    VERSION = "2.0.2".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.1')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
 
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')

data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-1200px-min.css.sass

@@ -22,9 +22,7 @@
         font-size: 15px
         line-height: 22px
 
-      #suggestions,
-      #pendings
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
 
   #explore-content
     .timeline

data/events/app/views/rooms/_index.html.erb

@@ -1,6 +1,13 @@
 <div id="rooms">
   <% current_subject.rooms.each do |room| %>
     <%= room.name %>
-    <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('room.delete')), room, :class => "room_delete_link", :method => :delete, :confirm => t('room.confirm_delete'), :remote => true %>
+    <%= link_to room,
+                title: t('room.delete'),
+                class: "room_delete_link",
+                method: :delete,
+                confirm: t('room.confirm_delete'),
+                remote: true do %>
+      <i class="icon_tool16-trash"></i>
+    <% end %>
   <% end %>
-</div>
+</div>

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end

data/oauth2_server/app/views/site/clients/_form.html.erb

@@ -1,4 +1,4 @@
-<article>
+<article class="new_app">
   <%= form_for(@client || Site::Client.new) do |f| %>
 
     <% if f.object.errors.any? %>

data/oauth2_server/app/views/site/clients/show.html.erb

@@ -1,50 +1,52 @@
-<%= render partial: 'toolbar/home' %>
+<div class="oauth2_server"> 
+  <%= render partial: 'toolbar/home' %>
 
-<section id="oauth2_server">  
-  <h1>
-    <%= @client.name %>
-  </h1>
-  <a class="pull-right" href="#">
-    ir a tus demás aplicaciones
-    </a>
-  <hr class="soften">
-  <div class="content">
-    <a class="pull-left" href="#">
+  <section id="oauth2_server">  
+    <h1>
+      <%= @client.name %>
+    </h1>
+    <a class="pull-right" href="#">
+      ir a tus demás aplicaciones
+      </a>
+    <hr class="soften">
+    <div class="content">
+      <a class="pull-left" href="#">
 
-      <%= image_tag('logos/app-default.png', class: "media-object") %>
+        <%= image_tag('logos/app-default.png', class: "media-object") %>
 
 
-      
-    </a>
-    <article  class="media box">
-      <div class="media-body">
-        <h4>
-          <%= Site::Client.human_attribute_name :url %>
-        </h4>
-        <div class="result">
-          <%= link_to @client.url, @client.url%>
+        
+      </a>
+      <article  class="media box">
+        <div class="media-body">
+          <h4>
+            <%= Site::Client.human_attribute_name :url %>
+          </h4>
+          <div class="result">
+            <%= link_to @client.url, @client.url%>
+          </div>
+          <h4>
+            <%= Site::Client.human_attribute_name :callback_url %>
+          </h4>
+          <div class="result">
+            <%= @client.callback_url %>
+          </div>
+          <h4>
+            <%= Site::Client.human_attribute_name :id %>
+          </h4>
+          <div class="result">
+            <%= @client.id %>
+          </div>
+          <h4>
+            <%= Site::Client.human_attribute_name :secret %>
+          </h4>
+          <div class="result client_secret">
+            <p>
+              <%= @client.secret %>
+            </p>
+          </div>
         </div>
-        <h4>
-          <%= Site::Client.human_attribute_name :callback_url %>
-        </h4>
-        <div class="result">
-          <%= @client.callback_url %>
-        </div>
-        <h4>
-          <%= Site::Client.human_attribute_name :id %>
-        </h4>
-        <div class="result">
-          <%= @client.id %>
-        </div>
-        <h4>
-          <%= Site::Client.human_attribute_name :secret %>
-        </h4>
-        <div class="result client_secret">
-          <p>
-            <%= @client.secret %>
-          </p>
-        </div>
-      </div>
-    </article>
-  </div>
-</section>
+      </article>
+    </div>
+  </section>
+</div>

data/oauth2_server/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

data/oauth2_server/social_stream-oauth2_server.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/presence/ejabberd/ejabberd_scripts/authentication_script

@@ -56,22 +56,20 @@ def auth(username,domain,password)
   begin
     response = RestClient.post accessByPasswordUrl, :user => { :email => username , :password => password }
 
-    if response.code == 201
-      return true
-    else
-      return false
-    end
-  
+    return response.code == 201
+
   rescue => e
-    
-    unless e.class.name == "RestClient::Unauthorized" and e.message == "401 Unauthorized"
-	$logger.error "#{Process.pid}: Exception in auth(username, password)"
-    	$logger.error "#{Process.pid}: #{e.class.name}: #{e.message}"
+    if e.class.name == "RestClient::Found" &&
+      e.http_code == 302 &&
+      e.http_body =~ /home/
+      return true
     end
 
+    $logger.error "#{Process.pid}: Exception in auth(username, password)"
+    $logger.error "#{Process.pid}: #{e.class.name}: #{e.message}"
+
     return false
   end
-  
 end