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 |
|
Raphael
|
7049cb3ca4
|
A less efficient, but simpler way of checking whether the photo is the profile photo
|
2010-09-22 10:31:40 -07:00 |
|
ilya
|
d26e7850ac
|
RS, IZ; removed url from user and views
|
2010-09-21 15:52:26 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
Ariel Zavala
|
07138041b0
|
Fixed album controller errors
|
2010-09-16 23:35:57 -04:00 |
|
Ariel Zavala
|
be9ae343cc
|
Added localizations that I had missed
|
2010-09-16 15:55:54 -04:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
maxwell
|
55c1530c9f
|
MS DG fixing an edit profile bug
|
2010-09-15 14:09:05 -07:00 |
|
Daniel Vincent Grippi
|
57bd052c5b
|
user edit bug
|
2010-09-15 12:22:03 -07:00 |
|
Daniel Vincent Grippi
|
ea3e372474
|
fixed 500 error with @photos
|
2010-09-15 11:24:23 -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
|
fc3fb817c8
|
profile photo doesn't change to null if not changed on profile update
|
2010-09-14 19:48:11 -07:00 |
|
maxwell
|
3b1223c9dd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:48:50 -07:00 |
|
maxwell
|
6f75a81a9d
|
IZ MS trying again on fixing remote profile images
|
2010-09-13 15:48:30 -07:00 |
|
Daniel Vincent Grippi
|
48403996f0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:11:38 -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 |
|
maxwell
|
a7231d041e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:09:20 -07:00 |
|
maxwell
|
c098be99bc
|
MS IZ attempt one to fix remote profile images
|
2010-09-13 15:08:39 -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 |
|
Daniel Vincent Grippi
|
edae8f1e66
|
DG MS; fixed a view bug in user edit page. page also displays diaspora username .
|
2010-09-08 11:58:03 -07:00 |
|
danielvincent
|
36b2445a11
|
added title to search page
|
2010-08-19 13:41:48 -07:00 |
|
ilya
|
284601c6b1
|
got moved photo.image.stuff to photo.url[:stuff]
|
2010-08-18 20:59:01 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
5723d91dae
|
DG IZ; moved some buttons around, added album edit page
|
2010-07-28 14:00:02 -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 |
|
danielvincent
|
04eb66b2e6
|
user has a image url field for user picture
|
2010-07-16 23:02:24 -07:00 |
|
Raphael
|
93fdbae9c5
|
fixed small bug on user show page, added header text to user edit page
|
2010-07-16 17:27:57 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|