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 |
|
Jonne Haß
|
7aaaf4f43b
|
use guid instead of id for /people/ urls
|
2012-01-23 23:35:31 +01: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 |
|
Jonne Haß
|
ebfc3de878
|
do not require newrelic or airbrake unless they are configured
|
2012-01-22 15:38:55 +01:00 |
|
Maxwell Salzberg
|
e461956a97
|
allow custom app_name prefixes for newrelic
|
2012-01-20 12:25:05 -08:00 |
|
Steven Fuchs
|
9836860ca3
|
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
|
2012-01-20 12:23:45 -05: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 |
|
danielgrippi
|
5721c9e512
|
remove depricated methods
|
2012-01-18 13:29:43 -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 |
|
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 |
|
Steven Fuchs
|
36fd43db4c
|
incorporated improvements from @maxwell from last pull request.
|
2012-01-17 19:27:48 -05:00 |
|
danielgrippi
|
fdc0b681eb
|
remove unused api serializers (cruft)
|
2012-01-17 16:03:24 -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 |
|
danielgrippi
|
177f608276
|
fix oembed issues in backbone land
|
2012-01-15 15:56:34 -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 |
|
Maxwell Salzberg
|
b10eb9e56a
|
we do not need to require this file here. sorry about that
|
2012-01-14 01:12:16 -08: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 |
|
danielgrippi
|
240d595714
|
removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...)
|
2012-01-13 23:33:59 -08:00 |
|
Maxwell Salzberg
|
c45057bd94
|
update settings logic, and heroku rake task
|
2012-01-13 13:59:34 -08:00 |
|
Jonne Haß
|
0cc0b152d7
|
do not call .photo_count on a reshare etc.
|
2012-01-13 22:09:22 +01:00 |
|
danielgrippi
|
aed413b463
|
remove unused method and controller action (move_contact)
|
2012-01-13 12:15:32 -08:00 |
|
Maxwell Salzberg
|
408bafca09
|
add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up
|
2012-01-12 15:04:14 -08:00 |
|
danielgrippi
|
0e5bb81d66
|
remove all references to the websocket. bang bang.
|
2012-01-10 12:28:19 -08:00 |
|
danielgrippi
|
985657cbc3
|
pass in correct avatar sizes in person json response
|
2012-01-07 20:06:05 -08:00 |
|
danielgrippi
|
e928cc805a
|
fixed markdown issues with reshares; removed puts from specs
|
2012-01-07 17:33:16 -08:00 |
|
Dennis Collinson
|
daba42c857
|
mentions now render client side, wow
|
2012-01-07 14:24:28 -08:00 |
|
Dennis Collinson
|
b13e72bc00
|
spec fix for markdown
|
2012-01-07 14:24:28 -08:00 |
|
danielgrippi
|
dea21634a2
|
add raw_message method to Reshare
|
2012-01-07 14:24:27 -08:00 |
|
danielgrippi
|
0fb1bf5d4b
|
hash tags are linked on the front end, adding markdown.js file
|
2012-01-07 14:24:27 -08:00 |
|
danielgrippi
|
dbfb18e249
|
display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber
|
2012-01-07 14:23:27 -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
|
71bae10317
|
fixed notification specs; removed a cuke around reshares already tested in jasmine
|
2012-01-07 14:23:27 -08:00 |
|
danielgrippi
|
841cc29d25
|
add api block to photo; photos display in stream
|
2012-01-07 14:23:23 -08:00 |
|
danielgrippi
|
d9d878f11f
|
added api response for likes; cleaned up view logic; specify like collection url from parent model (Post)
|
2012-01-07 14:23:23 -08:00 |
|
danielgrippi
|
cd1d25dc30
|
remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts)
|
2012-01-07 14:23:22 -08:00 |
|
danielgrippi
|
cec2d27204
|
ported likes logic for the stream over from old branch
|
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
|
34e3403e2e
|
jasmine green again; template switching in place, defaulting to displaying post text
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
52e3f1b240
|
DC DG; test stream view WIP
|
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
|
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 |
|
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 |
|
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 |
|