danielvincent
|
c9d97d3233
|
render public with correct mime type
|
2010-10-05 17:15:00 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
danielvincent
|
bf15514bc9
|
redirect users#public to root_url if user does not exist.
|
2010-09-28 10:23:03 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
Raphael
|
12bd0f2301
|
Merge branch 'master' of http://github.com/uiri/diaspora
|
2010-09-27 14:48:11 -07:00 |
|
Raphael
|
ce0accafbb
|
Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303
|
2010-09-27 11:03:48 -07:00 |
|
Uiri
|
151a57cc93
|
well, that explains why it was adding the url variable. Fixed so that now new pictures work too.
|
2010-09-26 11:47:34 -04:00 |
|
Uiri
|
e8d6fb26e7
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2010-09-25 18:30:15 -04:00 |
|
Uiri
|
0b19b77b5f
|
A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel
|
2010-09-25 17:34:13 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
f4d18ce9bc
|
don't use request.host as data
|
2010-09-24 17:12:18 -07:00 |
|
danielvincent
|
fcc681df71
|
DG IZ moved to be APP_CONFIG for host
|
2010-09-22 16:32:52 -07:00 |
|
danielvincent
|
9571ade89c
|
basic setup
|
2010-09-21 12:29:39 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
Raphael
|
5df33a6fd0
|
Take out users/show, use current_user in update
|
2010-09-17 10:50:18 -07:00 |
|
Raphael
|
be26794e4a
|
only write to your own profile
|
2010-09-17 10:46:14 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
maxwell
|
6f75a81a9d
|
IZ MS trying again on fixing remote profile images
|
2010-09-13 15:48:30 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
maxwell
|
2ce4fb27fa
|
MS; removing some dumb user stuff
|
2010-09-08 20:39:05 -07:00 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
Raphael
|
82f53663ab
|
remove user index
|
2010-08-17 20:39:05 -07:00 |
|
Raphael
|
0fb55be7a0
|
RS, DG; You can now sign up to be a user on a seed
|
2010-08-10 16:03:38 -07:00 |
|
Raphael
|
a8b77cf868
|
DG RS; made an instantiate method for user which makes a person and profile
|
2010-08-10 15:35:27 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
danielvincent
|
96fa34ea60
|
changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.
|
2010-08-09 21:10:11 -07:00 |
|
maxwell
|
049361ea15
|
MS profiles should send, need to just make the parser now
|
2010-07-28 18:32:00 -07:00 |
|
maxwell
|
80db1132d1
|
Fixed the tests;
|
2010-07-28 16:50:38 -07:00 |
|
maxwell
|
d7550568ad
|
added pagination to photo picker on the user profile. still ugly, less sucky
|
2010-07-26 13:55:44 -07:00 |
|
ilya
|
7901791ee3
|
DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.
|
2010-07-20 11:50:36 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
Raphael
|
97b1e8dd5d
|
oops
|
2010-07-08 10:28:23 -07:00 |
|
Raphael
|
4819ce694b
|
removed emspec from gemfile
|
2010-07-08 10:27:22 -07:00 |
|
maxwell
|
46ab63de36
|
added will pagination action.
|
2010-06-28 21:56:58 -07:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
maxwell
|
043924b5f5
|
made everyting so the lastest is the first thing you see
|
2010-06-17 20:58:20 -07:00 |
|
danielvincent
|
eaeafd3240
|
added authentication via devise
|
2010-06-12 21:56:50 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|