Commit graph

2785 commits

Author SHA1 Message Date
Sarah Mei
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -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
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -08:00
danielgrippi
f250b79105 post owners can now delete any comments on their own posts. fixes #2652 2012-01-27 18:24:46 -08: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
410f2d436f fix jasmine 2012-01-27 16:09:45 -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
c69df0fb29 fix photos controller test 2012-01-27 13:06:27 -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
danielgrippi
a3d596a853 DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests. 2012-01-26 18:51:02 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Jonne Haß
e1658f8d8b switch PhotosController#index over to guid, fix #2729 2012-01-25 12:45:02 +01: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
eaed3505e4 Don't create share_visibilities for public posts, sans migration of deleting old data. 2012-01-24 16:49:07 -08:00
Jonne Haß
100625d18c fix people and person specs for the guid stuff on psql 2012-01-24 23:02:07 +01:00
Daniel Grippi
89472992cc Merge pull request #2720 from MrZYX/people_slash_guid
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Jonne Haß
6f283632c5 fix resharing a reshare, javascript isn't ruby :P 2012-01-24 19:44:45 +01:00
Jonne Haß
19785d909b ensure services is an array in StatusMessagesController#create
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
2012-01-24 18:54:36 +01:00
Jonne Haß
51d1bbbd70 app.user returns false instead of undefined if logged out, fix #2723 2012-01-24 11:56:48 +01:00
Dennis Collinson
870ad3d9f7 DC DG; some fixes, mentioning works. 2012-01-23 19:32:15 -08:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
danielgrippi
3a76490640 window.app.user() doesn't return attributes nested in a key; added a comment_view spec 2012-01-22 23:37:13 -08:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
danielgrippi
5d15c53f6b Revert "Revert "now using handlebars for client side templates" for now"
This reverts commit 5f9c469b12.
2012-01-22 22:01:57 -08:00
Dennis Collinson
5f9c469b12 Revert "now using handlebars for client side templates" for now
This reverts commit 4692055d8a.
2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a now using handlebars for client side templates 2012-01-22 16:59:44 -08:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
Sarah Mei
872a96dc71 Refactor services controller spec 2012-01-22 08:28:23 -08:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
danielgrippi
cc1ac843cc re-added widget; fixed tests; use _.throttle instead of depricated custom debounce 2012-01-21 20:23:00 -08:00
danielgrippi
c3b9bb9a9a expanding likes works again 2012-01-21 18:55:07 -08:00
danielgrippi
9e3521396d clear new comment on submit; include the newer autoexpander in jasmine 2012-01-20 21:58:07 -08:00
danielgrippi
25d0f0d87f updated jquery autoResize; comment boxes now expand 2012-01-20 21:45:55 -08:00
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
356494b78b DG DC; $("window") doesn't actually work in the binding scenario 2012-01-19 17:16:58 -08:00
danielgrippi
750e26e8fb Merge branch 'stream-js-cleanup'
Conflicts:
	public/javascripts/app/models/stream.js
2012-01-19 17:07:17 -08:00
danielgrippi
b583a7a444 Put dennis's changes back in
Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd52.

Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0ebd4.
2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
0ce0e47ff8 fix #2698; allow a user to delete a reshare of a deleted post 2012-01-19 15:24:07 -08:00
Maxwell Salzberg
838da1fd52 Revert "refactoring backbone urls"
This reverts commit 4ad58bdf2f.
2012-01-19 14:20:31 -08:00
Maxwell Salzberg
2a69c0ebd4 revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection) 2012-01-19 11:18:13 -08:00
Dennis Collinson
9b1d64bb76 stream model has a posts collection 2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f refactoring backbone urls 2012-01-18 19:08:36 -08:00
danielgrippi
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -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
392e317962 fix person spec 2012-01-17 22:10:03 -08:00
Maxwell Salzberg
bfde0514bf fix webfinger specs 2012-01-17 21:43:46 -08:00
Maxwell Salzberg
22bd70664f fix post spec 2012-01-17 21:12:47 -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