danielvincent
|
d6bb5291bc
|
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
|
2010-12-13 17:16:56 -08:00 |
|
Raphael
|
02d76441e4
|
Merge branch 'aspect-list-on-profile'
|
2010-12-13 16:12:29 -08:00 |
|
Raphael
|
baa04ceac7
|
Add aspect list to contact page
|
2010-12-13 15:58:08 -08:00 |
|
mblog
|
d0355fdd43
|
Feature #348: Change Email
|
2010-12-13 22:14:52 +01: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
|
c774685d52
|
users can now disable email notfications
|
2010-12-10 11:47:10 -08:00 |
|
danielvincent
|
5731f32cfe
|
add correct page titles
|
2010-12-09 20:09:20 -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
|
2be0666d80
|
Remove query from aspects manage, correct spec in User spec
|
2010-12-09 19:11:47 -08:00 |
|
Raphael
|
e406426b81
|
select only profile on most Person queries
|
2010-12-09 15:04:40 -08:00 |
|
maxwell
|
b54a72c240
|
Revert "Revert "fixed commenting bug on current user's profile page""
This reverts commit 166202d0b2.
|
2010-12-09 13:57:43 -08:00 |
|
maxwell
|
166202d0b2
|
Revert "fixed commenting bug on current user's profile page"
This reverts commit 8264c58e3e.
|
2010-12-09 13:53:23 -08:00 |
|
danielvincent
|
8264c58e3e
|
fixed commenting bug on current user's profile page
|
2010-12-09 13:42:11 -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
|
cdd225c076
|
don't show new comment form on a non-contact's post
|
2010-12-08 18:23:30 -08:00 |
|
danielvincent
|
46793179db
|
people#show displays shows public posts for non-contacts as well
|
2010-12-08 16:53:24 -08:00 |
|
maxwell
|
d6c5a88836
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-08 14:34:31 -08:00 |
|
maxwell
|
1f8f07f48d
|
added slightly better error message on aspect update failure
|
2010-12-08 14:21:14 -08:00 |
|
maxwell
|
3dbb80bf9f
|
added slightly better error message on aspect update failure
|
2010-12-08 14:14:49 -08:00 |
|
Hexagon
|
80c5c5c9f5
|
Cleaning up revert of #619 pull
|
2010-12-07 22:20:26 +01: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
|
32a2264af5
|
Refactor peoplecontroller index
|
2010-12-06 13:36:20 -08:00 |
|
Raphael
|
3ef5ac5252
|
Add some specs to Invitation, use I18n in InvitationsController
|
2010-12-05 14:37:43 -08:00 |
|
MrZYX
|
4df13d56e1
|
made that latest change translatable
|
2010-12-05 16:02:52 +01:00 |
|
maxwell
|
53b38a3bca
|
fixing p-controller for real
|
2010-12-05 00:52:45 -08:00 |
|
maxwell
|
65c22020e8
|
fixing photo controllers spec
|
2010-12-05 00:45:13 -08:00 |
|
maxwell
|
2c09c35425
|
MS DG photos now delete sm if they are empty status messages, and status messages delete their photos
|
2010-12-05 00:45:13 -08:00 |
|
maxwell
|
0a8af9e72b
|
DG MS some fixes for getting started
|
2010-12-04 23:05:47 -08:00 |
|
Michael Sofaer
|
9e575ea765
|
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
|
2010-12-04 19:36:22 -08:00 |
|
Sarah Mei
|
fea6884acc
|
Mobile homepage looks decent.
|
2010-12-04 19:30:14 -08:00 |
|
maxwell
|
e47730b63f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 17:39:19 -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
|
b9ab799569
|
ironing out invites
|
2010-12-04 16:49:45 -08:00 |
|
maxwell
|
b300adbef5
|
fixed a potentially bad bug with nil invite tokens
|
2010-12-04 16:13:44 -08:00 |
|
maxwell
|
8306cfffde
|
add token back to invite form
|
2010-12-04 16:03:35 -08:00 |
|
danielvincent
|
177cc16e2f
|
fixed the build
|
2010-12-04 14:26:13 -08:00 |
|
danielvincent
|
34a1a35bf1
|
skip getting started is not ajaxy
|
2010-12-04 12:06: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 |
|
maxwell
|
b8ece9381a
|
fixing up public image show
|
2010-12-03 15:48:27 -08:00 |
|
maxwell
|
c43077d318
|
fixed twitter, added logging for constants, added job for local recieve
|
2010-12-03 11:34:42 -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
|
11f04a060e
|
frustrated
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
b9131c0e46
|
pushing to my website for further debugging
|
2010-12-02 18:47:48 -08:00 |
|
maxwell
|
38d9d75162
|
posts now have public permalinks
|
2010-12-02 18:47:48 -08:00 |
|
maxwell
|
2fbf2ddd6f
|
you dont have a pending request from everyone
|
2010-12-02 16:09:55 -08:00 |
|