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 |
|
danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
danielvincent
|
40c96fc619
|
DG IZ; click to edit rollover text on aspect manage page
|
2010-09-20 15:53:56 -07: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 |
|
Ariel Zavala
|
0be3314e0a
|
merge with diaspora and resolved a conflict
|
2010-09-16 20:42:45 -04:00 |
|
danielvincent
|
95a4120e57
|
DG IZ; dropzones on left back on aspect manage page.
|
2010-09-16 17:22:42 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
Ariel Zavala
|
be9ae343cc
|
Added localizations that I had missed
|
2010-09-16 15:55:54 -04:00 |
|
Ariel Zavala
|
443b5af4ce
|
Added localization to aspect views
|
2010-09-16 14:57:56 -04: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 |
|
Daniel Vincent Grippi
|
4a86632cf3
|
show default user photos for requests
|
2010-09-14 20:47:21 -07:00 |
|
Daniel Vincent Grippi
|
f2c6e7b820
|
made group manage a little nicer
|
2010-09-14 20:35:30 -07:00 |
|
Daniel Vincent Grippi
|
24cd518f11
|
DG, RS; Album creation no longer ejects you from context
|
2010-09-14 11:00:16 -07:00 |
|
Daniel Vincent Grippi
|
da8ec589b7
|
RS, DG; display the correct tab on manage, change edit to manage
|
2010-09-14 10:05:59 -07:00 |
|