Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix formatting problem on users/index [#85 state:resolved]

  • Loading branch information...
commit 57a99eab0b2abd12a7e10c0554efbefa53adbfed 1 parent 76906c9
@bborn authored
View
5 CHANGELOG
@@ -1,6 +1,7 @@
= TODO
-* haml/sass propagation (desert)
-* upgrade documentation/rake tasks to fix old migrations
+
+=1.1.0
+* fixed time_ago formatting problem on user/index
= 1.0.4.2
View
2  README.markdown
@@ -1,4 +1,4 @@
-CommunityEngine [v1.0.4.2]
+CommunityEngine [v1.1.0]
Information at: [http://www.communityengine.org](http://www.communityengine.org)
View
4 UPGRADING.markdown
@@ -1,3 +1,7 @@
+Upgrading to v1.1.0
+=====================
+
+
Upgrading to v1.0.4.2
=====================
Run `rake gems:install`
View
2  about.yml
@@ -4,4 +4,4 @@ homepage: http://www.missingmethod.com
summary: A social networking engine
description: Adds basic social networking capabilities to your existing application, including users, blogs, photos, clippings, favorites, and more.
license: MIT
-version: 1.0.4.2
+version: 1.1.0
View
15 app/models/photo.rb
@@ -3,21 +3,6 @@ class Photo < ActiveRecord::Base
belongs_to :album
has_attachment prepare_options_for_attachment_fu(AppConfig.photo['attachment_fu_options'])
- # attr_accessor :cropped_size
- # before_thumbnail_saved do |thumbnail|
- # raise thumbnail.inspect
- # # thumbnail.send(:'attributes=', {:thumbnail_resize_options => cropped_size}, false) if thumbnail.parent.cropped_size
- # if thumbnail.parent.cropped_size[:x1]
- # # img = Magick::Image::read(@photo.public_filename).first
- # thumbnail.crop!(::Magick::CenterGravity, parent.cropped_size[:x1].to_i, parent.cropped_size[:y1].to_i, parent.cropped_size[:width].to_i, parent.cropped_size[:height].to_i, true)
- # raise thumbnail.inspect
- # # size = AppConfig.photo['attachment_fu_options']['thumbnails']['medium']
- # # dimensions = size[1..size.size].split("x")
- # # img.crop_resized!(dimensions[0].to_i, dimensions[1].to_i)
- # # img.write @settings.header_image_file
- # end
- # end
-
acts_as_taggable
View
2  app/views/users/_user.html.haml
@@ -11,7 +11,7 @@
%li.geo= :from2.l + " #{user.location}<br/>"
%li.update
%abbr.published{:title=>"#{user.created_at}"}
- =:joined.l + " #{time_ago_in_words user.created_at}"
+ =:joined.l + " #{time_ago_in_words_or_date user.created_at}"
- if user.offerings.any?
%li.skills= user.offerings.collect{|o| link_to o.skill.name, skill_url(o.skill) }.join(', ')
- if current_user and current_user.can_request_friendship_with(user)
View
2  lang/ui/de-DE.yml
@@ -2,7 +2,7 @@ de-DE:
date:
formats:
published_date: "%d.%m.%Y"
- date_ago: "%e. %b"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/en.yml
@@ -2,7 +2,7 @@ en:
date:
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/es-AR.yml
@@ -2,7 +2,7 @@ es-AR:
date:
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/es-ES.yml
@@ -2,7 +2,7 @@ es-ES:
date:
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/es-MX.yml
@@ -7,7 +7,7 @@ es-MX:
abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/ru-RU.yml
@@ -2,7 +2,7 @@ ru-RU:
date:
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/sr-CP.yml
@@ -2,7 +2,7 @@ sr-CP:
date:
formats:
published_date: "%Y/%m/%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
View
2  lang/ui/sv-SE.yml
@@ -2,7 +2,7 @@ sv:
date:
formats:
published_date: "%Y-%m-%d"
- date_ago: "%B %d"
+ date_ago: "%b %Y"
time:
formats:
Please sign in to comment.
Something went wrong with that request. Please try again.