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 |
|
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 |
|