Commit graph

5753 commits

Author SHA1 Message Date
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Maxwell Salzberg
11d9b50f3a a solution for a problem with pulling back all visible public ids when querying
after much sleuthing, this is an extremely hacky way to limit the
amount of public post _ids we are pulling back with every query.
previously, for unknown reason, we were pulling back all of them from
people you are connected to, and doing giant in queries which were
causing bad things to happen.  As far as I can tell, we are in fact
keeping track of the page( i.e. max time and offset) so there was no
need to pull all of them back.  This whole file is a huge clusterf*ck,
so it really should just get totally refactored, as the stuff that is
happening is not really as scary as it looks :(
2012-04-10 00:40:34 -07:00
Maxwell Salzberg
a70b057bf5 update resources in devise emails :( 2012-04-09 22:56:30 -07:00
Maxwell Salzberg
ff740f41f6 fix bookmarklet on mobile 2012-04-09 10:48:43 -07:00
Maxwell Salzberg
903f4cb9ac Merge pull request #3124 from liamnic/master
Fix Bookmarklet By Adding application.css[ci skip]
2012-04-09 10:34:26 -07:00
Maxwell Salzberg
6642bd5554 Merge pull request #3121 from dmorley/patch-13
Update app/views/shared/_photo_area.mobile.haml[ci skip]
2012-04-09 10:32:26 -07:00
Maxwell Salzberg
0eb946497f Merge pull request #3101 from despora/fallback_for_donation
added fallback for donation
2012-04-09 10:24:20 -07:00
Jonne Haß
e9a22ae41a fix syntax error in authorizations/new.html.haml 2012-04-09 14:44:47 +02:00
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master
email-invitation translation error in subject and body
2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3
Add translation /authorizations fix image
2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Liam Nicholson
0cd2eb7b8d Fix Bookmarklet By Adding application.css. 2012-04-08 09:31:40 +02:00
David Morley
c9431a6512 Update app/views/shared/_photo_area.mobile.haml 2012-04-07 15:28:35 -07:00
Florian Staudacher
9c7103be1d don't set publisher height on focus (already done in css), fixes #3109 2012-04-06 21:21:35 +02:00
Florian Staudacher
024f1fee74 disable jQuery effects for tests
... might buy us a few seconds
2012-04-05 16:12:45 +02:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Jonne Haß
5866ebe638 using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip] 2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9 add favicon back 2012-04-04 13:00:25 -07:00
Lennart Prelle
c2195a3c22 new forms 2012-04-04 11:44:57 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap
heroku and asset sync, which puts the S3 config vars in from your app
config.
2012-04-03 14:47:33 -07:00
Steven Hancock
a8843c1036 Fix JSON caching regression
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.

Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.

closes #3094
2012-04-02 21:40:16 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Daniel Grippi
6f75fb4173 Merge pull request #3088 from Raven24/fix-bmm-2
show an error message when creating a comment failed [ci skip]
2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5 Merge pull request #3086 from Raven24/fix-publisher-height
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
ef292c40eb create a dummy-participation object, that the post appeas followed by self 2012-04-01 22:34:54 +02:00
Jonne Haß
a5a6378eb0 translate 'mark unread' in notifications badge 2012-04-01 13:03:44 +02:00
Maxwell Salzberg
0e2bcf18d2 the logged out logo is now in the branding folder 2012-03-31 00:15:55 -04:00
Florian Staudacher
e6ebf4ad62 show error message when creating a comment failed
(e.g. when the post got deleted in the meantime)
bug mash 5.2
2012-03-30 19:42:14 +02:00
Florian Staudacher
859c0b93b5 reset publisher css height when "cleared" (fixes #2867) 2012-03-30 16:09:41 +02:00
Steven Hancock
fc4b8d2af0 Skip CSRF token for OmniAuth callbacks (prevents session reset)
OmniAuth callbacks need to accept a raw POST from the auth provider without
verifying the CSRF token, otherwise the session will be reset.

See intridea/omniauth#203
See also http://www.communityguides.eu/articles/16

(This technique will also be needed for API endpoints when the time comes)
2012-03-29 18:51:54 -07:00
Maxwell Salzberg
b0a9e9ee59 the header background is not in the branding folder [ci skip] 2012-03-29 16:46:08 -07:00
Raven24
5ad38a5372 damn my brain! 2012-03-30 01:50:21 +03:00
Maxwell Salzberg
033bf637cd Merge pull request #3070 from SuperTux88/fix-invite-mail
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
2012-03-29 15:41:23 -07:00
Maxwell Salzberg
7cc63348ce Merge pull request #3080 from Raven24/js-fix
fix js error when not logged in and on root/landing page, app is undefined
2012-03-29 15:40:15 -07:00
Maxwell Salzberg
a08711c74e Merge pull request #3083 from DeadSuperHero/branding-pack
Branding Pack [ci skip]
2012-03-29 15:39:58 -07:00
Maxwell Salzberg
fe1c0d34d5 Merge pull request #3084 from Raven24/non-ascii-begone
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Sean Tilley
19bf699b9f Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory 2012-03-29 17:18:27 -05:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Maxwell Salzberg
52c9d76a86 Merge pull request #3065 from diasp/2176-url-in-rss
Make URL clickable in RSS #2176
2012-03-29 12:18:36 -07:00
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
2012-03-29 12:14:35 -07:00
Florian Staudacher
9d3f221f1a fix the js error when not logged in and on root/landing page, app is undefined 2012-03-29 16:28:53 +02:00
movilla
af10497b6c Add translation via mobile 2012-03-29 17:26:03 +03:00
Steven Hancock
6abe718227 Mobile UI fixes
This fixes issues with mobile UI rendering

Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
  be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
  view in the mobile UI needs to have the "application" layout
  specified to render properly
2012-03-29 05:52:45 -07:00
Diaspora Europe
9fdca1adf8 make URL clickable in RSS #2176 2012-03-29 13:43:04 +02:00
Steven Hancock
77b107831b punycode.js is required by our javascript
The punycode.js file was somehow removed from the repo. This
replaces it with the current version from github and adds it
to our main.js manifest. Our javascript requires punycode for
(at least) stream rendering.
2012-03-28 20:03:00 -07:00
Dennis Collinson
a9c0c4098b add bootstrap dropdown 2012-03-28 19:13:51 -07:00
Dennis Collinson
755ff52452 turn asset pipeline debugging off
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
2012-03-28 19:01:44 -07:00
Dennis Collinson
875ce68556 fixes for jasmine 2012-03-28 16:32:24 -07:00
Dennis Collinson
78a2ed28b9 User can select Night and Day Moods
headline method on post

extract headline and body from post, at first newline

Night Mood
2012-03-28 16:22:05 -07:00
Dennis Collinson
f25effcafe move handlebars templates for asset pipeline 2012-03-28 16:21:30 -07:00
Maxwell Salzberg
0ce0f3ca74 NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline
WIP Merge branch 'rebased-asset-pipeline'
2012-03-28 14:52:55 -07:00
Maxwell Salzberg
402694e516 fixing cukes 2012-03-28 14:47:28 -07:00
Maxwell Salzberg
5dbfd89d93 some more fixes for the show pages 2012-03-28 13:56:52 -07:00
Maxwell Salzberg
283e730430 AHHH CRAZY. stupid branchs. WIP 2012-03-27 18:40:02 -07:00
Maxwell Salzberg
e1bf6441fe update new js files 2012-03-27 18:26:46 -07:00
Benjamin Neff
92c799f699 add email action 2012-03-28 03:16:49 +02:00
Steven Hancock
f96fc5834f Make the Mention button work with the asset pipeline
* Fix the javascript_include_tag in the status_messages/new view
* Precompile pubhlsiher.js and jquery.textchange.min.js

This fixes a 500 error that was being thrown when the Mention button
was clicked, due to the above two javascripts not being precompiled
and a javascript include that needed to be updated to load
jquery.textchange.js from the correct path.
2012-03-27 18:08:28 -07:00
Steven Hancock
8b92ed73a4 Remove jquery_ujs from main.js manifest
Since jquery and jquery_ujs are now included by the jquery_include_tag
helper (see commit 9e752585), they shouldn't be included by the asset
pipeline in our javascript manifests. :)
2012-03-27 18:08:28 -07:00
Steven Hancock
b48d5fb9c1 Refactor sass/scss stylesheets to use Rails asset helpers
Now that sass-rails and the asset pipeline work, we should use the
asset helpers Rails gives us rather than hard-coding
url("/assets/filename.png") for loading assets from sass/scss
stylesheets.
2012-03-27 18:08:28 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
2012-03-27 18:08:27 -07:00
Steven Hancock
e1607baff4 jquery_include_tag helper
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.

A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).

Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
2012-03-27 18:07:44 -07:00
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
2012-03-27 18:07:44 -07:00
danielgrippi
f72f1d4059 more progress 2012-03-27 18:07:22 -07:00
danielgrippi
5b2716d2ef MS DG; move images to assets 2012-03-27 18:07:22 -07:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
movilla
3b66dd6e3f small translations of mobile My Activity 2012-03-28 00:46:20 +02:00
Dennis Collinson
09f40c8684 Feature Flag new publisher 2012-03-27 15:28:30 -07:00
Dennis Collinson
775eca0026 MS DC You can has choose a template 2012-03-27 14:52:53 -07:00
Dennis Collinson
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
Dennis Collinson
1ec2b73d59 DG DC remotipartjarvascripts 2012-03-27 14:52:51 -07:00
danielgrippi
6dce04d2f5 callbax, yo 2012-03-27 14:52:51 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
danielgrippi
fd0065598c DG MS; posting to services now works, updated form serializer to handle array attributes. 2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8 DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services 2012-03-27 14:52:50 -07:00
Dennis Collinson
cc04f492f2 MS DC added aspect presenter, and include the data on the user 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Steven Hancock
f5fdb8ade1 Add an error message to the mobile login page
This adds an error message to the mobile version of the login page
for failed logins, as requested in #3048

This (along with the standard login page) appears to use the Devise
i18n for the error message, which may need to be updated to reflect
the fact that we're not using email addresses for authentication.
2012-03-27 04:41:56 -07:00
Maxwell Salzberg
4006c1502e Merge pull request #3013 from diasp/mobile-header
Mobile: added activity link to header
2012-03-23 11:05:01 -07:00
Stephan Schulz
716315409a Limit allowed contacts for sending messages to, to the ones that are sharing with you. 2012-03-23 01:21:04 +01:00
Dennis Collective
47dbced6d7 Merge pull request #3028 from diasp/fix-weekly-user-stats
Admin: handle users without created at date [ci skip]
2012-03-22 14:38:02 -07:00
Dennis Collective
f55e6fa5a1 Merge pull request #3039 from movilla/master
Add translation app/views/admins/correlations.haml[ci skip]
2012-03-22 14:37:10 -07:00
movilla
5bfafd549f Add translation to app/views/admins/ correlations.haml 2012-03-22 21:46:20 +01:00
Dennis Collective
a369ee6145 Merge pull request #3037 from movilla/master
Add translation app/views/admins/_admin_bar.haml for Admin Panel
2012-03-22 11:44:26 -07:00
Diaspora Europe
88bb3403d8 added 3 invalid status message specs 2012-03-22 17:24:30 +01:00
movilla
7cb577a24f Add translations to /app/views/admins/_admin_bar.haml 2012-03-22 16:59:09 +01:00
Diaspora Europe
97233851df added status message spec, fix render nothing 2012-03-22 16:52:19 +01:00
danielgrippi
0883ce1dbb fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported
monkeypatch
2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
movilla
bb2d474771 Add translation to "Mark unread" 2012-03-21 15:35:44 +01:00
movilla
f7a1b09639 Fixed translation missing back-to-top 2012-03-21 15:06:14 +01:00
Diaspora Europe
30af2e7188 handle users without created at date 2012-03-21 09:56:06 +01:00
Maxwell Salzberg
7b0c7ee4a0 make the invite flow not look totally terrible 2012-03-19 19:47:46 -07:00
Maxwell Salzberg
3cb7003361 remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing 2012-03-19 19:17:46 -07:00
Maxwell Salzberg
aee17798c1 rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form 2012-03-17 17:10:08 -07:00
Maxwell Salzberg
5868ff06f1 remove user inspect at the top of invites. Thx Blaine [ci skip] 2012-03-17 16:56:20 -07:00
Jonne Haß
7e7de439f8 fix untranslatable stuff from the invite refactor 2012-03-17 13:52:46 +01:00
danielgrippi
852687b31c MS DG fix a few final tests 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works,
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Diaspora Europe
743e42c1e9 mobile: remove stream link from header 2012-03-16 08:38:45 +01:00
Diaspora Europe
cd62c33f17 mobile: added stream and activity links to header 2012-03-16 08:20:42 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap
mobile: added will paginate for bootstrap
2012-03-15 12:09:29 -07:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00
Diaspora Europe
563e94b804 let date looks nice 2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7 mobile: added will paginate for bootstrap 2012-03-15 16:44:25 +01:00
Jonne Haß
0419ca0bb6 made change password explanations translatable [ci skip] 2012-03-15 15:22:20 +01:00
danielgrippi
5e75c6d675 fix jasmine around contact-list.js 2012-03-14 16:26:30 -07:00
Diaspora Europe
e78fc82bea we need json for the notification dropdown #2998 2012-03-14 16:31:54 +01:00
Maxwell Salzberg
b8b6557379 adding an ajax loader, and pull out the js from the middle of the view 2012-03-13 17:10:23 -07:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07:00
Maxwell Salzberg
8ac7a74f50 kinda gross hack to prevent mobile notifications from show up for unauthenticated users 2012-03-13 16:31:16 -07:00
Maxwell Salzberg
298327d2af Merge pull request #2982 from diasp/2912-message-overflows
Handle many users in a message #2912[ci skip]
2012-03-13 15:58:18 -07:00
Maxwell Salzberg
fa247c23ae Merge pull request #2998 from diasp/notification-chore
Notifications update spec and cleanup json response [ci skip]
2012-03-13 15:56:24 -07:00
Maxwell Salzberg
dfd0248a78 Merge pull request #2991 from ChFernandez/master
Pod Administration[ci skip]
2012-03-13 15:47:57 -07:00
Maxwell Salzberg
78cbe0a1d3 Merge pull request #2997 from diasp/1994-mobile-notifications
Mobile notifications back again #1994 [ci skip]
2012-03-13 14:18:58 -07:00
Maxwell Salzberg
24f8447248 Merge pull request #2986 from diasp/improve-mobile
Nice more and comment buttons[ci skip]
2012-03-13 14:16:33 -07:00
Diaspora Europe
746a144dac now redirect to stream 2012-03-13 18:07:42 +01:00
Diaspora Europe
82c9ccfbe0 added read all button, hide count if zero 2012-03-13 17:55:48 +01:00
Diaspora Europe
c48e792c75 added notification badge 2012-03-13 17:27:40 +01:00
Diaspora Europe
f224cfe030 added link to notifications mobile view in header 2012-03-13 16:34:37 +01:00
Diaspora Europe
97d6b8dab8 notifications update spec and cleanup json response 2012-03-13 11:46:14 +01:00
Diaspora Europe
3c6175041d mobile notifications back again #1994 2012-03-13 11:29:20 +01:00
Maxwell Salzberg
da6866c04c Merge pull request #2994 from diasp/improve-reset-password
Improve reset password views
2012-03-12 18:13:52 -07:00
Diaspora Europe
bcc754b07c reset password: added localized text, improved layout 2012-03-12 12:49:47 +01:00
Diaspora Europe
248492ad15 added reset password mobile views 2012-03-12 10:39:42 +01:00
Diaspora Europe
c98a728645 remove useless cancel button 2012-03-12 08:36:34 +01:00
Diaspora Europe
746e9c5cfc nice more and comment buttons 2012-03-12 08:36:33 +01:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
2012-03-10 23:49:56 -08:00
chfernandez
b8ca31b6b3 improved weekly_user_stats in admin with a dropdown box by week to list all new users of that week also a link_to the user profile so the admin can sent welcome msgs, etc 2012-03-10 19:08:19 -08:00
Maxwell Salzberg
000f8d3b08 Revert "adding custom landing page for heroku"
This reverts commit 061badf74e.
2012-03-09 17:44:45 -08:00
Maxwell Salzberg
061badf74e adding custom landing page for heroku 2012-03-09 17:20:22 -08:00