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

1581 commits

Author SHA1 Message Date
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
Maxwell Salzberg
64dae868fe fix some tests around pubsubhubub 2012-05-17 18:23:40 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
49117cc95f make federation logger db creation faster by not migrating but using the schema instead 2012-05-17 21:13:23 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
danielgrippi
871d3cc672 i am dumb. include custom mobile in before_deploy [ci skip] 2012-05-11 17:12:30 -07:00
danielgrippi
81661c883f custom landing page logic for mobile. yay 2012-05-11 17:05:09 -07:00
danielgrippi
f820e37838 use .erb for custom landing page instead of .haml [ci skip] 2012-05-11 02:27:33 -07:00
Dennis Collinson
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Jonne Haß
008ed32e9e unambigousify community spotlight query in the multi stream, fix #3196 2012-04-28 12:28:07 +02:00
Jonne Haß
9cb803831f improve webfinger failure handling 
* do not raise if profile xrd isn't found
* error out on a ssl error rather than on the unexpected nil value later
* be more verbose about failed xrd fetches
 2012-04-27 16:53:26 +02:00
Maxwell Salzberg
a58260503f Revert "delegate ruby template picking on reshares so the posts look better" 
This reverts commit 5eb2247191.
 2012-04-26 17:58:38 -07:00
Jonne Haß
2357d9b0f1 update xrd fixture to include namespace and remove namespace before trying to set fields in webfinger profile 2012-04-27 00:05:28 +02:00
Maxwell Salzberg
5eb2247191 delegate ruby template picking on reshares so the posts look better 2012-04-25 18:10:43 -07:00
Maxwell Salzberg
66e9423dc9 more cool seed fixings 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
6c5dafa6e9 cool seed wip [ci skip] 2012-04-24 01:13:57 -07:00
Maxwell Salzberg
8e22d69d8e fix webfinger for (old?) nokogiri syntax 2012-04-11 18:19:14 -07:00
Maxwell Salzberg
2fd0905591 dump more data in invite rake task 2012-04-04 19:08:36 -07:00
Maxwell Salzberg
518d2be1e1 use pretty formatter on CI for great justice 2012-04-03 21:51:18 -07:00
Maxwell Salzberg
f6eec580a0 collect invite tokens here, because why not 2012-04-03 19:57:19 -07:00
Maxwell Salzberg
7a37c0f42a dumb rake task to pipe user emails who have failed invites for 
savekeeping [ci skip]
 2012-04-03 19:01:54 -07:00
Maxwell Salzberg
a5b53717ea small typo fixes, in heroku and seed scripts [ci skip] 2012-04-03 15:02:10 -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
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -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
Maxwell Salzberg
9d26643288 update heroku_san 2012-03-27 15:44:12 -07:00
Justin Thomas
22ac1d96a6 Add Resque.after_fork to correct problem with database connections and remove resque-ensure-connected 2012-03-25 14:39:42 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -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
Stephan Schulz
4d1cb56e47 Allow for white spaces in Rails.root path for the integration rake task 2012-03-06 15:45:45 +01:00
Maxwell Salzberg
bd021bbd91 Correct our general exception handling. 
thanks @mperham! see: http://t.co/Jyt7vV4I
 2012-03-03 16:26:06 -08:00
Maxwell Salzberg
879b3d135a title now updates with switch 2012-02-27 18:40:56 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Maxwell Salzberg
3e65d39b68 rename some stuff in hydra to make it more clear [ci skip] 2012-02-25 18:19:19 -08:00
Maxwell Salzberg
3874c40084 committed a notes file by accident, sry [ci skip] 2012-02-25 17:00:28 -08:00
Maxwell Salzberg
27a4c1bf2d introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor 2012-02-25 16:57:14 -08:00
danielgrippi
37981b71fe MS; DG; adding cucumbers for post templates 2012-02-21 17:31:26 -08:00
Maxwell Salzberg
0ab8ef1d08 basic support for activity streams photos 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
25cf776059 the previous and next posts are now supplied in json of the presenter; give the template creator a default value 2012-02-21 15:23:28 -08:00
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
Maxwell Salzberg
1f4e255f57 fix logging to work great with non-persisted objects 2012-02-17 14:59:42 -08:00
Maxwell Salzberg
ab727fc846 federation logger now in place. 2012-02-16 17:58:15 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
Pistos
44e6084a29 Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up. 
Conflicts:

	lib/postzord/receiver/public.rb
 2012-02-10 23:30:59 -05:00
danielgrippi
5ecb3e8a50 remove a task that doesnt seem to work 2012-02-10 15:31:46 -08:00
danielgrippi
33fb1222f1 change rake assets:compile_s3 to rake assets:deploy [ci skip] 2012-02-10 15:21:59 -08:00
Dennis Collinson
04bd507025 federated generators take a user 2012-02-09 19:01:01 -08:00
Dennis Collinson
5e26a7e6bb Participate stream query uses participations 2012-02-09 19:01:01 -08:00
Dennis Collinson
14b9f5dc5b move user modules into user namespace. 2012-02-09 19:01:01 -08:00
Dennis Collinson
f3c1eff3e9 Refactor Relayable Creation 2012-02-09 19:01:00 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Sarah Mei
6e9d5f013a Fixes #2820 by disambiguating which Person class we want 2012-02-08 06:19:59 -08:00
Maxwell Salzberg
5425d405d8 try running jammit explicitly before jasmine 2012-02-07 14:59:59 -08:00
Jonne Haß
f83076850b use :absolute => true instead of concatenating the pod url manually in ostatus_builder [ci skip] 2012-02-06 10:18:51 +01:00
Daniel Grippi
a142911a8f Merge pull request #2811 from gandaro/2809-atom-userlink-incorrect 
use guid in atom feed to fix the link
 2012-02-05 20:31:03 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
Jakob Kramer
f7b11ac248 use local_or_remote_person_path in atom feed to fix the author's link [ci skip] 2012-02-03 12:24:13 +01:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Sarah Mei
5c393e9e4f Refactor relayable specs and add one for retracting the object. Is pending - not complete yet. 2012-02-01 19:46:31 -08:00
Sarah Mei
085d6552b3 Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring. 2012-02-01 17:52:11 -08:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -08:00
Maxwell Salzberg
d8bfa52af7 swap order in dispatcher to get less errors posting to services 2012-02-01 14:10:54 -08:00
danielgrippi
01a8cb8e34 evil queries have their own house. 2012-02-01 12:48:28 -08:00
danielgrippi
8b62f82d45 fix error 2012-02-01 12:09:46 -08:00
danielgrippi
6bcf06f578 Refactor multistream query 2012-02-01 12:00:30 -08:00
Jonne Haß
2d98c57cf1 [ci skip] The real issue with GnuTLS is actually a flaw in OpenSSL 
which accepts several server misconfigurations

OpenSSL is very liberal about the order and content of the supplied
cert chain. GnuTLS however is very crucial about it. So to support
GnuTLS we need to tell our community to fix their servers (joindiaspora.com
is broken too). You can check it with
gnutls-cli -V --x506cafile=/etc/ssl/ca-certificates.crt $domain
It will print the certs in the order received and say at the end
if it could be verifed. Note that not only the order is important but
also the content. Many example configurations, especially for Nginx,
include the root cert of the CA in the chain which is wrong.
Note from a GnuTLS maintainer: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23573736#29

Revert "Fix federation with GnuTLS by passing the ca_file to Typhoeus"

This reverts commit 640a0181ab.
 2012-01-29 00:08:28 +01:00
Jonne Haß
640a0181ab Fix federation with GnuTLS by passing the ca_file to Typhoeus 
How did this ever work? Anyway Diaspora now works with libcurl4-gnutls-dev
which already supports SNI in most distributions and is also the default
for many distros. Everybody should switch to it. Do so by installing it and
then do a gem uninstall typhoeus followed by a bundle to compile it with
GnuTLS
 2012-01-28 01:41:53 +01:00
danielgrippi
4cf48cae6b check for presence in dispatcher 2012-01-27 16:30:02 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
67432bfaf4 suppress annoying resque errors; add a task to clear Resque failures 2012-01-27 14:57:04 -08:00
Maxwell Salzberg
c100f8bfdd clean up Person scopes, and re-use one in contact controller to deprecate a controller method 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
cc5334ce9a make this scary join a scope [ci skip] 2012-01-27 02:23:37 -08:00
danielgrippi
c133c16dc2 DG MS; don't fetch people or contact objects (you don't need) on multi stream. 2012-01-26 14:52:31 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Maxwell Salzberg
c23e6d9afd dispatcher#post should not take opts 2012-01-26 13:24:53 -08:00
danielgrippi
e170829bf7 pull back less Person objects in the stream query. 2012-01-25 19:40:40 -08:00
Dennis Collinson
b0ef88fb9f WIP convert multiStream query to evilQuery 2012-01-25 19:10:25 -08:00
Maxwell Salzberg
c490224516 change the name of the rake task as we are doing it locally for now 2012-01-25 18:23:49 -08:00
Dennis Collinson
f332610016 Refactor user.shareables_from into evil query class for optimization, possibly broken. 2012-01-25 16:32:18 -08:00
Dennis Collinson
d69953b0d6 enter the idea of the evilquery 2012-01-25 14:20:16 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Jonne Haß
9c67cd7eb9 collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order 2012-01-25 12:44:50 +01:00
danielgrippi
72aee6b2c1 don't use .last(3), use .limit(3) instead. also, don't put an order on an association as it isn't overridable. (this commit minimizes AR object instantiation in the stream) 2012-01-24 23:47:45 -08:00
danielgrippi
eaed3505e4 Don't create share_visibilities for public posts, sans migration of deleting old data. 2012-01-24 16:49:07 -08:00
danielgrippi
52438ffaf2 add unicorn back in. only use one worker process for now. also, move chrome_frame middleware into the correct load path in lib. [ci skip] 2012-01-24 14:56:55 -08:00
Jonne Haß
98bdf68003 do not rely on hoptoad to insert rack ssl 2012-01-22 18:42:06 +01:00
Maxwell Salzberg
dcce2976b5 reset soft so you dont lose your custom homepage when you deploy 2012-01-20 16:37:32 -08:00
Maxwell Salzberg
73655efd53 add precompile rake task for heroku (aliasing our jammit and sass setup) [ci skip] 2012-01-20 15:42:20 -08:00
Maxwell Salzberg
493553f979 working on making heroku_san magical 2012-01-19 19:21:10 -08:00
Maxwell Salzberg
f3120b3d5a add stash to before/after deploy so you dont lose in progress h@x 2012-01-19 19:20:11 -08:00
danielgrippi
f0a698d806 added before_deploy and after_deploy tasks 2012-01-19 19:20:11 -08:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00