Raphael
|
f44b02e22c
|
Clean up people/person
|
2010-11-30 13:07:02 -08:00 |
|
maxwell
|
466120cd58
|
fixing extra =
|
2010-11-18 20:07:57 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
Raphael
|
c0414b8184
|
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
248e768846
|
search now sockets a person
|
2010-11-15 19:13:45 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
Raphael
|
d62a7c4ce2
|
Fix request views, refactor identical forms into partial.
|
2010-11-10 20:12:09 -08:00 |
|
Raphael
|
8232a92ca0
|
Update _person and person show, add specs for those pages
|
2010-11-10 12:41:18 -08:00 |
|
Raphael
|
71ab919ad3
|
Remove urls from requests, invitations are broken
|
2010-11-09 14:07:26 -08:00 |
|
danielvincent
|
a4df6a8a53
|
bugfix in peeople#_person partial displaying relationship status
|
2010-11-07 10:51:33 -08:00 |
|
MrZYX
|
63a5fdb000
|
made a bunch of strings translatable
|
2010-11-04 20:49:50 +01:00 |
|
danielvincent
|
ea00d35f1f
|
padding on stream fix. added add aspect button in aspect nav.
|
2010-10-19 12:10:22 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07: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
|
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
|
b5a2971302
|
search results for people now look like the stream
|
2010-09-18 17:49:52 -07:00 |
|