nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11673 commits 4 branches 0 tags 121 MiB
Commit graph

5753 commits

Author SHA1 Message Date
danielgrippi
bc1ffd317e reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again 2012-01-07 14:23:22 -08:00
danielgrippi
9e4e58e002 fix facebook specs; comment controller specs 2012-01-07 14:23:22 -08:00
danielgrippi
414fb8d454 corrected template views; status message now includes oembed; updated post.rb api to supply oembed and object_url 2012-01-07 14:23:21 -08:00
danielgrippi
e6d4ec2dc8 added as::photo view 2012-01-07 14:23:21 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
4883c70ae2 move templates into app/views/templates/_templates.haml 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e DH DG; create comments via backbone 2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581 introduce comments 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
dca3581ae2 added likes to the stream element underscore partial 2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad serialize current user json into body tag for now 2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0 DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now). 2012-01-07 14:23:20 -08:00
danielgrippi
aa7343d759 add profile streams to backbone. this breaks hovercards, atm. 2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b backbone all the streams, besides user. don't use the acts_as_api way for now. 2012-01-07 14:23:20 -08:00
danielgrippi
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773 DG DH; pagination on backbone stream 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Maxwell Salzberg
91c21f5d92 MS SM; removed seemingly unused(?) layout file 2012-01-07 12:56:32 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Maxwell Salzberg
523a960d94 peace troll 2012-01-05 18:53:27 -08:00
Jonne Haß
00a800ab07 this should fix a weired test polution case on travis where the x-git-revision header is suddenly nil 2012-01-06 03:26:00 +01:00
Maxwell Salzberg
41ecf2b27d make a method in EnviromentConfiguration to test if newrelic is setup 2012-01-05 18:14:06 -08:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
d9c2b0d4b5 make cdn jquery http/s agnostic 2012-01-04 23:57:28 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
7cc6e3ed68 uncomment cdn line.. whoops 2012-01-04 22:19:37 -08:00
Maxwell Salzberg
cf2c12d98b converting to string makes this not an htmlsafe buffer 2012-01-04 12:03:15 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Maxwell Salzberg
71b58fa6fc only queue process_photo jobs if the owner is local. this should cut down on some resque errors 2012-01-04 00:08:29 -08:00
Maxwell Salzberg
e9465e7001 move websocket to make rails happy 2012-01-03 22:47:44 -08:00
Maxwell Salzberg
34e4c027d0 small typo 2012-01-03 22:47:10 -08:00
Maxwell Salzberg
4e574c3fef fixed loading jquery from the CDN, and the fallback to the local copy still works 2012-01-03 20:02:52 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until 
we find a better way to reimpliment it in a  more sane way
 2012-01-03 18:39:54 -08:00
Maxwell Salzberg
9b05e80e3f fix oembed caches so data must be present 2012-01-03 18:00:16 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Chase Reid
90eda36272 added support for uploading images with .tiff extensions 2012-01-02 21:40:46 -05:00
robhogg
b792a6d3e0 Fixed typo 2012-01-02 21:24:44 +00:00
robhogg
8fbe180446 Modified nsfw? to use case-insensitive regex match. 2012-01-02 21:24:44 +00:00
Jonne Haß
1e8e0b55fd paranthesis ftw, sorry for the noise 2012-01-02 21:17:11 +01:00
Jonne Haß
67b2af0da6 check if ca_file is commented out completly 2012-01-02 21:07:46 +01:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
danielgrippi
6ab03d33b4 hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions) 2011-12-30 23:51:13 -05:00
Steven Fuchs
f72a4b4476 notifications controller should return the guid and unread state of the updated notification 2011-12-23 22:58:01 -05:00
Steven Fuchs
a1d474111b controller now only accepts string values for unread. 2011-12-23 15:35:07 -05:00
Steven Fuchs
cd75c6ea67 cleaner reading of unread parameter 2011-12-23 11:36:20 -05:00
Lennart Prelle
0a83b0d37a forget the return 2011-12-23 13:51:40 +01:00
Lennart Prelle
9ab4cd113e remove redirect to stream from settings 2011-12-23 13:44:41 +01:00
Steven Fuchs
f3486e831f changes is_unread parameter to unread 2011-12-22 22:57:05 -05:00
Steven Fuchs
a7af886da2 add 'read' class ro read messages to match the 'unread' class associated with unread messages. This will keep us from attaching jquery functionality to notification types we may not know about. 2011-12-22 15:53:14 -05:00
Steven Fuchs
f2be6e8bcf controller can accept a parameter as to whether the notification should be marked as read or unread 2011-12-22 15:20:48 -05:00
Jonne Haß
2817fb95de do not use example config if there's a custom one 2011-12-22 02:03:41 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
danielgrippi
e9b6da605f fix specs; move presence_of_content validation check into a before_destory to play nicely with federation 2011-12-20 10:42:30 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary. 2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6 Refactor implementation of #reshare_count. 
The old implementation which uses Post.where causes

  undefined method `abstract_class?' for Object:Class

in spec/controllers/posts_controller_spec.rb.  Not sure whether that's a problem
with Rails, or rspec, or what.
 2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b Improve wording of error message in Reshare#root_must_be_public validation. 2011-12-19 17:12:17 -05:00
Pistos
99f2d4f018 Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original"). 2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44 Always show "Reshare original" for link. Show number of reshares in the post_initial_info div. 
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared.  Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares".  Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
 2011-12-19 17:12:17 -05:00
Vittorio Cuculo
0e77fcb084 Fix #2488 soundcloud embedding 2011-12-19 09:50:39 +01:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Lennart Prelle
20a39714bf added translation for close account 2011-12-15 15:35:30 +01:00
Jonne Hass
d6f98d12e1 even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error 2011-12-11 04:45:11 +01:00
Jonne Hass
fe82cd6609 lets not set NOT NULL fields to null… 2011-12-11 04:12:58 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Jonne Hass
05be43e21a fix #2504 2011-12-10 12:44:55 +01:00
danielgrippi
fb39a1e16d fix account deletion specs 2011-12-09 17:51:45 -08:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
ee12f19ff6 dispatch before deleting 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
e57698bbe8 setting the account deletion name in the xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
1552b5bcc2 keep the pivate key, required for retries 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
7667029e71 wip, stated the serialized model 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
danielgrippi
e6ed2d397a added close account to user 2011-12-08 16:32:18 -08:00
danielgrippi
cd6f97fa0e DG IZ; remove authorizations from user; double check that aspect_visibilities are deleted 2011-12-08 16:32:18 -08:00
danielgrippi
644e382cfd DG IZ; remove more stuff associated with user; removed dependant destroys 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
05612ef733 ms iz wip 2011-12-08 16:32:18 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable" 
This reverts commit 0f56ee7b77.
 2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new 
better commented_posts_stream
 2011-12-02 10:42:36 -08:00
Johannes Hackel
36c9b9ecdd fix next sql error 2011-12-02 16:33:12 +01:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
aboire
d03695e128 update url invitation facebook 2011-11-30 17:44:45 +04:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
danielgrippi
873e04f24d Revert "use select distinct as opposed to group by". Using a distinct 
causes a 500

This reverts commit 805346c70c.
 2011-11-28 15:17:36 -08:00
danielgrippi
805346c70c use select distinct as opposed to group by 2011-11-28 15:09:20 -08:00
Daniel Grippi
161d9d527c Merge pull request #2270 from fermionic/allow-photo-views-in-mobile 
re-enable photo viewing on mobile
 2011-11-28 11:03:13 -08:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Vittorio Cuculo
fdd52782d2 show diaspora_handle on profile [mobile] 2011-11-24 09:42:15 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Dan Hansen & Sarah Mei
d9bd25e114 Only repopulate cache on contact destroy if user exists 2011-11-21 21:39:26 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
danielgrippi
cc4531f73c stop censorship. sopa 2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441 translate Email in the sidebar 2011-11-16 21:55:09 +01:00
Jonne Hass
74582fe07d Merge pull request #2340 from manuels/userignore_icon 
Modified "Ignore user" icon
 2011-11-16 10:48:55 -08:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
danielgrippi
8e55fc158b use root_path in header if not logged in 2011-11-14 19:04:27 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Michael Sofaer & Sarah Mei
8294472420 Merge branch 'master' of https://github.com/diaspora/diaspora 2011-11-14 14:16:20 -08:00
Michael Sofaer & Sarah Mei
3e1d06ded3 Memorial splash page 2011-11-14 14:16:09 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b Merge branch 'master' of github.com:diaspora/diaspora 2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Pistos
05b1e2fc19 Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag. 
e.g. if "test" exists and you try to follow "Test".
 2011-11-13 23:26:53 -05:00
Jonne Hass
6526e2f305 fix #2392 2011-11-13 22:37:18 +01:00
Jonne Hass
9839ac559c fixed timeago for posts#show if not logged in 2011-11-11 23:06:08 +01:00
Jonne Hass
65f8136690 made public translatable in the publisher dropdown 2011-11-11 23:00:46 +01:00
Pistos
ef075b7b15 Don't render "getting started" help text over aspect dropdown if the user isn't actually getting started. 
This fixes a UI bug which showed remnants of the "getting started" text on hover.
 2011-11-10 20:41:09 -05:00
Pistos
d3d92e5957 Only render "getting started" help text for users that really are getting started. 
This fixes a UI bug which showed remnants of the "getting started" frontend code on hover.
 2011-11-10 20:04:26 -05:00
Pistos
ef990e04cd Refactor new user helper text in publisher; improved code readability. 2011-11-10 20:03:52 -05:00
Jonne Hass
b3142ac208 redirect to sign in page from photo#show on a private photo when user isn't signed in 2011-11-10 22:44:12 +01:00
Jonne Hass
10fa7ba024 fixed 500 on photos#show for private photos and logged out user 2011-11-10 19:31:00 +01:00
Lennart Prelle
d95b28a9be added translation to tag_path in _right_selection 2011-11-10 15:14:07 +01:00
Daniel Grippi
6c68fd752f Merge pull request #2362 from Pistos/remove-invalid-comment-in-publisher 
Remove a comment from the publisher Haml code, so publisher isn't mangled
 2011-11-09 16:33:37 -08:00
Daniel Grippi
319d72deb9 Merge pull request #2345 from 21echoes/higher_post_limit 
higher post limits
 2011-11-09 16:11:39 -08:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00
Jason Robinson
c04bcebfca Bookmarklet render if statement negated for code simplicity 2011-11-09 22:44:57 +02:00
Jason Robinson
af5c469f10 Created missing view for mobile bookmarklet. Adjusted status_messages_controller.rb to render it. 2011-11-09 22:44:57 +02:00
Lennart Prelle
f2997f5146 change #newhere to translation 2011-11-09 20:38:06 +01:00
Pistos
e0a9b50c84 Remove a comment from the publisher Haml code, so publisher isn't mangled in Firefox 3. "//" is not really proper Haml comment syntax anyway. 2011-11-09 12:50:10 -05:00
Jonne Hass
59b99fe917 pluralization for show more comments, fix #2350 2011-11-09 11:07:35 +01:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Jonne Hass
730d2d9754 add missing .html_safe 2011-11-08 21:32:15 +01:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -08:00
Ilya Zhitomirskiy
e1253c4018 fade in on hover, larger x on the welcome div 2011-11-07 23:11:48 -08:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
David Kettler
74bcc6f06e now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit 2011-11-07 21:21:36 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
danielgrippi
9d91b70f9d fix scope 2011-11-07 12:18:23 -08:00
Manuel Schölling
3e9efad9d6 Fixed icon path of 'Ignore User' icon and converted to .png 2011-11-07 21:15:33 +01:00
danielgrippi
8da1d6a7fc multi stream hotfix (re: cache) 2011-11-07 12:15:24 -08:00
Maxwell Salzberg
35216808e0 do not specifiy order for a scope that does not have to do with order 2011-11-06 21:16:57 -08:00
Sarah Mei
0fc43b580b Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx. 2011-11-06 20:27:36 -08:00
danielgrippi
de88c0ab48 correct newrelic_ignore 2011-11-06 19:35:30 -08:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Manuel Schölling
99d51b72e8 Modified "Ignore user" icon 2011-11-07 00:15:41 +01:00
Jonne Hass
78e03056e8 little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set 2011-11-06 23:03:20 +01:00
Jonne Hass
9a556f7cb2 Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug 
2307 private inbox bug
 2011-11-06 13:12:03 -08:00
buddhamagnet
d8a22da275 amended view to pass in time to translated string for private inbox thread time display 2011-11-06 18:47:51 +00:00
buddhamagnet
77474b214a added translateable text to inbox thread times 2011-11-06 18:08:51 +00:00
Jonne Hass
af1558831b Improved reshare receive 
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
 2011-11-06 18:26:10 +01:00
Jonne Hass
50baa4ba92 also link to the translated tag 2011-11-06 18:06:26 +01:00
Jonne Hass
a1eee6e90f made help tags translatable so that local communities can take care of the new users, also fixed #2327 2011-11-06 16:43:13 +01:00
Jonne Hass
9ffeef9d20 Merge branch 'new_user_language' of https://github.com/alda519/diaspora 2011-11-06 15:17:05 +01:00
Jakob Kramer
b8dbf1d81e fixed 500 error if one is opening people's photos view and there are no images in the user's stream 2011-11-06 13:29:57 +01:00
Jonne Hass
13297eadc8 give correct scope in order clause 2011-11-06 09:26:14 +01:00
Jonne Hass
ca3c5fc6e8 do not assume mysql ordering in StatusMessage#tag_stream 2011-11-06 08:24:07 +01:00
Sarah Mei
c2893a2e3d Fix require problem with the acts_as_taggable patches 2011-11-05 22:38:14 -07:00
Sarah Mei
c30e3ee362 Merge branch 'master' of github.com:diaspora/diaspora 2011-11-05 19:58:25 -07:00
Sarah Mei
2143e0f9ba Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN. 2011-11-05 19:57:51 -07:00
danielgrippi
9a2ee973a3 make service icons larger 2011-11-05 18:13:31 -07:00
danielgrippi
c9f069d000 Revert "add participant_users to conversations" 
This reverts commit 655558cb95.

Revert "MS DG; for real this time?"

This reverts commit f85a047f6f.

Revert "MS DG; actually fix the bug"

This reverts commit cde12ec232.

Revert "fix small commenting email bug #oops"

This reverts commit a552fc80c0.

Revert "dont ban diasporahq  stuff"

This reverts commit 2c12b94e67.

Revert "Merge branch 'participants'"

This reverts commit 7417801886, reversing
changes made to abd211ba72.
 2011-11-05 18:08:32 -07:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Jonne Hass
655558cb95 add participant_users to conversations 2011-11-05 12:09:36 +01:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
Sarah Mei
d17ecd6101 Fix user controller spec 2011-11-04 22:06:56 -07:00
Maxwell Salzberg
cde12ec232 MS DG; actually fix the bug 2011-11-04 19:37:21 -07:00
Maxwell Salzberg
a552fc80c0 fix small commenting email bug #oops 2011-11-04 19:24:48 -07:00
Maxwell Salzberg
b7d0ec7564 fix spelling and update job to use less obtrusive query 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24 MS DG add participants 2011-11-04 18:46:43 -07:00
Ilya Zhitomirskiy
41db42a7a4 displaying public tags in the multi stream 2011-11-04 18:14:34 -07:00
danielgrippi
39b6abaa88 do includes before last(3), as last() returns an array, not an AR object 2011-11-04 16:46:30 -07:00
danielgrippi
3296477531 eager load author and profile for comments 2011-11-04 16:40:14 -07:00
Ilya Zhitomirskiy
f3183a11e1 message explaining that we're populating things in the background 2011-11-04 16:20:51 -07:00
Maxwell Salzberg
2d4e6e4915 forgot to uncomment a line 2011-11-04 16:04:37 -07:00
Maxwell Salzberg
745e4dea8c queue facebook lookup job, dont do it in process 2011-11-04 16:02:17 -07:00
Maxwell Salzberg
7784156e3b retry less 2011-11-04 15:11:16 -07:00
Ilya Zhitomirskiy
ecd2a52553 added a password field before account closure 2011-11-04 10:25:19 -07:00
Maxwell Salzberg
9bdde0d9af another hack 2011-11-04 00:49:30 -07:00
Ilya Zhitomirskiy
ce199e770d dk iz querying by id in status message tag_stream 2011-11-03 22:20:06 -07:00
Sarah Mei
f9a9654c86 Allow non-logged-in users to see public photos 2011-11-03 22:07:48 -07:00
Pistos
db94689dfa Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5 Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." 
This reverts commit 5c8ddc3ea6.
 2011-11-03 23:54:23 -04:00
danielgrippi
acf6936d7c fix specs in contact 2011-11-03 20:48:02 -07:00
Pistos
5c8ddc3ea6 Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:44:46 -04:00
danielgrippi
bb19531195 require newrelic_rpm if newrelic is configured 2011-11-03 18:06:32 -07:00
danielgrippi
dca370d3ff ignore publicscontroller in newrelic 2011-11-03 14:45:46 -07:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
danielgrippi
0ab23f337a fixed all cukes; view bugs on streams 2011-11-03 12:31:24 -07:00
danielgrippi
07f713f46c change 'mute' to 'ignore' for now; fix specs; repopulate cache upon 
contact removal
 2011-11-03 12:31:24 -07:00
danielgrippi
5df6bc1adf block user now removes a contact if user is blocking a contact 2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself 2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
5b8365118d Stream#posts no longer needs to call for_a_stream 
exclude blocked users from all streams
 2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
0eb33b371b blocked users works for multi stream, cuke passes 
fixed scoping stuff
 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Daniel Grippi
debf382fac Merge pull request #2306 from Pistos/issue-2298-following-dot-tags 
Issue 2298 following dot tags
 2011-11-02 21:29:48 -07:00
Pistos
78a96a18e4 This fixes issue #2298. 
Following a hashtag with a dot now no longer breaks the user's stream page.
All unacceptable hashtag chars are stripped out, and the given tag is
normalized before being followed.
 2011-11-02 23:51:12 -04:00
danielgrippi
995996add1 add spec & change syntax in http_multi 2011-11-02 15:00:30 -07:00
Daniel Grippi
ed029b2fbd Merge pull request #2251 from manuels/retry_federations 
Retry federation if remote pod is down
 2011-11-02 14:09:30 -07:00
Daniel Grippi
73d3bf46b3 Merge pull request #2300 from Pistos/issue-2213-hashtag-markdown-em-collision 
Issue 2213 hashtag markdown em collision
 2011-11-02 13:23:55 -07:00
Maxwell Salzberg
6df5904e13 stop the catastrophic from happening" 2011-11-02 11:59:55 -07:00
Ilya Zhitomirskiy
640733e3d3 fixed the photo index for person 2011-11-02 10:47:50 -07:00
Pistos
db4bfb73a9 Fix issue #2213: multi-underscore hashtags no longer get Markdown <em>phasis applied. 2011-11-01 23:35:34 -04:00
Pistos
e912bf3eda Whitespace cleanup. 2011-11-01 23:35:21 -04:00
Dan Hansen & Maxwell Salzberg
697ad1e84f add new here to right section 2011-11-01 17:19:05 -05:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
Ilya Zhitomirskiy
c64588a68d adding attachments to all recepients 2011-10-31 18:09:43 -07:00
Ilya Zhitomirskiy
9cadb99f8a sending csv as a file 2011-10-31 16:39:09 -07:00
Ilya Zhitomirskiy
41ccc6b28e Revert "trying removing extending of empty module" 
This reverts commit aaafeb27e4.
 2011-10-31 15:12:01 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
aaafeb27e4 trying removing extending of empty module 2011-10-31 12:53:27 -07:00
Ilya Zhitomirskiy
82fabbadd1 Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)" 
This reverts commit 95aac2f352.
 2011-10-31 12:38:00 -07:00
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Pistos
d643f7e893 Make the donation form (right sidebar) optional. Show or hide via application.yml . 2011-10-29 00:42:09 -04:00
Zach Prezkuta
2f69737014 re-enable photo viewing on mobile 2011-10-28 17:10:20 -06:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
Dan Hansen
29a0706123 hide duplicate flash notice on Sessions#new 2011-10-27 20:31:14 -05:00
danielgrippi
c8fc9fcb76 fixed spinny location on getting_started 2011-10-27 18:03:09 -07:00
danielgrippi
0b18e47b82 connect_to_comment text for federated users 2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
danielgrippi
b879070744 avatars for likes 2011-10-26 23:50:01 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99 fix oembed spec; prevent people from commenting on posts that wont federate 2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Ilya Zhitomirskiy
53b27a7627 added a rake task to email retention to admins 2011-10-26 16:35:20 -07:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Maxwell Salzberg
7e73865147 mangle oembed stuff to prevent content warnings, only support services that work when you mangle them; please let us know if your favorite service works when you gsub out all of the https links 2011-10-26 15:11:31 -07:00
Pistos
29573586c8 Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 2011-10-25 23:02:42 -04:00
Maxwell Salzberg
1a521a792a zomg text collapse is finally back #thankgod 2011-10-25 19:46:09 -07:00
Pistos
3ce0806cbc Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
 2011-10-25 22:21:08 -04:00
danielgrippi
f204910aa4 add 'mark all as read' on notification dropdown 2011-10-25 17:33:57 -07:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
danielgrippi
0512ade65a made name smaller and clickable on aspects/index [ci skip] 2011-10-24 21:43:32 -07:00
danielgrippi
19897df1ec more first_name fixing 2011-10-24 21:34:56 -07:00
danielgrippi
e71fcea762 first_name now takes everything but the last word in the name field 2011-10-24 21:27:21 -07:00
danielgrippi
03d3e885b5 disapora logo goes to stream page on mobile 2011-10-24 21:20:31 -07:00
danielgrippi
28e08fb6a3 show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?) 2011-10-24 20:51:16 -07:00
danielgrippi
5d54fc6c28 removed community spotlight stream link from right side 2011-10-24 20:14:28 -07:00
danielgrippi
02199b172b remove duplicate wording 2011-10-24 18:51:34 -07:00
danielgrippi
0033237b4e made flash messages awesome this time 2011-10-24 17:33:18 -07:00
Maxwell Salzberg
d5e3033308 make a setting to check out the new getting started 2011-10-24 17:10:36 -07:00
danielgrippi
0874a632f4 make gs dismissal icon translucent 2011-10-24 16:11:26 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
aec8ca5c5e remove diapsora ids from titles on small avatars; add twispys to contact sidebar 2011-10-24 15:04:58 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
danielgrippi
547d7e4f8c bootstrapped getting started page 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
e7584261c7 removeing the tooltips after submit 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
1ccf965194 publisher lib, prefill, open, still need to do public first message for new users 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
ee74948863 wip welcome post, publisher object 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
bfd2d440d1 ajax form on the getting started 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
80216cb024 wip save on blur 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
511bd3ab03 added a save button, moved stuff around 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Dennis Schubert
2fcc783787 Add mobile registration site to fix ugly 500 2011-10-24 22:50:25 +02:00
Maxwell Salzberg
4022ff5163 small possible fix for conversations 2011-10-24 13:06:32 -07:00
Ilya Zhitomirskiy
51778cb22d storing the entriety of the service profile name in first name 2011-10-24 12:41:50 -07:00
Ilya Zhitomirskiy
eea6a59d40 Merge branch 'profile_image_fetch' 2011-10-24 11:46:44 -07:00
Maxwell Salzberg
aa2fd8abcf make stream link to home icon 2011-10-24 11:34:17 -07:00
Ilya Zhitomirskiy
8b3c4f4cf2 checking on the attribute not the method 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
c60adda3a9 WIP, almost done for twitter, just need to figure out how to follow redirects 2011-10-24 11:00:00 -07:00
danielgrippi
44c9fcf65f log in to the stream 2011-10-23 18:21:07 -07:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
Gonzalo Rodriguez
4331e74673 Associate lables to checkboxes 2011-10-23 02:22:40 -02:00
Gonzalo Rodriguez
0a081b051c Fix more 'communtiy' typos 2011-10-23 01:39:23 -02:00
John Edmonds
b482d16622 Merge branch 'master' into issue1144 2011-10-22 14:39:03 -04:00
danielgrippi
64f7450d6c DG MS; fix case where pod does not have any communty spotlight 2011-10-21 17:39:39 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
1256b6f3fc DG MS; changed coloring of indicators; changed indicator precidence; added soup link 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
19d91908e3 fix the aspect stream 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
6cce4f0872 small typo on invites#edit 2011-10-20 11:27:21 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
danielgrippi
c49c76e2a6 DG MS; some refactoring 2011-10-19 15:47:22 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
Maxwell Salzberg
6965101fa6 fix some mistakes I made yesterday, check if the name field exsists before trying it 2011-10-18 12:29:07 -07:00
Maxwell Salzberg
cb89772a6a when connected, external services fill in profile info that you have not yet filled out 2011-10-18 10:02:24 -07:00
Gonzalo Rodriguez
aa1623a95f Fixing person's name construction 
* When only has last_name, return last_name not diaspora_handle
* Strip contstructed name to avoid trailing or preceding space
when having only first or last name present
 2011-10-18 02:24:29 -02:00
danielgrippi
b61246c168 fixed all but two jasmine specs... 2011-10-17 16:54:18 -07:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
c2c152ee4b Change tag serializer to use tagged_people_count instead of people_count. Fixed typo (was tagge_people_count) 2011-10-16 15:55:22 -07:00
Sarah Mei
98ef5212f3 Merge branch 'tag_stream_api' 2011-10-16 15:47:20 -07:00
Manuel Schölling
e63d29bc94 Fixed postgres issue 2011-10-17 00:34:04 +02:00
Sarah Mei
80821c9cc5 Basic tag metadata returned. Now what to do about posts?... 2011-10-16 15:25:11 -07:00
Sarah Mei
42e061dfa0 Fix one tag api spec 2011-10-16 13:43:21 -07:00
Manuel Schölling
8cfb854fab Quickfixed federation of StatusMessages with photos only (no text) 2011-10-16 14:42:14 +02:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Manuel Schölling
6e325f8fd5 Introduced Commentable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
f2c16bec85 add files 2011-10-15 22:38:21 -07:00
Maxwell Salzberg
3179ebabc9 fix tag stream 2011-10-15 22:37:53 -07:00
Maxwell Salzberg
ea700716ab SM MS remove instance var from mobile post view 2011-10-15 21:18:58 -07:00
Maxwell Salzberg
ea0240d6f8 fix broken mobile tag view 2011-10-15 21:08:22 -07:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
2dda160990 tag stream wip 2011-10-15 18:57:35 -07:00
Pistos
153615e651 Fix more specs. Added an explicit spec for all_comments . 2011-10-15 16:21:26 -04:00
Pistos
fae9aee425 Fix specs. 2011-10-15 14:47:09 -04:00
Jonne Hass
517e37b56a fix another missing translation and a cucumber feature 2011-10-15 12:59:50 +02:00
Jonne Hass
6606bd01b1 fix missing translation 2011-10-15 12:28:18 +02:00
Pistos
35a0c56346 This fixes issue #2032. Anyone can now view all comments on a public post without needing to log in. 2011-10-15 00:18:17 -04:00
Pistos
39dd39e9e3 Refactor: Remove superfluous local variable. 2011-10-15 00:07:12 -04:00
Maxwell Salzberg
bcb52b35cf make soup available to everyone to see if we can get feedback 2011-10-14 14:43:51 -07:00
Maxwell Salzberg
14c5f1c564 MS DG; only select the ids for soup query 2011-10-14 11:08:47 -07:00
danielgrippi
0ce7f0c4bf properly scope Stream::Soup in SoupsController 2011-10-14 06:44:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
f959ca0c12 refactor streams to be in a Stream module, hopefully they will auto-reload now 2011-10-13 22:26:15 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo Rodriguez
2de057d210 Remove unused method 2011-10-12 23:57:16 -02:00
Daniel Grippi
b7f4f81d28 Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql 
Explicitly specify order of comments, since we cannot assume MySQL orderi
 2011-10-12 16:09:18 -07:00
Gonzalo Rodriguez
6849c3604b Keep searched tag in the search field. Closes #1983. 2011-10-12 04:10:26 -02:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
9fd1d7db63 updating gemfile and schema.rb 2011-10-11 16:53:37 -07:00
Maxwell Salzberg
8acd9acb08 tests moved and passing 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
cfb28db00f wip, but the refactored code works 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Maxwell Salzberg
963d5c1a69 wip 2011-10-11 16:10:14 -07:00
Manuel Schölling
3561021a90 Added cucumber tests for oEmbed feature 2011-10-11 16:09:16 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Pistos
15b3cce6ee Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code). 
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results.  I removed the problem by removing #last_three_comments which
I consider a premature optimization.
 2011-10-11 16:06:24 -04:00
Pistos
4774b670de Whitespace cleanup. 2011-10-11 15:50:40 -04:00
Ilya Zhitomirskiy
7becb0ac0e added require in admins controller 2011-10-11 11:05:32 -07:00
Ilya Zhitomirskiy
7fb26c4390 dg iz limiting to one month, added contacts sharing with count 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
288d20b6e8 correlations on the admins page 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
818167c565 DG IZ; wip 2011-10-11 10:57:26 -07:00
Your Name
dcb4903711 use tag name instead of its id for pagination 2011-10-11 10:42:46 -07:00
Daniel Grippi
aba29ea479 Merge pull request #2156 from manuels/new_lines 
[PaperCut] Allow new lines (<br>)
 2011-10-11 09:44:52 -07:00
Daniel Grippi
eb19bc9a78 Merge pull request #2111 from vcuculo/fix-mobile-select 
Fix #2091 - Aspects selection on mobile
 2011-10-11 09:29:45 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
danielgrippi
2ef56224be DG MS; added more feedback to photo uploader 2011-10-10 16:35:18 -07:00
danielgrippi
882c0c2170 DG MS; fixed tags autocomplete styling and js 2011-10-10 15:59:13 -07:00
Manuel Schölling
1135c0ad79 Allow new lines (<br>) 2011-10-10 20:41:54 +02:00
Dan Hansen
32f1b61719 Mail doesn't seem to like the name-addr spec from RFC2822 2011-10-10 00:35:04 -05:00
Dan Hansen
f6845c360f Revert "change namespace from Mail to Mailers" 
This reverts commit f859904c76.
 2011-10-09 23:34:03 -05:00
Dan Hansen
f859904c76 change namespace from Mail to Mailers 
locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem.
added copyright
 2011-10-09 22:41:01 -05:00
Dan Hansen
814eb7b426 RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address. 
Check against the raw headers of the mail as @mail.from excludes the display name
Extract shared logic between notifier methods
 2011-10-09 22:19:50 -05:00
Gonzalo Rodriguez
6b5928ca09 Remember last selected aspects through the session 2011-10-09 02:24:53 -02:00
Pistos
cd3e824bc1 Explicitly specify order of comments, since we cannot assume MySQL ordering (which is by id). 2011-10-08 22:59:44 -04:00
Gonzalo Rodriguez
583dd20249 Refactor selected aspects ui setup 2011-10-08 23:14:04 -02:00
Levente Bagi
43544a7bee fixed tags#show when tag is not found 
Bug introduced by commit 2b22e1dab
 2011-10-08 00:31:53 +01:00
Maxwell Salzberg
0da3fbcf66 fix some cases where the parent is nil in relayable retractions 2011-10-07 13:45:20 -07:00
Maxwell Salzberg
c85209a22c strip whitespace in name call 2011-10-07 12:59:07 -07:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Maxwell Salzberg
1bf51f678c move featured users sidebar down 2011-10-07 11:17:18 -07:00
danielgrippi
2baa1e7c6e remove hidden posts from the cache; add unhidden posts to the cache 2011-10-06 19:14:08 -07:00
Your Name
bdc7c85b7e make tags links on featured users 2011-10-06 17:30:21 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Ilya Zhitomirskiy
d891e78652 refactored post receiving; only update cache on verfied received objects 2011-10-06 12:31:09 -07:00
maxwell
53c98e16e7 fix inf scroll on featured users stream 2011-10-06 12:31:08 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
maxwell
c854ac51a3 fix inf scroll on featured users stream 2011-10-06 11:03:27 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
04b51cced8 Merge branch '1584-aspects-list' 2011-10-06 01:52:53 -02:00
Gonzalo Rodriguez
4563632afe Avoid checkmark on 'All contacts' link 2011-10-06 01:07:28 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Maxwell Salzberg
75aa3f8f97 include people names in the from field 2011-10-05 17:12:31 -07:00
Ilya Zhitomirskiy
2185df3f52 chaged the default order to created_at 2011-10-05 15:17:45 -07:00
Ilya Zhitomirskiy
3e2b30ec61 passing the server time to help intiate the infinite scrolling 2011-10-05 15:12:30 -07:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Maxwell Salzberg
59e0658497 default order for tags to be sorted by name 2011-10-05 14:00:28 -07:00
Vittorio Cuculo
c47579cfd8 Fix #2091 - Mobile select aspect 2011-10-05 09:30:45 +02:00
Dan Hansen
8c15ca2a4b PMs and comments contain author name in "From" header 
refactor notifier
 2011-10-04 23:48:28 -05:00
Maxwell Salzberg
a3eeb9f3c1 comment on tagged posts wip 2011-10-04 18:20:15 -07:00
maxwell
eef054dc5e wip 2011-10-04 18:20:14 -07:00
Ilya Zhitomirskiy
c2bb483b21 dg iz updating authors cache on creation of a post 2011-10-04 17:40:44 -07:00
Ilya Zhitomirskiy
b42d675cb7 accounting for the unified receiver interface of the method 2011-10-04 15:51:39 -07:00
Maxwell Salzberg
fca0ee7c7b make remember me hidden on mobile 2011-10-04 15:43:38 -07:00
Ilya Zhitomirskiy
6ea540fb94 wip, adding to cache in receiver, caching is only triggered for receiving of posts 2011-10-04 10:32:17 -07:00
danielgrippi
1ab2ead10c check for current user on tag pages 2011-10-03 19:42:19 -07:00
Gonzalo Rodriguez
80a494f9ba Use haml instead of content_tag 2011-10-04 00:22:33 -02:00
danielgrippi
543bf458a2 extracted methods to helpers 2011-10-03 18:53:25 -07:00
Gonzalo Rodriguez
97e1775938 Adding alt text for header icons. Related to #2089. 2011-10-03 23:33:32 -02:00
Maxwell Salzberg
81e04a11fe fix tag stream, no comments for now, but coming soon 2011-10-03 17:30:22 -07:00
Maxwell Salzberg
34f82d8bc1 try an in query directly for the tags 2011-10-03 17:14:57 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
56f5efc373 yeah that didnt work 2011-10-03 16:14:27 -07:00
Maxwell Salzberg
df023e4c72 small cubbies app scope refactor 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
01fd1f23c7 moving stuff around 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
1d2439ee76 clean up stream directory structure 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
8fa02584c0 fix a bug I introduced 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
52bb5900a3 added shared behaviors for real 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
412fe1b027 rebased and consolidated logic" 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Dennis Schubert
70d9dcf3b7 Merge pull request #2098 from lprelle/delete_dash_in_comments 
delete the dash in comments, after the name
 2011-10-03 14:58:34 -07:00
Lennart Prelle
0c42903d2c delete dash in comments 2011-10-03 23:42:30 +02:00
Dan Hansen
3eaa1c0584 moved photo processing from model to resque job, added tests 
removed Photo#not_processed
 2011-10-03 14:58:44 -05:00
Gonzalo Rodriguez
ae1fedc73b Preserve search term on search input. Related to #1983. 2011-10-02 23:02:48 -02:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
f9d88e122f limit contacts to 15 on aspects pages for faster network times 2011-10-02 13:11:30 -07:00
danielgrippi
9672c27232 using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake 2011-10-02 12:27:14 -07:00
Maxwell Salzberg
164b395f06 derp. remove puts-es 2011-10-02 09:37:55 -07:00
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07:00
Maxwell Salzberg
7c9eb065ba make some shared devise logic into a helper 2011-10-02 09:15:02 -07:00
danielgrippi
b881d7b3de default sort order to created_at instead of commented_on on desktop site 2011-10-01 16:24:28 -07:00
Dan Hansen
d0fe59af69 add cucumber feature for photo lightbox 
change step to reflect element visibility
 2011-10-01 15:52:48 -05:00
Maxwell Salzberg
00873cdc6a small fix for mobile tag show pages 2011-10-01 09:47:57 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
danielgrippi
eaa191515e remove logging statement in a before filter that performed a query 2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a Revert "header data as helper methods" 
This reverts commit 607013bc83.
 2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83 header data as helper methods 2011-09-30 13:22:12 -07:00
Maxwell Salzberg
fd42629c04 Merge pull request #2077 from christophe-de/username-blacklist 
add username blacklist
 2011-09-30 12:00:15 -07:00
Ilya Zhitomirskiy
27dcdf9a11 added an index to root_id 2011-09-30 11:35:07 -07:00
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
Paul Spieker
0c12471feb add username blacklist 2011-09-30 14:17:04 +02:00
John Edmonds
8d0f6699ae Move photo upload logic to file_handler. 2011-09-29 21:49:58 -04:00
Maxwell Salzberg
dfb4c9c920 Merge pull request #2051 from uiri/672-facebook-majority-market-share 
Links in the message translate into a proper link on Facebook when sendin
 2011-09-29 18:13:33 -07:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -07:00
Uiri
0fbda5d077 Modularized and Tested™ 2011-09-29 21:04:18 -04:00
Maxwell Salzberg
45491f06d5 fix cuke for inf scroll(dont rely on session for sort order) 2011-09-29 17:33:15 -07:00
Maxwell Salzberg
cd2eb4292e fix cuke for inf scroll(dont rely on session for sort order) 2011-09-29 17:23:53 -07:00
Maxwell Salzberg
aa5d5b560d fix incorrect status_message#new view 2011-09-29 15:17:25 -07:00
Maxwell Salzberg
5c96705069 fix typo, update webdriver 2011-09-29 14:48:47 -07:00
Maxwell Salzberg
772f69de2d fix typo in statusmessage controller 2011-09-29 14:06:36 -07:00
Maxwell Salzberg
44942036da make the socketing tests pending as we are not currently doing that 2011-09-29 13:33:44 -07:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
danielgrippi
70b175479c format all on including stylesheet for WP7 2011-09-29 00:39:12 -07:00
danielgrippi
e3bf03636b pass in mobile as provider_display_name on posts if posting from mobile 2011-09-28 22:15:32 -07:00
Ilya Zhitomirskiy
c3746aec7f passing around arrays instead of object on local batch receive 2011-09-28 21:34:48 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Maxwell Salzberg
5ae9edc72e fix comment bug 2011-09-28 13:44:58 -07:00
danielgrippi
38624afd9c fix reshare cubbies bug on mobile 2011-09-28 11:29:36 -07:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
42fcf3e394 reshares up top 2011-09-27 21:32:11 -07:00
danielgrippi
7d662fcc92 move share button to top right corner 2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb expand/collapse comments with animation; added collapse link on bottom 2011-09-27 21:09:27 -07:00
danielgrippi
2b2443b6b9 aspect dropdown takes public and all aspects option 2011-09-27 21:09:27 -07:00
danielgrippi
9b057bdf16 added placeholder; force autofill off on comment fields; touched up mobile reshare view 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406 wip 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
9d72247e9e mobile tags page 2011-09-27 21:09:27 -07:00
danielgrippi
d972802142 comment ajax on mobile. 2011-09-27 21:09:26 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32 fixed header; compose message on top right 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
ab3d220b57 always sort by created_at on mobile 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Uiri
3aa3b9aea8 Better regex solution 2011-09-26 23:59:33 -04:00
Uiri
82feff7fb4 Links in the message translate into a proper link on Facebook when sending to facebook. 2011-09-26 23:59:33 -04:00
danielgrippi
49bee9bf19 fix the build 2011-09-26 20:53:06 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
John Edmonds
b999617dde Respond with HTML for Opera. 
If we don't respond with the content-type text/html, rails will return a 406 Not Acceptable.
 2011-09-25 12:01:44 -04:00
John Edmonds
5f906defc8 Directly use UploadedFile object if available. 
Opera doesn't support XHR file uploads and instead submits a regular form.
Thus, we are provided with an UploadedFile object which can be used instead of creating our own compatible object.
 2011-09-25 11:51:13 -04:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Gonzalo Rodriguez
be00536810 Remove extra whitespace inside person_link that's causing bad formatting on likes list 2011-09-24 19:07:17 -03:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
386697f711 added a nil check, for pre-mongo days 2011-09-21 13:37:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Gonzalo Rodriguez
24be48d660 Strip full name considering cases where first or last name omitted 2011-09-20 22:18:35 -03:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Ilya Zhitomirskiy
41abb5790e changed the to proc syntax to explicit block syntax 2011-09-19 14:16:26 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
e865dfc269 fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
Maxwell Salzberg
55999bc443 resolve route conflicts 2011-09-16 12:49:47 -07:00
Maxwell Salzberg
6c414d8562 add tests for object_should_be_processed_as_public? and delegegated public to the parent of relayable objects 2011-09-16 11:24:13 -07:00
Maxwell Salzberg
b63b6cbcd5 remove job alias 2011-09-16 10:33:15 -07:00
Maxwell Salzberg
d1fc3caae0 remove salmon hack 2011-09-16 10:30:37 -07:00
Maxwell Salzberg
7ae003c88c alias receive salmon 2011-09-16 10:20:03 -07:00
Maxwell Salzberg
05816733ce alias job 2011-09-16 10:14:32 -07:00
Maxwell Salzberg
9e0446f707 conversations are not public 2011-09-16 09:53:32 -07:00
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
danielgrippi
58abbcc058 DG MS; activate dispatcher switch in Dispatcher; remove diasporahq blocker 2011-09-16 08:53:13 -07:00
danielgrippi
999efbd451 IZ DG MS; fix method call in public receiver 2011-09-15 19:37:56 -07:00
Gonzalo Rodriguez
2bb2c6e3e8 Add links to person profile for post hidden text 2011-09-15 23:16:13 -03:00
Loïc Guitaut
a739c4f308 Ability to mount resque jobs monitoring directly into Diaspora* routes 
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
 2011-09-16 02:40:57 +02:00
danielgrippi
60cb9e43a7 DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route 2011-09-15 15:33:28 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
danielgrippi
ec011f0800 DG MS; optimized local comments to be batched; backfilled more tests 2011-09-15 11:22:47 -07:00
danielgrippi
cfa260927d DG MS; remove unusused job 2011-09-15 11:22:47 -07:00
Daniel Grippi
380b980f8b Merge pull request #1985 from alda519/featured_user_tag_link 
fixed links to featured user's tags on getting_started page
 2011-09-15 09:28:08 -07:00
danielgrippi
7216f76801 added some docs to Request [ci skip] 2011-09-15 08:39:21 -07:00
alda519
b2c141a221 fixed links to featured user's tags on getting_started page 2011-09-15 17:03:17 +02:00
danielgrippi
656640ee94 call Postzord::Receiver::Private explicitly in receive_salmon 2011-09-14 19:19:00 -07:00
danielgrippi
b3534ed5f4 Revert "show redis connection" 
This reverts commit 6a887a6d99899b9876e3145fb0a8b92ce2a405cf.
 2011-09-14 18:07:54 -07:00
danielgrippi
e0bdbef281 show redis connection 2011-09-14 18:07:53 -07:00
danielgrippi
4da9425480 fix pod_uri bug in app_config 2011-09-14 18:07:53 -07:00
danielgrippi
2f9ea6cd43 try accessing env var if present in app_config 2011-09-14 18:05:40 -07:00
danielgrippi
57079ef5cd set ENV['HEROKU'] explicitly in the heroku:config task 2011-09-14 18:05:40 -07:00
danielgrippi
f55a086752 edit app+_config to look for heroku's ENV['STACK'] config var; load settings from ENV hash instead of application.yml if on heroku 2011-09-14 18:05:40 -07:00
danielgrippi
fab6f9ccd9 DG MS; fixed tests; explicitly send in dispatcher in httpmulti 2011-09-14 17:51:25 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
alda519
a9e4b4ce99 fixed broken test, spec added 2011-09-14 20:46:52 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
aed08d6283 removed unused method; moved includes() out of scope 2011-09-14 00:10:04 -07:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
015cc9e451 actually fix specs/cucumber 2011-09-13 18:21:16 -07:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Maxwell Salzberg
3184d7aad1 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:32:50 -07:00
alda519
296c53a685 fixes new user's language setting 2011-09-13 19:57:55 +02:00
The Lambda Calculus
b7399cda8f Merge pull request #1970 from TheLambdaCalculus/b1126-additional-refactoring 
Refactoring for B#1126 fix. Photo model is now fatter with #destroy logic while Photo controller is thinner.
 2011-09-13 07:15:29 -07:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
danielgrippi
2022187942 sprinkle a little documentation around lib, mostly just specifying return types 2011-09-12 23:01:47 -07:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
0ab0526cd6 DG MS; put validates_associated in relayable, removed from receiver logic 2011-09-12 15:06:17 -07:00
Maxwell Salzberg
5177e5b218 DG MS test receive_relayable 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
87c994fa47 MS DG cleaned up and fleshed out salmon specs 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f MS IZ DG moar salmon refactoring 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
e0429ee823 MS DG pulling apart salmon and making our custom hacks more obvious 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Lennart Prelle
5a3445150c move _donate.html.erb to _donate.html.haml and make it translateable 2011-09-12 18:29:07 +02:00
danielgrippi
293afd80ff all_public scope in Post for clarity 2011-09-11 19:28:52 -07:00
Jonne Hass
4b0c45d895 rescue unmeaningful exception from settingslogic if the namespace doesn't exists and replace it with meaningful error message 2011-09-12 01:05:49 +02:00
danielgrippi
2d1bb92a5a added missing sample() in _selected_contacts.html.haml 2011-09-11 15:18:46 -07:00
danielgrippi
1d0bec11f7 Add counter cache for comments on posts 2011-09-11 15:02:24 -07:00
Jonne Hass
fcc6d95067 Merge branch 'refactor_models_2' of https://github.com/buddhamagnet/diaspora 2011-09-11 23:46:13 +02:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec initial tests for AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
buddhamagnet
010024c4f9 continuing refactor of model validation calls to rails 3 syntax 2011-09-11 21:39:02 +01:00
buddhamagnet
cfa659c47e refactored model validations to use newer rails 3 syntax 2011-09-11 21:31:39 +01:00
Lennart Prelle
8041fea96c added mobile version to the change 2011-09-11 17:29:23 +02:00
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Daniel Grippi
95aad7f15d Merge pull request #1940 from alda519/profiles_helper-image 
default profile photo is no longer marked as set
 2011-09-10 19:25:47 -07:00
Sarah Mei
ae32ffc667 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-10 13:38:12 -07:00
Sarah Mei
8b789bfe35 Notifications don't 500 anymore, but I don't know how to make it render the mobile view. 2011-09-10 13:38:01 -07:00
Jonne Hass
523d565dd5 Merge pull request #1939 from everplays/css-rtl 
fixed html markup which broke applied direction
 2011-09-10 13:27:19 -07:00
danielgrippi
fe915ecb09 don't redirect to AspectsController#new from AspectsController#index if no aspect is present 2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e touched up AspectsController#index for readability's sake 2011-09-10 09:24:35 -07:00
alda519
b5f8f49ddd default profile photo is no longer marked as set 2011-09-10 17:31:34 +02:00
Daniel Grippi
4ab112645f removed a puts in Person.search 2011-09-10 07:40:35 -07:00
behrooz shabani (everplays)
22bb6177d4 <p> can't be inside another one - breaks direction detection 
we are applying direction of content on <p> & markdownify always
generates a <p> so we have something like <p
class="ltr"><p>...</p></p> but paragraph can't be inside another
paragraph & browsers sees something like <p
class="rtl"></p><p>...</p></p> so applied direction will be ignored
 2011-09-10 16:14:30 +04:30
Ilya Zhitomirskiy
ad11bd2a31 the Devise email regex was not catching pods that were anything other than a standard url 2011-09-09 18:05:58 -07:00
danielgrippi
961272d1bd tweaked search a little (don't put a double wildcard on diaspora_id) -- this is a quick fix; solr pending 2011-09-09 11:54:10 -07:00
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Maxwell Salzberg
bea76a4801 move the ugly type check into the ugly method, to keep all the ugly in 
one place; restore listening to single process mode in resque; move the
exception handling to inside the method, rather than around the
intializer, and log when resque errors happen in development in single
process mode
 2011-09-09 08:58:06 -07:00
Sarah Mei
9e4c450eea Not all notifications are for posts :) 2011-09-09 06:55:15 -07:00
Maxwell Salzberg
91eabf0fce attempt to add muting of notifications when post has a hidden visibility; i am getting a load path error in resque now, but that seems to be independent of this commit 2011-09-08 23:21:13 -07:00
Manuel Schölling
0b28376216 Fixed some texts in "Getting Started" that were not translatable 2011-09-09 01:15:54 +02:00
Sarah Mei
c72ee05ca1 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-08 12:01:55 -07:00
Maxwell Salzberg
9917dac4c2 block diasporahq from posting to federation for today 2011-09-08 11:57:06 -07:00
Sarah Mei
1363021859 Update some oddly-worded comments 2011-09-08 11:55:29 -07:00
danielgrippi
c5fbe1584a fix the build; don't test on enqueueing a job to fetch facebook friends every time we hit the facebook finder -- only do this on log in 2011-09-08 10:59:35 -07:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Maxwell Salzberg
7f6104d27b dont queue service user fetching every inf scroll 2011-09-07 13:25:00 -07:00
danielgrippi
1844226077 paginate facebook friends. 2011-09-07 13:00:21 -07:00
Daniel Grippi
26ae8b17b2 Merge pull request #1910 from diaspora/aspect_listings_split 
Refactor aspect listings partial. Splited in two, one for aspects and other for contacts
 2011-09-07 08:34:50 -07:00
Jonne Hass
c0780f3af2 only touch post on comment creation, fix #1911 2011-09-07 15:55:48 +02:00
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Gonzalo Rodriguez
1a6ee84ed5 Refactor aspect listings partial. Splited in two, one for index and 
other for contacts.
 2011-09-07 00:09:39 -03:00
Gonzalo Rodriguez
4a2b609d53 Join two aspect_ids calculations into one 2011-09-06 23:12:03 -03:00
danielgrippi
341d105e75 updated buttons, mixin declarations 2011-09-04 22:48:37 -07:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Maxwell Salzberg
0780491d4f fix for 'undefined method 'post' for nil:NilClass' in Mail::AlsoCommented 2011-09-03 16:06:30 -07:00
Maxwell Salzberg
1853720513 MS SM fix for 'No method limit for []' 2011-09-03 16:05:44 -07:00
Maxwell Salzberg
26151263c5 put receiving in a transaction, to prevent the crazy duplicate index errors and hopefully fix federation visibility. 2011-09-03 16:04:53 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
Gonzalo Rodriguez
2afb646286 Minor changes on status message 2011-09-03 03:47:33 -03:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
Gonzalo Rodriguez
0aeab944bf Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es 
What i did was to redirect to the tag without dots, in this case cubbies
I didn't consider a good idea to add route support for /tags/cubbi.es
since it get messed with request formats
 2011-09-03 00:22:27 -03:00
Gonzalo Rodriguez
eae9c14168 Use named helper instead of hardcoded route 2011-09-02 22:49:16 -03:00
vcuculo
8919d0c0ce fixed bookmarklet 2011-09-02 10:28:32 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
48cdf7c79f fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected 2011-09-01 12:03:07 -07:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted 
B1126 deletion of all photos from a post with no words should result in the post being deleted
 2011-09-01 10:04:10 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
Sarah Mei
2e747e814f Turns out we need that absolute option after all. 2011-08-31 21:21:55 -07:00
Sarah Mei
1e50137815 Fix person_href 2011-08-31 20:29:53 -07:00
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -07:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
Brian Wisti
a6e87ebcb2 placeholder commit, working on mentions in markdown merging. 2011-08-30 14:44:49 -07:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
bb8a9f0b3f small bug in markdownify to prevent barfing with a nil message 2011-08-30 11:34:54 -07:00
Maxwell Salzberg
e25decedc3 Merge pull request #1845 from fermionic/1811-mobile-share-button 
1811 mobile share button
 2011-08-30 11:27:36 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)." 
This reverts commit 902c40e42d.
 2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
Zach Prezkuta
dfe9e15107 Issue #1811: Share button missing in mobile version 2011-08-29 21:22:07 -06:00
Sarah Mei
e8eb496e66 Ruby 1.9 can find markdownify. 2011-08-29 20:01:57 -07:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. 
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
 2011-08-28 16:08:57 -07:00
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
Gonzalo Rodriguez
b048d1dd54 When deleting an aspect from contacts page do not redirect to aspects page 2011-08-27 19:24:21 -03:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Gonzalo Rodriguez
cc1add81b0 Avoid RecordNotFound exception thrown by find method when invalid person_id 2011-08-27 02:45:58 -03:00
Dan Hansen
d084c708b6 use @like.target instead of @target, build should be green 2011-08-26 16:08:39 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Andrej Kacian
5d2d883dd3 Require confirmation when deleting a comment 2011-08-26 20:24:04 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c a user now has the option to disable reshare email notifications 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez
31733e1f9f Merge pull request #1686 from grzuy/1486-invalid-birthday-crash 
Fix #1486 profile update was crashing with invalid birthday date
 2011-08-25 16:40:57 -07:00
Maxwell Salzberg
8dfb278509 Merge pull request #1795 from lksnyder0/admin_nav 
Admin nav
 2011-08-25 16:35:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Raphael Sofaer
7f0677ab16 connect wip 2011-08-23 16:37:51 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
89edfb7ed6 WIP prefilling username on logout of user is almost there 2011-08-23 16:37:50 -07:00
Raphael Sofaer
a63d1ad4ae Sign out the signed in user if a different uid is passed to AuthorizationsController#new 2011-08-23 16:37:50 -07:00
Raphael Sofaer
6b88a75174 Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user 2011-08-23 16:37:50 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Maxwell Salzberg
eb99b6ba5d MS IZ removed the puts 2011-08-23 14:41:16 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
0dc5807ee0 go to the facebook friend finding page on getting started untill we work out the facebox problems 2011-08-23 09:15:51 -07:00
Maxwell Salzberg
e7071fd74c fix admin inviter 2011-08-23 08:43:42 -07:00
Gonzalo Rodriguez
43d6acd868 Support green login page flash message for password change success 2011-08-23 00:51:00 -03:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
c0f45acfe8 Merge branch 'js-refactor-merged' 2011-08-21 21:40:01 -05:00
Sarah Mei
db6acebb6c Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. 
Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation.
 2011-08-21 19:11:46 -07:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
cad14bcdfc Show tags on user profile pages for everyone if we're logged in. 2011-08-22 01:59:03 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Luke Snyder
f9fc55823b finished styling 2011-08-21 13:07:04 -04:00
Luke Snyder
96bfaf7550 changes to bar 2011-08-21 12:24:31 -04:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Gonzalo Rodriguez
ceedbb14cb Closes #1486. Profile update was crashing with invalid birthday date 2011-08-20 00:34:59 -03:00
Raphael Sofaer
a74080e27d Fix ServicesController spec 2011-08-19 16:52:26 -07:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Maxwell Salzberg
e100032244 add all in the query, to be more pedantic 2011-08-19 13:59:41 -07:00
Maxwell Salzberg
3cee589397 show only invites from a user 2011-08-19 13:58:22 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
96d183a041 fixed private message emails not including the message 2011-08-19 11:33:55 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4 added a visible style for missing translations in development and production modes 2011-08-19 11:05:48 -07:00
Gonzalo Rodriguez
3d7297ba5e Closes #1753. Render thats_you message instead of dropdown for your hovercard 2011-08-19 00:47:26 -03:00
Maxwell Salzberg
6beeecefd8 add better messages telling a user that they sent share requests if they try and email exsisting users 2011-08-18 18:27:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00