diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 10286e9..af68cc6 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -45,8 +45,6 @@ module LayoutHelper standard_stylesheets = [ 'application', 'search', - 'thickbox', - 'lightbox', 'colorbox', 'selectordie', 'inputosaurus', diff --git a/app/models/user.rb b/app/models/user.rb index 8f65256..ae65310 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -102,7 +102,6 @@ class User < ActiveRecord::Base validates_length_of :email, :within => 3..100, :if => (lambda {|user| !user.email.blank?}) validates_uniqueness_of :login, :email, :case_sensitive => false, :scope => :environment_id before_save :encrypt_password - before_save :normalize_email, if: proc{ |u| u.email.present? } validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?}) 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 end protected - - def normalize_email - self.email = self.email.squish.downcase - end - # before filter def encrypt_password return if password.blank? diff --git a/app/views/shared/logged_in/xmpp_chat.html.erb b/app/views/shared/logged_in/xmpp_chat.html.erb index 6010ce1..2f27e69 100644 --- a/app/views/shared/logged_in/xmpp_chat.html.erb +++ b/app/views/shared/logged_in/xmpp_chat.html.erb @@ -105,7 +105,3 @@ - -
<%= _("Friends in chat (%{amount})") %>
- - diff --git a/app/views/shared/not_found.html.erb b/app/views/shared/not_found.html.erb index c0babdb..d3677b2 100644 --- a/app/views/shared/not_found.html.erb +++ b/app/views/shared/not_found.html.erb @@ -11,7 +11,7 @@ <%= button :home, _('Go to the home page'), '/' %> <% if logged_in? %> <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %> - <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %> + <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %> <% end %> <% end %>
diff --git a/db/schema.rb b/db/schema.rb index 6971f09..d044507 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -241,14 +241,6 @@ ActiveRecord::Schema.define(:version => 20150122165042) do t.datetime "updated_at" end - create_table "chat_messages", :force => true do |t| - t.integer "to_id" - t.integer "from_id" - t.string "body" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "comments", :force => true do |t| t.string "title" t.text "body" @@ -263,8 +255,6 @@ ActiveRecord::Schema.define(:version => 20150122165042) do t.string "source_type" t.string "user_agent" t.string "referrer" - t.text "setting" - t.integer "paragraph_id" end add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam" @@ -718,21 +708,21 @@ ActiveRecord::Schema.define(:version => 20150122165042) do create_table "users", :force => true do |t| t.string "login" t.string "email" - t.string "crypted_password", :limit => 40 - t.string "salt", :limit => 40 + t.string "crypted_password", :limit => 40 + t.string "salt", :limit => 40 t.datetime "created_at" t.datetime "updated_at" t.string "remember_token" t.datetime "remember_token_expires_at" t.text "terms_of_use" - t.string "terms_accepted", :limit => 1 + t.string "terms_accepted", :limit => 1 t.integer "environment_id" t.string "password_type" - t.boolean "enable_email", :default => false - t.string "last_chat_status", :default => "" - t.string "chat_status", :default => "" + t.boolean "enable_email", :default => false + t.string "last_chat_status", :default => "" + t.string "chat_status", :default => "" t.datetime "chat_status_at" - t.string "activation_code", :limit => 40 + t.string "activation_code", :limit => 40 t.datetime "activated_at" t.string "return_to" t.datetime "last_login_at" diff --git a/plugins/notification/install.rb b/plugins/notification/install.rb deleted file mode 100644 index e69de29..0000000 --- a/plugins/notification/install.rb +++ /dev/null diff --git a/plugins/notification/public/javascripts/lobby_note.js b/plugins/notification/public/javascripts/lobby_note.js deleted file mode 100644 index e69de29..0000000 --- a/plugins/notification/public/javascripts/lobby_note.js +++ /dev/null diff --git a/public/javascripts/application.js b/public/javascripts/application.js index c5379c0..4bc96a8 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1191,40 +1191,3 @@ function stop_fetching(element){ } window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() }; - -function getQueryParams(qs) { - qs = qs.split("+").join(" "); - var params = {}, - tokens, - re = /[?&]?([^=]+)=([^&]*)/g; - while (tokens = re.exec(qs)) { - params[decodeURIComponent(tokens[1])] - = decodeURIComponent(tokens[2]); - } - return params; -} - -var fullwidth=false; -function toggle_fullwidth(itemId){ - if(fullwidth){ - jQuery(itemId).removeClass("fullwidth"); - jQuery("#fullscreen-btn").show() - jQuery("#exit-fullscreen-btn").hide() - fullwidth = false; - } - else{ - jQuery(itemId).addClass("fullwidth"); - jQuery("#exit-fullscreen-btn").show() - jQuery("#fullscreen-btn").hide() - fullwidth = true; - } -} - -function fullscreenPageLoad(itemId){ - jQuery(document).ready(function(){ - var $_GET = getQueryParams(document.location.search); - if ($_GET['fullscreen']==1){ - toggle_fullwidth(itemId); - } - }); -} diff --git a/public/javascripts/strophejs-1.1.3/examples/attach/__init__.py b/public/javascripts/strophejs-1.1.3/examples/attach/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/javascripts/strophejs-1.1.3/examples/attach/__init__.py diff --git a/public/javascripts/strophejs-1.1.3/examples/attach/attacher/__init__.py b/public/javascripts/strophejs-1.1.3/examples/attach/attacher/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/javascripts/strophejs-1.1.3/examples/attach/attacher/__init__.py -- libgit2 0.21.2