Download as
Browse Code »

Commit 34c7a7d2ac6c00999c2cd03fa5d0341f384495c5

Authored by Leandro Santos
1 parent 0531c6a2
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

mergin with master

Showing 10 changed files with 8 additions and 67 deletions   Show diff stats
app/helpers/layout_helper.rb
  Diff comments   View file @34c7a7d
... ... @@ -45,8 +45,6 @@ module LayoutHelper
45 45 standard_stylesheets = [
46 46 'application',
47 47 'search',
48   - 'thickbox',
49   - 'lightbox',
50 48 'colorbox',
51 49 'selectordie',
52 50 'inputosaurus',
... ...
app/models/user.rb
  Diff comments   View file @34c7a7d
... ... @@ -102,7 +102,6 @@ class User < ActiveRecord::Base
102 102 validates_length_of :email, :within => 3..100, :if => (lambda {|user| !user.email.blank?})
103 103 validates_uniqueness_of :login, :email, :case_sensitive => false, :scope => :environment_id
104 104 before_save :encrypt_password
105   - before_save :normalize_email, if: proc{ |u| u.email.present? }
106 105 validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
107 106  
108 107 validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
... ... @@ -349,11 +348,6 @@ class User < ActiveRecord::Base
349 348 end
350 349  
351 350 protected
352   -
353   - def normalize_email
354   - self.email = self.email.squish.downcase
355   - end
356   -
357 351 # before filter
358 352 def encrypt_password
359 353 return if password.blank?
... ...
app/views/shared/logged_in/xmpp_chat.html.erb
  Diff comments   View file @34c7a7d
... ... @@ -105,7 +105,3 @@
105 105  
106 106 </div>
107 107 </div>
108   - <a href='#' id='chat-online-users-title' onclick='return false;'>
109   - <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
110   - </a>
111   -</div>
... ...
app/views/shared/not_found.html.erb
  Diff comments   View file @34c7a7d
... ... @@ -11,7 +11,7 @@
11 11 <%= button :home, _('Go to the home page'), '/' %>
12 12 <% if logged_in? %>
13 13 <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
14   - <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
  14 + <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
15 15 <% end %>
16 16 <% end %>
17 17 <form action="/search">
... ...
db/schema.rb
  Diff comments   View file @34c7a7d
... ... @@ -241,14 +241,6 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
241 241 t.datetime "updated_at"
242 242 end
243 243  
244   - create_table "chat_messages", :force => true do |t|
245   - t.integer "to_id"
246   - t.integer "from_id"
247   - t.string "body"
248   - t.datetime "created_at", :null => false
249   - t.datetime "updated_at", :null => false
250   - end
251   -
252 244 create_table "comments", :force => true do |t|
253 245 t.string "title"
254 246 t.text "body"
... ... @@ -263,8 +255,6 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
263 255 t.string "source_type"
264 256 t.string "user_agent"
265 257 t.string "referrer"
266   - t.text "setting"
267   - t.integer "paragraph_id"
268 258 end
269 259  
270 260 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
... ... @@ -718,21 +708,21 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
718 708 create_table "users", :force => true do |t|
719 709 t.string "login"
720 710 t.string "email"
721   - t.string "crypted_password", :limit => 40
722   - t.string "salt", :limit => 40
  711 + t.string "crypted_password", :limit => 40
  712 + t.string "salt", :limit => 40
723 713 t.datetime "created_at"
724 714 t.datetime "updated_at"
725 715 t.string "remember_token"
726 716 t.datetime "remember_token_expires_at"
727 717 t.text "terms_of_use"
728   - t.string "terms_accepted", :limit => 1
  718 + t.string "terms_accepted", :limit => 1
729 719 t.integer "environment_id"
730 720 t.string "password_type"
731   - t.boolean "enable_email", :default => false
732   - t.string "last_chat_status", :default => ""
733   - t.string "chat_status", :default => ""
  721 + t.boolean "enable_email", :default => false
  722 + t.string "last_chat_status", :default => ""
  723 + t.string "chat_status", :default => ""
734 724 t.datetime "chat_status_at"
735   - t.string "activation_code", :limit => 40
  725 + t.string "activation_code", :limit => 40
736 726 t.datetime "activated_at"
737 727 t.string "return_to"
738 728 t.datetime "last_login_at"
... ...
plugins/notification/install.rb
View file @0531c6a
plugins/notification/public/javascripts/lobby_note.js
View file @0531c6a
public/javascripts/application.js
  Diff comments   View file @34c7a7d
... ... @@ -1191,40 +1191,3 @@ function stop_fetching(element){
1191 1191 }
1192 1192  
1193 1193 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
1194   -
1195   -function getQueryParams(qs) {
1196   - qs = qs.split("+").join(" ");
1197   - var params = {},
1198   - tokens,
1199   - re = /[?&]?([^=]+)=([^&]*)/g;
1200   - while (tokens = re.exec(qs)) {
1201   - params[decodeURIComponent(tokens[1])]
1202   - = decodeURIComponent(tokens[2]);
1203   - }
1204   - return params;
1205   -}
1206   -
1207   -var fullwidth=false;
1208   -function toggle_fullwidth(itemId){
1209   - if(fullwidth){
1210   - jQuery(itemId).removeClass("fullwidth");
1211   - jQuery("#fullscreen-btn").show()
1212   - jQuery("#exit-fullscreen-btn").hide()
1213   - fullwidth = false;
1214   - }
1215   - else{
1216   - jQuery(itemId).addClass("fullwidth");
1217   - jQuery("#exit-fullscreen-btn").show()
1218   - jQuery("#fullscreen-btn").hide()
1219   - fullwidth = true;
1220   - }
1221   -}
1222   -
1223   -function fullscreenPageLoad(itemId){
1224   - jQuery(document).ready(function(){
1225   - var $_GET = getQueryParams(document.location.search);
1226   - if ($_GET['fullscreen']==1){
1227   - toggle_fullwidth(itemId);
1228   - }
1229   - });
1230   -}
... ...
public/javascripts/strophejs-1.1.3/examples/attach/__init__.py 0 → 100644
  Diff comments   View file @34c7a7d
public/javascripts/strophejs-1.1.3/examples/attach/attacher/__init__.py 0 → 100644
  Diff comments   View file @34c7a7d