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

1526 commits

Author SHA1 Message Date
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
Maxwell Salzberg
1b3cdbb78a Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info" 
This reverts commit ed45789403.
 2012-01-18 16:52:13 -08:00
Maxwell Salzberg
e4bb00fa2f Revert "make sure we always have app config in enviroment configuration" 
This reverts commit 23fb1b0a29.
 2012-01-18 16:52:01 -08:00
Maxwell Salzberg
23fb1b0a29 make sure we always have app config in enviroment configuration 2012-01-18 16:44:36 -08:00
Maxwell Salzberg
ed45789403 add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info 2012-01-18 15:50:22 -08:00
Maxwell Salzberg
0a40cdf288 MS DG make share_visibility_converter really defensive :( 2012-01-18 11:48:23 -08:00
Maxwell Salzberg
0edb06eef7 fix for the migration for some linux users, which the AR stubs were not carring over from the migration file to the ShareVisibilityConverter 2012-01-18 09:29:00 -08:00
Maxwell Salzberg
38ad76d9c7 rewrite webfinger client and specs; now this is much easier to maintain. 2012-01-18 01:21:28 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Jonne Haß
68fb01b2fd bump typhoeus timeout to 25 seconds too #2590 [ci skip] 2012-01-16 15:20:12 +01:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Maxwell Salzberg
f937804bb8 tell travis to run rspec files in a random order 2012-01-11 19:17:07 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Tray Torrance
def764f29f Remove logging:basic before adding logging:expanded 2012-01-09 19:26:33 -08:00
Jamie Wilkinson
c152ecf5a7 Fix typo in 'rake heroku:install_requirements' 2012-01-09 16:38:55 -08:00
Tray Torrance
a35612410f No longer skip false values; quote values so that whitespace is valid. 2012-01-08 23:21:21 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
cec2d27204 ported likes logic for the stream over from old branch 2012-01-07 14:23:22 -08: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
db387b5ed4 MS DC; remove backup.rake as we now use backup' 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
d0184ff6f3 gimme backtraces, travis 2012-01-04 00:25:42 -08:00
Maxwell Salzberg
8b4cb744e6 fix for the messagebusmailer to be happy 2012-01-03 23:31:24 -08:00
Maxwell Salzberg
9de84cbba2 only notify hoptoad if it is configured 2012-01-03 20:03:51 -08:00
Maxwell Salzberg
8a48c5c720 remove extra logging we dont use 2012-01-03 20:03:29 -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
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
Daniel Grippi
ab8fb88e74 Merge pull request #2524 from memarko/patch-2 
Update lib/stream/followed_tag.rb
 2011-12-31 10:51:51 -08:00
danielgrippi
018d516b48 rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity) 2011-12-31 13:47:53 -05:00
Maxwell Salzberg
5bbfebdba9 the invite emailer is not multipart...sigh 2011-12-30 20:54:00 -08: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
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
memarko
890195b2d8 Update lib/stream/followed_tag.rb 2011-12-14 21:15:58 +01:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Sarah Mei
f99dd3683d Add jasmine:ci and cucumber oauth back into travis 2011-12-05 22:26:14 -08:00
Sarah Mei
d245dc91a5 Clearing rake spec before defining it - see if this affects travis 2011-12-05 22:03:24 -08:00
Sarah Mei
c2b22569b0 Let's try a trace on travis and see if it tells us anything useful. 2011-12-05 21:33:36 -08:00
Sarah Mei
d1044298d4 Remove export display for now to see if it affects travis 2011-12-05 21:14:48 -08:00
Sarah Mei
925753e6e4 travis needs to fail faster 2011-12-05 20:50:30 -08:00
Sarah Mei
df06b04d83 Perhaps the bundler prerelease is the reason we're running specs twice? Let's see. 2011-12-05 20:20:48 -08:00
Sarah Mei
085471fb55 Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice 2011-12-04 17:46:26 -08:00
Daniel Grippi
8212268b99 Merge pull request #2379 from Robsteranium/patch-1 
guid default of "" never gets set to a secure random hex (in mysql at least)
 2011-12-02 10:47:24 -08:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Robsteranium
08b23d3a7f Condensed as per Daniel's comment 2011-12-02 12:17:24 +00:00
Sarah Mei
03f33f9313 Specify exclusion of fixture and performance separately 2011-11-30 22:14:24 -08:00
Sarah Mei
993b410d95 Fix default rake task so it runs the fixture-generation specs first explicitly. 2011-11-30 21:43:04 -08:00