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 |
|
maxwell
|
23e9520a9e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-22 11:33:26 -07:00 |
|
danielvincent
|
8941975224
|
DG IZ; example extension convention for app_config
|
2010-09-22 10:59:23 -07:00 |
|
danielvincent
|
6dd7911c8c
|
DG IZ; update_or_repost
|
2010-09-22 10:52:29 -07:00 |
|
Raphael
|
7049cb3ca4
|
A less efficient, but simpler way of checking whether the photo is the profile photo
|
2010-09-22 10:31:40 -07:00 |
|
Diógenes
|
c87ad060ab
|
Add translation (from English locale) to Brazilian Portuguese
|
2010-09-23 01:15:10 +08:00 |
|
danielvincent
|
432b7d532d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-22 00:31:30 -07:00 |
|
ilya
|
6bd22034b7
|
typo in user
|
2010-09-21 21:45:29 -07:00 |
|
maxwell
|
63ed6a3a95
|
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
|
2010-09-21 21:31:53 -07:00 |
|
danielvincent
|
4c0dc58458
|
spec cleanup
|
2010-09-21 20:02:37 -07:00 |
|
ilya
|
dc0bd363a1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 20:02:13 -07:00 |
|
ilya
|
6d6ca3d8bc
|
added terse_pod_url to the APP_CONFIG hash
|
2010-09-21 20:01:56 -07:00 |
|
danielvincent
|
0323024fca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 18:14:54 -07:00 |
|
danielvincent
|
df5b7d6d84
|
DG MS; new function in post
|
2010-09-21 18:14:46 -07:00 |
|
ilya
|
d60dc03d35
|
removed app_config from repo
|
2010-09-21 18:10:26 -07:00 |
|
ilya
|
96aaf3093c
|
Make load_app_config more robust, point to the right folder in db seed
|
2010-09-21 18:04:36 -07:00 |
|
ilya
|
662071be08
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 17:52:57 -07:00 |
|
ilya
|
b01928af4b
|
RS IZ if yaml fails to load (empty config) file load the example
|
2010-09-21 17:52:23 -07:00 |
|
danielvincent
|
c4a86e031d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 17:43:54 -07:00 |
|
danielvincent
|
4a3bfea1ba
|
DG MS; cleaned spec
|
2010-09-21 17:43:46 -07:00 |
|