Raphael
|
ec9e180eab
|
Merge branch 'master' into HEAD
Conflicts:
public/stylesheets/application.css
|
2010-10-07 13:58:06 -07:00 |
|
Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
e26ad0bdf8
|
topic branch
|
2010-10-07 11:38:07 -07:00 |
|
Raphael
|
4ecf4213f0
|
Merge remote branch 'jbhannah/master'
|
2010-10-07 11:08:39 -07:00 |
|
Raphael
|
e47aa90b15
|
Merge remote branch 'Stigjb/master'
|
2010-10-07 11:06:27 -07:00 |
|
Raphael
|
6ae6d20e4f
|
Merge remote branch 'crimer/master'
|
2010-10-07 10:57:51 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
Raphael
|
0831812e97
|
Merge remote branch 'kashif/master'
|
2010-10-07 10:41:50 -07:00 |
|
Raphael
|
f078bd0a54
|
Merge remote branch 'leamas/perm-fix'
|
2010-10-07 10:09:29 -07:00 |
|
Raphael
|
67fc01aa36
|
Send friend_acceptances correctly
|
2010-10-07 09:49:34 -07:00 |
|
Raphael
|
b6a3549693
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 09:37:00 -07:00 |
|
Crimer
|
56ed245db0
|
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
|
2010-10-07 14:29:17 +00:00 |
|
Alec Leamas
|
0d51af0a13
|
Removing shebang on non-script.
|
2010-10-07 16:11:43 +02:00 |
|
Alec Leamas
|
e9252e8aec
|
After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png
|
2010-10-07 14:59:13 +02:00 |
|
ilya
|
bb6866fa0f
|
removed depricated non-encrypted author info fields from salmon
|
2010-10-06 23:20:28 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -07:00 |
|
Raphael
|
c74f210464
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:39:12 -07:00 |
|
maxwell
|
8bb454f824
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:38:51 -07:00 |
|
maxwell
|
0fb091ebbc
|
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
|
2010-10-06 18:38:37 -07:00 |
|
danielvincent
|
ee4c197b89
|
fixed hcard finder on image
|
2010-10-06 18:32:56 -07:00 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
Raphael
|
a315b489f1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:19:38 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
Raphael
|
582b323a7c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 21:05:13 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
91bbd607e6
|
user avatar in public feed activity:subject
|
2010-10-05 20:27:33 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
danielvincent
|
d519e46f4d
|
webfinger edit
|
2010-10-05 19:01:04 -07:00 |
|
danielvincent
|
fc31eb405d
|
removing logging messages
|
2010-10-05 18:34:56 -07:00 |
|
danielvincent
|
7f652eb81c
|
more logging
|
2010-10-05 18:03:17 -07:00 |
|
danielvincent
|
57e47e5a68
|
removed excess dumb. pubsub should work now
|
2010-10-05 17:58:56 -07:00 |
|
Raphael
|
caffd8f9ff
|
Don't check for servers that aren't there
|
2010-10-05 17:58:48 -07:00 |
|
danielvincent
|
cc01345edd
|
debug statements
|
2010-10-05 17:56:13 -07:00 |
|
danielvincent
|
d08d7c3a1b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:52:28 -07:00 |
|
danielvincent
|
a063207a0a
|
logger instead of debug
|
2010-10-05 17:52:21 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|
maxwell
|
d638bdb018
|
MS IZ password change field is now in edit profile
|
2010-10-05 17:49:06 -07:00 |
|
Raphael
|
79f19b6870
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:46:25 -07:00 |
|
Raphael
|
de9cdfbe7b
|
Always set the FACEBOOK constant
|
2010-10-05 17:46:14 -07:00 |
|
danielvincent
|
d890b57b13
|
temp logger message
|
2010-10-05 17:45:35 -07:00 |
|
danielvincent
|
9d5a99efc8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:34:09 -07:00 |
|
danielvincent
|
7c4feb7464
|
better log message
|
2010-10-05 17:34:03 -07:00 |
|
Yaron Shahrabani
|
77d5b68e15
|
Fixed some typos
|
2010-10-06 08:29:58 +08:00 |
|
Stoyan Gaydarov
|
dbacff250a
|
added extra user spec
|
2010-10-06 08:27:25 +08:00 |
|
Stoyan Gaydarov
|
9eb8fe0c5a
|
use the correct pod url in the user spec
|
2010-10-06 08:27:25 +08:00 |
|
danielvincent
|
e01eedef95
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:26:41 -07:00 |
|
danielvincent
|
0e8b84fb96
|
publish instead of get
|
2010-10-05 17:26:26 -07:00 |
|
Daniele Di Sarli
|
5074d2f8f2
|
Updated Italian translation
|
2010-10-06 08:25:29 +08:00 |
|