danielvincent
|
c0423e5e56
|
reverting commit manually
|
2010-10-22 15:57:00 -07:00 |
|
danielvincent
|
829ad6360a
|
multiple dropzones function. person image does not copy, delete is disabled.
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
a52870b21c
|
improved animations
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
e1f4e12b8f
|
style. also, made sense of aspect-edit.js
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
69528b95a3
|
removed ignore bucket. people now have x's to delete them
|
2010-10-22 15:56:27 -07:00 |
|
ilya
|
30bae4f807
|
throws an alert if you try to remove person from the last aspect
|
2010-10-20 18:30:22 -07:00 |
|
ilya
|
6fa82490c9
|
remove friend from aspect box, with js call to remove the person from the aspect
|
2010-10-20 17:34:52 -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
|
54e5fb4abb
|
add new aspect back on manage page. changed badges
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
eca37e1a28
|
small view cleanups
|
2010-10-17 21:55:03 -07:00 |
|
danielvincent
|
5ca3570667
|
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
|
2010-10-16 02:06:46 -07:00 |
|
maxwell
|
a61c126aad
|
manage page now uses partial
|
2010-10-15 11:29:23 -07:00 |
|
ilya
|
36b9f66f60
|
the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
|
2010-10-13 16:52:33 -07:00 |
|
danielvincent
|
be017bfb0a
|
DG MS; invite is now a lightbox on feed and manage pages
|
2010-10-11 14:16:24 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
b314ee22ec
|
intermediate misc ui polish
|
2010-10-07 22:51:08 -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
|
cc3819c256
|
Forgot a merge conflict
|
2010-09-22 21:39:22 -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 |
|
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 |
|