danielvincent
|
b314ee22ec
|
intermediate misc ui polish
|
2010-10-07 22:51:08 -07:00 |
|
danielvincent
|
ed1cb5a0e7
|
DG MS; moved change password to account page; fixed the styling on password inputs
|
2010-10-07 18:52:46 -07:00 |
|
danielvincent
|
c756e1a331
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 18:17:38 -07:00 |
|
danielvincent
|
2e73104d6f
|
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
|
2010-10-07 18:17:26 -07:00 |
|
Raphael
|
399e437655
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 17:34:03 -07:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
Raphael
|
1d463d22a1
|
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
|
2010-10-07 16:50:19 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
6531a27594
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:22:14 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|
Raphael
|
6dbe429ed1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:02:37 -07:00 |
|
danielvincent
|
206e10f66a
|
dont put log behind devise
|
2010-10-07 14:57:00 -07:00 |
|
Raphael
|
9646a453a1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:34:57 -07:00 |
|
danielvincent
|
8f1973815e
|
DG MS; added route for exported xml
|
2010-10-07 14:21:53 -07:00 |
|
Raphael
|
9912769b5b
|
Merge remote branch 'guillei/s3_upload'
|
2010-10-07 14:17:43 -07:00 |
|
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
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -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 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -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
|
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 |
|
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 |
|
danielvincent
|
7c4feb7464
|
better log message
|
2010-10-05 17:34:03 -07:00 |
|
Raphael
|
5847e7767d
|
Add profile photo url to hcard parser
|
2010-10-05 17:24:01 -07:00 |
|
kook
|
85b384010e
|
exchange photos on adding new friend
|
2010-10-05 17:18:51 -07:00 |
|
danielvincent
|
c9d97d3233
|
render public with correct mime type
|
2010-10-05 17:15:00 -07:00 |
|
danielvincent
|
66ec5f0570
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:00:20 -07:00 |
|
danielvincent
|
830b3772d5
|
self reference in atom
|
2010-10-05 16:59:55 -07:00 |
|
Raphael
|
22f90086ca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:58:06 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
danielvincent
|
09b861c7a3
|
remove .atom from public url
|
2010-10-05 16:51:27 -07:00 |
|
danielvincent
|
6723a51149
|
correctly indent xml
|
2010-10-05 16:40:50 -07:00 |
|
danielvincent
|
4a8a21b95f
|
public fix
|
2010-10-05 16:28:01 -07:00 |
|
danielvincent
|
c284c9b07f
|
added public back into webfinger
|
2010-10-05 13:47:42 -07:00 |
|
danielvincent
|
33e478229e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:40:10 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
57b61f6827
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:00:54 -07:00 |
|
ilya
|
63cb7dcbdd
|
Fb friends are displayed only once
|
2010-10-05 13:00:42 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
ilya
|
ce4f8cab8b
|
not encrypting the entire thing
|
2010-10-03 17:39:16 -07:00 |
|
ilya
|
304e4ad32b
|
removed the puts
|
2010-10-02 12:37:53 -07:00 |
|