danielvincent
6eb50ea934
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad
photo uploader on edit profile page.
2010-10-29 14:11:59 -07:00
danielvincent
1d399598d3
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
2010-10-29 10:38:17 -07:00
danielvincent
bb9a6e47a4
added birthday and gender to Profile. fixed a view issue on getting_started#2
2010-10-28 11:01:16 -07:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
danielvincent
f1fbb68fd8
added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.
2010-10-26 18:35:14 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
ilya
c27f05ed42
Initial refactor done, need to stop mapping user.friends to people so much
2010-10-22 18:11:04 -07:00
maxwell
bc9c852e25
fixed translation showing en on person show page when the person had no posts
2010-10-20 17:52:07 -07:00
ilya
ae7891194e
added links to the aspects a person is in on the show page
2010-10-20 16:57:09 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c9953fef63a9a
2010-10-20 14:59:55 +02:00
maxwell
bfe57b13cc
added diaspora handle to user profile page
2010-10-19 20:34:10 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Dorian
e792344c0e
Use improved whitespace:scrub_gratuitous_newlines
2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Raphael
d748d456b5
Revert "fix in person partial"
...
This reverts commit 8c0bc4b9e6
2010-09-23 16:21:08 -07:00
danielvincent
8c0bc4b9e6
fix in person partial
2010-09-23 10:49:35 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
maxwell
24ca139241
MS remove some stray puts
2010-09-20 17:11:07 -07:00
maxwell
e2fc48c9ff
MS being slightly more proper with application helper, and fixing the person search page
2010-09-20 16:44:35 -07:00
Arnaud Delcasse
eeb132d825
Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.
2010-09-21 03:20:06 +08:00
Ariel Zavala
e9f74675e9
Merged with diaspora; fixed conflicts; only 2 red
2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39
description text for all boxes in manage page. search box text defaults to query on people#index.
2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302
search results for people now look like the stream
2010-09-18 17:49:52 -07:00
Ariel Zavala
c6b34be63d
Added people views translations
2010-09-17 11:27:08 -04:00
maxwell
649839567d
MS added pagination to the search page
2010-09-16 11:47:34 -07:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
maxwell
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -07:00
Raphael
d9eb3abd9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065
moving things around for consistency. consistency isn't pretty right now.
2010-09-15 10:26:57 -07:00
Daniel Vincent Grippi
71ef54dbcc
spelling mistake, broken links on search page
2010-09-14 11:42:47 -07:00
Daniel Vincent Grippi
2fae1049d9
silent comments in all views except the layout and session wall
2010-09-13 15:11:14 -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
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
b704704334
People index now works when there is a non-friend on the page
2010-09-10 16:49:09 -07:00
Daniel Vincent Grippi
f70ade6705
DG IZ; moved info on the person show page
2010-09-10 13:52:12 -07:00
Daniel Vincent Grippi
5fd105c1dc
DG MS; search now links user names if you're friends with them
2010-09-08 12:04:05 -07:00
maxwell
919d7d23c0
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
2010-09-06 17:46:09 +02:00
Daniel Grippi & Raphael Sofaer
7984756aa7
controller cleanup: using respond_to and respond_with.
2010-08-29 22:49:13 -07:00
Raphael
7223d21721
Add singular move friend route, it must be eliminated later
2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90
Groups can now be batch edited
2010-08-27 12:23:20 -07:00
Raphael
f309299e22
Take out remove friend button on stranger, there should be an add friend
2010-08-27 10:26:03 -07:00
Raphael
e1d6c9ce03
fixing person show on stranger
2010-08-27 10:24:42 -07:00
