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

10427 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
ff615848ca added active_reload to development gem group. HOLY CRAP. [ci skip] 2012-01-18 13:35:17 -08:00
danielgrippi
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -08:00
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -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
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
danielgrippi
a658552c3f fix stream helper for mobile 2012-01-17 19:21:36 -08:00
danielgrippi
880efd3e72 use '/reshare' instead of 'reshare/' to ensure the correct path (js) 2012-01-17 17:53:02 -08:00
danielgrippi
641ca9fdd2 we want to POST to /status_messages on Publisher submit 2012-01-17 17:46:49 -08:00
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
Maxwell Salzberg
30947778f9 remove stray api feature 2012-01-17 17:33:55 -08:00
Dennis Collinson
9cde06a628 You can now like "reshares", stream is polymorphic 2012-01-17 17:22:56 -08:00
Maxwell Salzberg
86c8f99188 update the .example, which unfortunatly i think will make travis happier and avoid some loading bs 2012-01-17 17:14:22 -08:00
danielgrippi
fdc0b681eb remove unused api serializers (cruft) 2012-01-17 16:03:24 -08:00
danielgrippi
b7ac77daa5 Merge branch 'consolidate-streams' 2012-01-17 15:53:16 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Dennis Schubert
e0a63e624f Fix my quick fix (use '.present?' instead of 'not .nil?') 2012-01-17 21:25:21 +01:00
Dennis Schubert
57697dea28 Quick fix: Fix 500 on /conversations when a author is missing. This is a temporary fix, see #2682 2012-01-17 21:10:45 +01: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
Dennis Collinson
66d71a217e you should be able to reshare reshares again, first pass 2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802 TT MS; fix a bug when the mention string is not actually in the mentions 2012-01-16 15:59:40 -08:00
Maxwell Salzberg
5d01904231 fix bookmarklet. fixes #2605 2012-01-16 14:36:21 -08:00
Maxwell Salzberg
efb05be072 MS TT; update Procfile to be aware of jd.com queue ordering; upgrade foreman 2012-01-16 13:42:02 -08:00
Jonne Haß
68fb01b2fd bump typhoeus timeout to 25 seconds too #2590 [ci skip] 2012-01-16 15:20:12 +01:00
danielgrippi
f698e303cb remove old cruise_config and pkg folder [ci skip] 2012-01-15 20:05:14 -08:00
danielgrippi
62b8e1c3e6 added a few more files to ignore for the slugignore [ci skip] 2012-01-15 20:04:46 -08:00
danielgrippi
231b650086 update gems [ci skip] 2012-01-15 19:55:27 -08:00
danielgrippi
8150d32b86 using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app 2012-01-15 18:28:58 -08:00
danielgrippi
f2cc8b4e41 Revert "move unicorn into the heroku group till we decide if we switch completly to it or not" 
This reverts commit 641cedf343.

Revert "Merge pull request #2663 from torrancew/with_unicorn"

This reverts commit 2a2efd097f, reversing
changes made to 78978f051e.
 2012-01-15 16:07:00 -08:00
danielgrippi
177f608276 fix oembed issues in backbone land 2012-01-15 15:56:34 -08:00
Jonne Haß
203607945b updated 12 locale files [ci skip] 2012-01-15 23:04:57 +01:00
Jonne Haß
641cedf343 move unicorn into the heroku group till we decide if we switch completly to it or not 2012-01-15 22:46:06 +01:00
Jonne Haß
17bd7eee13 remove stray dir [ci skip] 2012-01-15 15:10:55 +01:00
Jonne Haß
f1d18c6b52 move stray source graphic to his mates [ci skip] 2012-01-15 14:59:00 +01:00
Daniel Grippi
2a2efd097f Merge pull request #2663 from torrancew/with_unicorn 
Needz moar unicorns please [ci skip]
 2012-01-15 04:22:03 -08:00
Daniel Grippi
78978f051e Merge pull request #2667 from MrZYX/faraday_timeout 
set faradays timeout to 25 seconds [ci skip]
 2012-01-14 18:17:30 -08:00
Jonne Haß
bec3e2c92b set faradays timeout 25 2012-01-15 02:49:14 +01:00
danielgrippi
9d2b1e9415 actually clear photos from the publisher. also, i hate the photo uploader we're using. 2012-01-14 15:40:44 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
danielgrippi
84af585f87 rescue SocketError on UpdateServiceUser job when dev box is in single process mode and not connected to the internet 2012-01-14 15:40:43 -08:00
Jonne Haß
a07b742c85 remove old code from timeago widget 2012-01-14 23:58:34 +01:00
Jonne Haß
b382bdd3e3 load timeago 2012-01-14 23:29:28 +01:00
Jonne Haß
a482d90bf0 do the extra include of language helper for the vanna controller… 2012-01-14 21:59:49 +01:00
Jonne Haß
7e76c55f56 Merge branch 'master' of github.com:diaspora/diaspora 2012-01-14 21:26:54 +01:00