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 |
|
Florian Staudacher
|
e6b403434f
|
some restructuring around oembed providers
|
2012-03-15 18:34:47 +01:00 |
|
Maxwell Salzberg
|
db0859a83c
|
bug fix: you can now mention and post a photo at the same time
|
2012-03-07 14:42:46 -08:00 |
|
Maxwell Salzberg
|
bd021bbd91
|
Correct our general exception handling.
thanks @mperham! see: http://t.co/Jyt7vV4I
|
2012-03-03 16:26:06 -08:00 |
|
Daniel Grippi
|
7a774661bb
|
Merge pull request #2777 from stwf/tweak-twitter-truncation
take url shortening into effect before truncating twitter posts
|
2012-02-29 22:49:46 -08:00 |
|
Maxwell Salzberg
|
d80afc64ec
|
fix ordering for logged out users
|
2012-02-27 19:16:05 -08:00 |
|
danielgrippi
|
0112285985
|
Merge branch 'master' into profiles
Conflicts:
lib/diaspora/shareable.rb
|
2012-02-27 14:27:05 -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 |
|
Maxwell Salzberg
|
a1f39398be
|
Merge pull request #2902 from JMSilla/master
Fix atom feed bug (bug mash 7) [ci skip]
|
2012-02-25 16:47:13 -08:00 |
|
JMSilla
|
8178e0712c
|
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
|
2012-02-25 22:24:43 +00:00 |
|
Dennis Collinson
|
b28508ecbc
|
MS DC show last post and show page works unauthenticated
phasing out app.user() for app.currentUser
|
2012-02-24 19:09:00 -08:00 |
|
Maxwell Salzberg
|
7755c254fb
|
some basic tests for post presenter; added user.reshare!
|
2012-02-21 21:56:11 -08:00 |
|
danielgrippi
|
ca8f136cec
|
fixed back/forward
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
30de08b340
|
fix post presenter / arrow ordering
|
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 |
|
Maxwell Salzberg
|
aa3ffbea7f
|
log to the logger, not to the rails module
|
2012-02-21 13:27:17 -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 |
|
Maxwell Salzberg
|
063912287c
|
use the user presenter, luke
|
2012-02-16 13:19:14 -08:00 |
|
Maxwell Salzberg
|
b2e9e47b38
|
fix for federating profile pictures [ci skip]
|
2012-02-14 10:39:41 -08:00 |
|
danielgrippi
|
32f93a0391
|
you can now follow / unfollow a post from the stream; fixed cukes.
|
2012-02-13 19:13:43 -08:00 |
|
Maxwell Salzberg
|
7a565b051d
|
added some methods to make it easier to figure out how many active users a pod has
|
2012-02-13 16:56:25 -08:00 |
|
Maxwell Salzberg
|
232e620637
|
make posts have empty photos so reshared stop messing up
|
2012-02-10 13:45:41 -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 |
|
Dennis Collinson
|
9e1816dc12
|
Participations are a federated, relayable model :)
|
2012-02-09 19:01:00 -08:00 |
|
danielgrippi
|
2b15bc7938
|
fix syntax in comment.rb
|
2012-02-09 18:29:52 -08:00 |
|
danielgrippi
|
7a5838a363
|
allow comments to be 65535 chars long (as opposed to 2500)
|
2012-02-09 18:26:20 -08:00 |
|
Diaspora Europe
|
8eda9aaf52
|
added user_is_following method, added 2 model specs
|
2012-02-09 14:17:43 +01:00 |
|
danielgrippi
|
a819f38b99
|
touch interacted_at on Post#after_create
|
2012-02-07 21:32:10 -08:00 |
|
Dennis Collinson
|
8ae18bb393
|
nsfw's users posts are now nsfw
|
2012-02-07 19:14:44 -08:00 |
|
Dennis Collinson
|
558ceec92a
|
a user can mark themselves as nsfw
|
2012-02-07 19:03:20 -08:00 |
|
Maxwell Salzberg
|
7d325cb29b
|
sad fix for stupid app config problem in development [ci skip]
|
2012-02-07 13:41:03 -08:00 |
|
Dennis Collinson
|
ff1cbb48cc
|
remove excess call to appconfi#setup
|
2012-02-06 17:42:01 -08:00 |
|
danielgrippi
|
de757db48b
|
fix ruby reshare model; extract sortOrder in app.models.Stream.
|
2012-02-06 08:26:11 -08:00 |
|
danielgrippi
|
fa5424653a
|
fix markup display on reshares. DERP. [ci skip]
|
2012-02-06 08:02:27 -08:00 |
|
Dennis Collinson
|
354ed7ef05
|
paginating participate stream
|
2012-02-03 17:55:06 -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 |
|
danielgrippi
|
a3e13e3c0e
|
User#like! method.
|
2012-02-03 14:42:03 -08:00 |
|
Dennis Collective
|
6dbd644b01
|
Merge pull request #2719 from stwf/return-contact-popup-to-notify
aspects popup menu missing from 'started sharing' notifications
|
2012-02-03 00:42:10 -08:00 |
|
danielgrippi
|
4f7dda6012
|
bang! kill redis cache.
|
2012-02-02 12:45:43 -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
|
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 |
|
Jonne Haß
|
7a8bd7595b
|
do not auto follow back if already sharing
|
2012-01-31 14:34:09 +01:00 |
|
Steven Fuchs
|
5ea4bc0a1b
|
Merge remote branch 'upstream/master' into return-contact-popup-to-notify
|
2012-01-29 18:13:30 -05:00 |
|
Steven Fuchs
|
5d15fa43b5
|
take url shortening into effect before truncating twitter posts
|
2012-01-29 17:42:17 -05:00 |
|
Sarah Mei
|
7d4a81560d
|
Move contact pagination to controller - fixes #2760
|
2012-01-27 21:56:27 -08:00 |
|
danielgrippi
|
8529293eee
|
resque deals with stringified hashes, not symbolized ones [ci skip]
|
2012-01-27 16:48:28 -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
|
46da8310f5
|
small styling changes
|
2012-01-27 02:23:37 -08:00 |
|
Maxwell Salzberg
|
cc5334ce9a
|
make this scary join a scope [ci skip]
|
2012-01-27 02:23:37 -08:00 |
|
Maxwell Salzberg
|
117acdd17f
|
move mention regex to a constant in mention
|
2012-01-27 02:23:37 -08:00 |
|
Maxwell Salzberg
|
718c4fd38c
|
refactor status_message_controller#create to suck less. it still sucks
|
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 |
|
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 |
|
Steven Fuchs
|
d8f2e73ea2
|
refer to model for target value, not set attributes.
|
2012-01-23 12:05:43 -05: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 |
|