Commit graph

2225 commits

Author SHA1 Message Date
danielvincent
4f17eb4e02 stray aspect name removed from publisher 2010-09-23 20:33:34 -07:00
ilya
a6c1ff8ce2 fixed the deploy scripts 2010-09-23 20:21:17 -07:00
ilya
a594c9a34f friends in the public bucket 2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
ilya
796f198d8c notification only on user page 2010-09-23 17:20:55 -07:00
ilya
11dc225311 removed the old publish box 2010-09-23 17:19:43 -07:00
ilya
75e1ddf9d2 saying going to FB in public aspect 2010-09-23 17:17:18 -07:00
ilya
0d71a1896c posting to FB from public now works 2010-09-23 17:11:42 -07:00
ilya
107fb58917 added a logger statement 2010-09-23 17:04:27 -07:00
ilya
d7833c66b2 typo 2010-09-23 16:48:58 -07:00
ilya
4d2bd52310 public aspect param on statusMessage create and in the partial 2010-09-23 16:41:05 -07:00
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
fc2cf4fde6 typo 2010-09-23 15:21:15 -07:00
ilya
1fdbc637d1 trying profile pictures on remote 2010-09-23 15:18:29 -07:00
ilya
19c3a5ce4b fetching friend data 2010-09-23 15:07:07 -07:00
ilya
f0999628ae trying to get friends from fb 2010-09-23 14:43:08 -07:00
ilya
5857838a0a adding the new files 2010-09-23 12:29:00 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
7303212784 DG IZ; haml typo 2010-09-22 17:50:47 -07:00
danielvincent
fc0350e4e1 DG IZ; user can post a status update from user edit page to facebook. 2010-09-22 17:49:11 -07:00
danielvincent
0c2480c9be DG IZ; quick form in user edit 2010-09-22 17:34:57 -07:00
danielvincent
bc70ebdb95 DG IZ; quick form in user edit 2010-09-22 17:33:57 -07:00
danielvincent
ae58120deb another typo... 2010-09-22 17:18:46 -07:00
danielvincent
ddbde60e8c another indent... 2010-09-22 17:17:24 -07:00
danielvincent
aef3c8d7bb indent, whoops 2010-09-22 17:16:16 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
danielvincent
53c0aff23d deploy from the right branch 2010-09-22 16:34:42 -07:00
danielvincent
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
	config/routes.rb
2010-09-22 16:09:25 -07:00
Raphael
5fad23c632 Adjust readme wording 2010-09-22 15:53:40 -07:00
Raphael
33317aeeaf Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 15:53:23 -07:00
Raphael
40afef0763 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	README.md
2010-09-22 15:52:16 -07:00
danielvincent
16ef43df09 Merge branch 'reposting' of github.com:diaspora/diaspora 2010-09-22 15:50:09 -07:00
danielvincent
4d25fea75e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 15:49:56 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
Raphael
486b9e8bbe Merge branch 'master' into HEAD
Conflicts:
	README.md
2010-09-22 15:42:46 -07:00
Pistos
d0dbcd47fc Added a newline after headings where it was missing. 2010-09-23 06:36:55 +08:00
danielvincent
955d9130a2 DG IZ; shift+enter in publisher box submits contents 2010-09-22 15:35:23 -07:00
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
Raphael
b03c90f6f2 Merge branch 'master' of git://github.com/tkrehbiel/diaspora 2010-09-22 15:32:02 -07:00
Raphael
695e5fe396 Don't log huge encrypted params 2010-09-22 15:19:26 -07:00
root
ae8c35c352 Merge remote branch 'origin/master' 2010-09-22 18:18:48 -04:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
474cf77708 DG IZ; reposting now works. redirects to a template missing page, though. 2010-09-22 15:05:51 -07:00
Thomas Krehbiel
de90923631 Fix for sending unlimited duplicate friend requests 2010-09-22 18:05:11 -04:00
root
aaa4d75a5e Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-22 16:41:43 -04:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00