maxwell
|
226d95ec2c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 19:15:26 -08:00 |
|
Raphael
|
837ad20045
|
unpend spec in aspects controller spec
|
2010-12-15 18:11:09 -08:00 |
|
maxwell
|
d5ba34f245
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 18:05:54 -08:00 |
|
Raphael
|
e881edab96
|
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
|
2010-12-15 18:05:18 -08:00 |
|
Raphael
|
3b727dc887
|
Add share_with fancybox on search page, fix a couple of queries
|
2010-12-15 17:45:12 -08:00 |
|
maxwell
|
8ec85d3b12
|
basic notifications
|
2010-12-15 17:31:36 -08:00 |
|
Raphael
|
b22398951e
|
Send requests from the aspect list on the person show page
|
2010-12-15 14:48:14 -08:00 |
|
Raphael
|
80a9b97f8d
|
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
|
2010-12-15 14:48:14 -08:00 |
|
danielvincent
|
f1ee32145d
|
Remove pending_requests from user, just use Request.from and Request.to.
|
2010-12-14 19:00:03 -08:00 |
|
danielvincent
|
b1c0facfe6
|
initiating a request now just creates a pending contact instead of persisting a request
|
2010-12-14 17:11:43 -08:00 |
|
Raphael
|
06b7b1c99a
|
WIP pending contacts
|
2010-12-14 17:11:42 -08:00 |
|
Raphael
|
e63a8a4bfa
|
Take contact.person query out of the views, only query people once in hashes_for_aspects
|
2010-12-14 12:11:36 -08:00 |
|
maxwell
|
502db347cc
|
removed homepage detail into a partial, which you should redefine
|
2010-12-13 12:52:23 -08:00 |
|
danielvincent
|
6f62161442
|
invitation emails stripped of whitespace from form
|
2010-12-10 18:10:24 -08:00 |
|
danielvincent
|
2c5d5d9328
|
show already invited users on invitation#new
|
2010-12-10 18:05:08 -08:00 |
|
maxwell
|
a4336a8e72
|
moar tests for services
|
2010-12-09 19:29:25 -08:00 |
|
maxwell
|
041e747db6
|
MSSM services are now broken out into seperate classes, and we cleaned up posting to them
|
2010-12-09 19:29:25 -08:00 |
|
Raphael
|
e406426b81
|
select only profile on most Person queries
|
2010-12-09 15:04:40 -08:00 |
|
maxwell
|
13740da9b9
|
fix for people controller where Person.search was returning a non-deterministic order of people
|
2010-12-09 14:37:07 -08:00 |
|
Raphael
|
3a4caca397
|
Fix photo uploading in profile photos, style photo upload button better
|
2010-12-09 13:06:31 -08:00 |
|
Raphael
|
b8589c457d
|
Refactor people edit page, now using form_tag
|
2010-12-09 13:03:30 -08:00 |
|
danielvincent
|
46793179db
|
people#show displays shows public posts for non-contacts as well
|
2010-12-08 16:53:24 -08:00 |
|
Raphael
|
18319f8e42
|
Hopefully cut down the stream rendering time by memoizing the new comment form
|
2010-12-07 09:28:11 -08:00 |
|
Raphael
|
f421f1327c
|
Take nested queried out of aspects manage
|
2010-12-07 00:21:05 -08:00 |
|
Raphael
|
9442553504
|
Refactor aspectscontroller and aspect_contacts.haml
|
2010-12-06 17:20:21 -08:00 |
|
Raphael
|
8a19e9f961
|
Fix spec
|
2010-12-06 13:56:40 -08:00 |
|
Raphael
|
32a2264af5
|
Refactor peoplecontroller index
|
2010-12-06 13:36:20 -08:00 |
|
Sarah Mei
|
ecc537c737
|
Stub Jobs::ReceiveSalmon.perform in controller test
|
2010-12-05 01:31:19 -08:00 |
|
maxwell
|
a415ff5c5f
|
fixed the build. made photos dependent destroy with parent status message
|
2010-12-05 00:45:13 -08:00 |
|
danielvincent
|
4c4f5c6aa4
|
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
|
2010-12-04 19:36:22 -08:00 |
|
Sarah Mei
|
c9f7866955
|
Random extra spec for people_controller
|
2010-12-04 18:13:15 -08:00 |
|
Michael Sofaer
|
3ca89bde57
|
Put photos create spec back in. I am not going to check who left it pending.
|
2010-12-04 17:18:08 -08:00 |
|
maxwell
|
7dce94814c
|
fixing the invite user job
|
2010-12-03 22:41:16 -08:00 |
|
maxwell
|
0a831cfbf4
|
invites are now on the queue
|
2010-12-03 19:33:54 -08:00 |
|
Raphael
|
3ee246d873
|
Merge branch 'resque-receive'
Conflicts:
Gemfile.lock
|
2010-12-02 19:42:05 -08:00 |
|
maxwell
|
579a288351
|
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
38d9d75162
|
posts now have public permalinks
|
2010-12-02 18:47:48 -08:00 |
|
danielvincent
|
756824d072
|
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
|
2010-12-02 18:42:21 -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
|
c76f38ca23
|
Write webfinger job for search
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
6cfa6577a5
|
Add first resque job
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
db0106f13c
|
Rename EMWebfinger to Webfinger, clean up some related things
|
2010-12-02 12:35:25 -08:00 |
|
Sarah Mei
|
ef89d49b1a
|
Revert "Added some specs for grammatical_gender (User model and Users controller)."
This reverts commit 1295417224.
|
2010-12-01 22:29:19 -08:00 |
|
Raphael
|
8d853a88a3
|
Remove some old views, clean up routes, clean up.
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
f0df1ec8df
|
Remove dev utilities controller
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
c07b9b1874
|
Fix rest of specs
|
2010-12-01 15:38:56 -08:00 |
|
maxwell
|
7fc9d239b9
|
you can no longer send a request to yourself at the Request model level
|
2010-12-01 11:37:54 -08:00 |
|
Paweł Wilk
|
1295417224
|
Added some specs for grammatical_gender (User model and Users controller).
|
2010-12-01 18:19:48 +01:00 |
|
Raphael
|
a520c756ea
|
Fix spec
|
2010-11-30 16:02:14 -08:00 |
|