Raphael
|
40120bb441
|
Moving to activemodel validations
|
2010-09-24 11:15:39 -07:00 |
|
ilya
|
82b99decbb
|
putting the token in the warden session
|
2010-09-24 10:45:27 -07:00 |
|
Raphael
|
b9bff76054
|
Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes
|
2010-09-24 09:49:42 -07: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 |
|
Pistos
|
7dc813a15a
|
Added a newline before a list, so that the list can be properly interpreted as a list (Markdown syntax).
|
2010-09-24 11:48:34 +08:00 |
|
Pistos
|
86f462cc42
|
Strip trailing whitespace.
|
2010-09-24 11:48:34 +08:00 |
|
ilya
|
755ccc084f
|
Merge branch 'fb' of github.com:diaspora/diaspora into fb
|
2010-09-23 20:38:59 -07:00 |
|
ilya
|
deea03bf82
|
deploy restart after db:reset since we need the new app_config.yml
|
2010-09-23 20:38:39 -07:00 |
|
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 |
|
Raphael
|
16b6fc6cdc
|
Don't give exception on webfinger with no query
|
2010-09-23 17:18:34 -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 |
|
Raphael
|
d748d456b5
|
Revert "fix in person partial"
This reverts commit 8c0bc4b9e6.
|
2010-09-23 16:21:08 -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 |
|
Raphael
|
264555e63b
|
Update css
|
2010-09-23 15:15:19 -07:00 |
|
Raphael
|
c6c361b5e6
|
Add lucida sans, thanks danieleds
|
2010-09-23 15:14:44 -07:00 |
|
ilya
|
19c3a5ce4b
|
fetching friend data
|
2010-09-23 15:07:07 -07:00 |
|
Raphael
|
8690967509
|
defaults doesn't really make sense when there's nothing else
|
2010-09-23 14:58:17 -07:00 |
|
Raphael
|
972cb54828
|
Move locale files, fix syntax error in fr-informal
|
2010-09-23 14:52:06 -07:00 |
|
Raphael
|
82bc5b097d
|
Use double quotes in locale files
|
2010-09-23 14:43:38 -07:00 |
|
ilya
|
f0999628ae
|
trying to get friends from fb
|
2010-09-23 14:43:08 -07:00 |
|
Guido Serra aka Zeph
|
d9688324f8
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2010-09-23 23:30:22 +02:00 |
|
Raphael
|
efedac7e32
|
Punctuate
|
2010-09-23 14:27:23 -07:00 |
|
Raphael
|
86c70b9698
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 14:26:37 -07:00 |
|
Raphael
|
e3c6926cf7
|
Moving installation instructions to a wiki page
|
2010-09-23 14:26:23 -07:00 |
|
UserAd
|
cfd3523030
|
Stupid error fix
|
2010-09-24 05:02:30 +08:00 |
|
UserAd
|
7a9e347b28
|
Improved russian locale
|
2010-09-24 05:02:30 +08:00 |
|
Maël Soucaze
|
49162a6ead
|
The underscore (fr_informal) is replaced by the hyphen (fr-informal).
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
4cd83f9ae9
|
Change the file organization, and Casual Honorifics is now Informal Honorifics.
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
d7eb828064
|
Language fix.
|
2010-09-24 04:51:48 +08:00 |
|
Maël Soucaze
|
c243304c97
|
Welcome to the French Casual Honorifics localization thanks to the brainchild of michael-k!
|
2010-09-24 04:51:03 +08:00 |
|
Raphael
|
cadcb81583
|
Gems we don't actually need...
|
2010-09-23 12:33:27 -07:00 |
|
ilya
|
c31489b42b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 12:31:40 -07:00 |
|
ilya
|
04e670f0d0
|
deploy script now uses public url
|
2010-09-23 12:31:19 -07:00 |
|
ilya
|
5857838a0a
|
adding the new files
|
2010-09-23 12:29:00 -07:00 |
|
Raphael
|
3381c46050
|
Revert "mongodb now in Fedora repos."
This reverts commit d55c0ae551.
|
2010-09-23 12:21:05 -07:00 |
|
Raphael
|
cfe019d7a9
|
Take out async controller until we actually put it in the app
|
2010-09-23 12:19:28 -07:00 |
|
ilya
|
48c212c1ab
|
made a public view, copied the fb publisher there
|
2010-09-23 12:18:26 -07:00 |
|
Guido Serra aka Zeph
|
c889fcb592
|
merge a culo
|
2010-09-23 20:55:57 +02:00 |
|