Daniel Grippi
b7f4f81d28
Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql
...
Explicitly specify order of comments, since we cannot assume MySQL orderi
2011-10-12 16:09:18 -07:00
Maxwell Salzberg
9fd1d7db63
updating gemfile and schema.rb
2011-10-11 16:53:37 -07:00
Maxwell Salzberg
cfb28db00f
wip, but the refactored code works
2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a
wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good.
2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f
Added oEmbed support
2011-10-11 16:08:47 -07:00
Pistos
15b3cce6ee
Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code).
...
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results. I removed the problem by removing #last_three_comments which
I consider a premature optimization.
2011-10-11 16:06:24 -04:00
Pistos
4774b670de
Whitespace cleanup.
2011-10-11 15:50:40 -04:00
Your Name
55ffc44a42
wip
2011-10-06 17:13:04 -07:00
Ilya Zhitomirskiy
d891e78652
refactored post receiving; only update cache on verfied received objects
2011-10-06 12:31:09 -07:00
Ilya Zhitomirskiy
c2bb483b21
dg iz updating authors cache on creation of a post
2011-10-04 17:40:44 -07:00
Ilya Zhitomirskiy
6ea540fb94
wip, adding to cache in receiver, caching is only triggered for receiving of posts
2011-10-04 10:32:17 -07:00
Maxwell Salzberg
8fa02584c0
fix a bug I introduced
2011-10-03 15:23:11 -07:00
Maxwell Salzberg
52bb5900a3
added shared behaviors for real
2011-10-03 15:23:10 -07:00
Maxwell Salzberg
9a4c478a7b
these spes are really green. too bad we need #moar
2011-10-03 15:23:10 -07:00
Maxwell Salzberg
ad9dcd8542
holy guacamole. mentions page and tag following pages, plus a huge stream refactor
2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502
added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer
2011-10-03 15:22:14 -07:00
Ilya Zhitomirskiy
27dcdf9a11
added an index to root_id
2011-09-30 11:35:07 -07:00
danielgrippi
e3bf03636b
pass in mobile as provider_display_name on posts if posting from mobile
2011-09-28 22:15:32 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Maxwell Salzberg
6b0507949c
updated salmon to let us not always encrypt the header
2011-09-12 14:05:31 -07:00
danielgrippi
293afd80ff
all_public scope in Post for clarity
2011-09-11 19:28:52 -07:00
danielgrippi
1d0bec11f7
Add counter cache for comments on posts
2011-09-11 15:02:24 -07:00
buddhamagnet
010024c4f9
continuing refactor of model validation calls to rails 3 syntax
2011-09-11 21:39:02 +01:00
Maxwell Salzberg
26151263c5
put receiving in a transaction, to prevent the crazy duplicate index errors and hopefully fix federation visibility.
2011-09-03 16:04:53 -07:00
Raphael Sofaer
8b743e7e3b
Fix stack level too deep error on reshares
2011-08-12 13:20:25 -07:00
Raphael Sofaer
a2043671ce
Move comment email subject line code into models
2011-08-11 10:46:15 -07:00
danielgrippi
aa3d626ada
validate instead of throwing a db error
2011-08-10 10:38:28 -07:00
Raphael Sofaer
78bced56bb
Reshares and reshare retractions are green.
2011-07-22 16:00:19 -07:00
danielgrippi
7b3180e5da
user can retract a reshared post
2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1
DG IZ reshare retractions is WIP
2011-07-21 18:22:17 -07:00
danielgrippi
67882c775e
Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable.
2011-07-11 15:06:35 -07:00
danielgrippi
d364f158b8
cache counters in for likes. pending Diaspora::Likeable module...
2011-07-11 15:05:55 -07:00
danielgrippi
2e15b6a61e
Likes in comments, cache counter disabled for now.
2011-07-11 15:00:48 -07:00
Raphael Sofaer
39ff51a9d7
Make comments index ajaxy
2011-07-11 14:03:59 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
danielgrippi
890dc7efd5
put some dependent destroys on models for better sqlite compatability
2011-06-19 23:39:57 +02:00
Raphael Sofaer
7171aa05ed
Do a little bit more documenting.
2011-06-13 16:31:40 -07:00
Raphael Sofaer
4815482354
Start some real docs
2011-06-13 16:12:32 -07:00
Raphael Sofaer
381b85189d
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
2011-06-03 16:22:38 -07:00
Raphael Sofaer
cc84051541
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
2011-05-23 14:54:27 -07:00
danielgrippi
6c31867345
check for AS object in partial hack
2011-05-19 12:40:05 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
847f4fd260
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
2011-04-05 18:53:10 -07:00
Raphael Sofaer
fdb6675f28
Make things more postgres compatible
2011-04-05 09:49:39 -07:00
MrZYX
4b7c9315c8
log error when receiving a post instead of letting the job fail with weired error later in the chain
2011-04-02 17:44:48 +02:00
danielgrippi
97d8b34599
Fix all specs, add foreign key constraints on post_visibility
2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91
8 failures left. wip.
2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5
Moving PostVisibility to aspects, WIP, model specs pass
2011-03-29 17:31:56 -07:00
MrZYX
c2a4c2157d
oh yeah it's delete_all on has_many, seems like I shouldn't code today…
2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad
dependent delete for likes
2011-03-28 17:54:07 +02:00
MrZYX
11b0a2c19d
dependent destroy for likes
2011-03-26 21:47:40 +01:00
Raphael Sofaer
b9af450628
Relayable retractions pretty much done
2011-03-25 16:09:37 -07:00
danielgrippi
c0ce0d71b8
Make pending specs green, I think there are still some to_jsons where there should be as_json
2011-03-25 15:06:22 -07:00
MrZYX
1b1a23aa8f
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
2011-03-20 18:10:58 +01:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
zhitomirskiyi
80a3a3446a
pulling in
2011-03-06 21:37:27 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
f4e6d0d82b
broke out some comment logic to a replayable module
2011-03-01 12:28:33 -08:00
Raphael Sofaer
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
zhitomirskiyi
97e00f9ee3
changed the delete to a destroy on retraction, also removed a puts
2011-02-23 12:00:42 -08:00
Raphael Sofaer
ff0f37ceea
eliminate one source of dup pvs
2011-02-11 18:25:57 -08:00
zhitomirskiyi
0e9fdeeab0
destroy
2011-02-10 19:55:30 -08:00
zhitomirskiyi
4033c19323
destroy_all so that the callbacks are called
2011-02-10 19:50:21 -08:00
Raphael Sofaer
7b3a2b07ee
Removed n-query, created mentions table
2011-02-09 16:07:25 -08:00
maxwell
a649d18cd7
add tests to see if timestamps are updated on recevie...they are not
2011-02-08 14:07:25 -08:00
zhitomirskiyi
e9e01e965e
fixed error with comments saving twice on the same pod
2011-01-24 17:24:29 -08:00
Raphael
e6e2ba9cfb
Take out default scopes
2011-01-18 16:46:52 -08:00
zhitomirskiyi
004094d66f
fixed the querying in the controllers got rid of hashes
2011-01-18 16:21:14 -08:00
zhitomirskiyi
c28b5a22fb
here you go
2011-01-17 18:03:15 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
maxwell
23de681cb8
DG MS moved receive methods to their respective models
2011-01-11 14:23:18 -08:00
maxwell
daab8e80ce
basic receive cleanup
2011-01-11 14:23:18 -08:00
maxwell
8819d288c4
i am greeen
2011-01-05 17:43:25 -08:00
zhitomirskiyi
11153cf2ca
a couple more passing specs
2010-12-27 22:23:41 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342
Status message spec now passes
2010-12-23 12:56:49 -08:00
Raphael
924bcca0e2
Isolated problem in status message marshalling, mysql
2010-12-22 21:34:45 -08:00
Raphael
baf0533466
logical failures on person spec, 25 failing model specs
2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58
58 failures with mysql
2010-12-21 17:14:52 -08:00
Raphael
319452537e
Below 70 failures, GUIDs are next
2010-12-21 15:46:15 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
Raphael
4c47d8334c
Add PostVisibility model, some more specs working
2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa
Down to 250 failures in mysql
2010-12-20 00:36:48 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60
WIP moving to mysql
2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff
post_spec now passes with mysql
2010-12-18 20:23:16 -08:00
Raphael
8798f05ff7
Revert "Revert redis merge to fix bugs on master"
...
This reverts commit 30698d674b .
2010-12-02 15:33:26 -08:00
Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
Raphael
db0106f13c
Rename EMWebfinger to Webfinger, clean up some related things
2010-12-02 12:35:25 -08:00
danielvincent
ce63e13eca
aspect ids normalized to posts to minimize queries on views.
2010-11-26 18:55:06 -05:00
maxwell
769c0e1055
DG MS trying to finish statusmessage refactor
2010-11-21 16:13:01 -08:00
maxwell
7fb751b00c
making photo uploader work better
2010-11-21 16:11:55 -08:00
maxwell
19bbf8ce4d
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
2010-11-02 12:38:30 -07:00
Raphael
9d273c6d24
Now expecting a 500 on someone passing an id to create, should really be a 422
2010-11-01 12:31:00 -07:00
danielvincent
5a9bfa7405
DG IZ; post senders are now verified by diaspora handles
2010-10-29 16:49:59 -07:00
Raphael
512f40eac2
attr_accessible on Post
2010-10-28 15:50:19 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c99 , reversing
changes made to 53fef63a9a .
Conflicts:
pkg/fedora/diaspora-setup
pkg/ubuntu/diaspora-setup
public/stylesheets/sass/application.sass
spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
maxwell
d61a227fc7
posts now serialize their created_at time
2010-10-14 16:49:08 -07:00
maxwell
0541833c18
stop the file include madness. using File.join and Rails.root for includes everywhere I could
2010-10-10 11:54:08 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
ilya
c2b84fd9c6
added a public key to post
2010-09-27 16:59:54 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Raphael
70a22ae839
Merge branch 'master' into HEAD
...
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
2010-09-24 09:15:10 -07:00
Patrick Aljord
182c6228f3
show comments ordered by created_at, they are showing up at random order without that
2010-09-18 07:36:21 +08:00
Raphael
c520fb71a7
Moved socket out to separate process. Multiple thins should now be possible
2010-09-16 21:34:15 -07:00
Michael Fellinger
35c9922c61
And fix some more requires
2010-09-16 15:24:26 +09:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
a44d40168a
Encryption removed from everything other than comments, most irrelevant specs removed
2010-09-10 16:04:09 -07:00
maxwell
804777f9ae
MS; updated to released rails
2010-09-07 16:47:53 -07:00
Daniel Vincent Grippi
5e34506df6
added custom as_json methods to models
2010-08-29 23:46:19 -07:00
Daniel Grippi
de8450c7c5
line spacing adjustments.
2010-08-29 23:04:28 -07:00
Raphael
55c94c385c
fixed photos going through the websocket. added a spec to SocketsController
2010-08-25 16:08:44 -07:00
Raphael
511f571ae5
Specs mostly pass again
2010-08-23 15:01:39 -07:00
maxwell
5d25861dc6
IZ MS person profile page now displays only posts a user can see
2010-08-19 10:46:47 -07:00
danielvincent
7e5ace7cbc
minor cleanup in models
2010-08-16 22:44:22 -07:00
ilya
74c70d9410
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc
DG IZ; post user refs started (permissions)
2010-08-16 18:11:23 -07:00
Raphael
eae4053902
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
2010-08-16 17:23:54 -07:00
Raphael
d8959326d5
RS, DG; unsocketing is back in
2010-08-11 16:24:05 -07:00
Raphael
2d14f64745
RS, DG; Socketing moved to user
2010-08-11 16:10:27 -07:00
Raphael
599d1da620
Moved socket code out to lib, unsocketing from view should now work again
2010-08-11 12:03:26 -07:00
Raphael
c14bb5a4f8
Changed info logging to debug logging almost everywhere
2010-08-09 14:39:37 -07:00
Raphael
33a827c33a
RS, DG; Websocket is now working again, users have a channel
2010-08-09 13:02:08 -07:00
Raphael
f2e327d908
User factory now works
2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4
Refactored message_queue getting, fixed retraction spec
2010-08-06 13:13:00 -07:00
Raphael
b5cbfab36e
RS, IZ; Comment spec now passes
2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4
MS DG; 19 failing specs left
2010-08-05 17:16:51 -07:00
Raphael
f487e271c0
RS, IZ; Posts now sign, signatures and keys now serialize
2010-08-05 10:43:02 -07:00
Raphael
9fe37b1d8c
RS, IZ; Cleaned up user spec, started to add current_user.post
2010-08-02 16:16:23 -07:00
maxwell
7a0db375ab
MS added rails 3rc
2010-07-29 09:59:03 -07:00
maxwell
b797704a14
MS small pointless webhooks refactor
2010-07-24 16:11:32 -07:00
maxwell
9095a06738
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
2010-07-24 01:56:07 -07:00
ilya
031234f763
Failing at syntax
2010-07-23 15:42:12 -07:00
ilya
bb251e73b3
Logging photo.inspect after save
2010-07-23 15:37:07 -07:00
Raphael
7d7c39e3dc
callbacks not running on photo save
2010-07-17 14:09:21 -07:00
Raphael
2d5d3a2f2d
commit more often
2010-07-15 13:29:21 -07:00
Raphael
f680c4b71e
RS, IZ; Signature Verification now stubbed out outside of encryption specs, green
2010-07-14 11:01:21 -07:00
ilya
4a0bd5fc0c
RS IZ; removed validations on marshaling and removed key deletion on person destroyw
2010-07-13 17:36:18 -07:00
ilya
d4d1aa0fd5
RS IZ validations of signature are now called on craeeton of a post
2010-07-13 14:34:30 -07:00
ilya
964ee65b11
rs iz ; the signature of the signable_accessors are now in the xml
2010-07-13 12:21:11 -07:00
ilya
add9961ca4
Now signing only xml accessors other than person
2010-07-13 11:41:57 -07:00
ilya
7952385cdb
added newlines to post
2010-07-13 11:24:57 -07:00
ilya
25940cf567
Removed stray puts
2010-07-13 11:12:49 -07:00
ilya
a219801c2d
Now using detached signatures
2010-07-13 11:10:04 -07:00
ilya
6d431e9459
signing tests sort of almost done
2010-07-13 11:01:27 -07:00