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
|
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 |
|
Ariel Zavala
|
c6b34be63d
|
Added people views translations
|
2010-09-17 11:27:08 -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
|
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 |
|
Daniel Vincent Grippi
|
f70ade6705
|
DG IZ; moved info on the person show page
|
2010-09-10 13:52:12 -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 |
|
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 |
|
Raphael
|
39380c3c06
|
check if you are friends before displaying group list
|
2010-08-27 10:22:58 -07:00 |
|
danielvincent
|
390bf24e14
|
Don't try to put yourself in any groups
|
2010-08-26 17:34:06 -07:00 |
|
maxwell
|
b4174c664e
|
you can now reassign a peson's group
|
2010-08-25 18:07:31 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
maxwell
|
204c910f66
|
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
|
2010-08-24 15:47:44 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
danielvincent
|
2409fd3f20
|
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
|
2010-08-18 02:40:53 -07:00 |
|
danielvincent
|
09958bc207
|
DG MS; removed delete friend button from current user's show page
|
2010-08-04 15:43:24 -07:00 |
|
Raphael
|
6fe00982f2
|
RS, IZ, fixing another error on person show
|
2010-07-30 10:32:36 -07:00 |
|
Raphael
|
0fd35709b1
|
RS, IZ, fixing error on person show with no posts
|
2010-07-30 10:26:00 -07:00 |
|
maxwell
|
c41dea1e8b
|
MS small profile tweaks
|
2010-07-27 16:18:46 -07:00 |
|
maxwell
|
3cecbf1511
|
MS profile page fixes
|
2010-07-27 15:52:42 -07:00 |
|
maxwell
|
9dd5c08296
|
fixed two small UI bugs
|
2010-07-27 14:45:04 -07:00 |
|
maxwell
|
86e090bac3
|
MS figured out moz gradient business
|
2010-07-27 14:34:16 -07:00 |
|
maxwell
|
bdca2348a6
|
MS IZ profile page has more useful info, but ultimatly kinda ugly
|
2010-07-27 14:23:31 -07:00 |
|
Raphael
|
7fb7c519cc
|
Adding active to friend view
|
2010-07-15 16:30:56 -07:00 |
|
danielvincent
|
7bfdaac691
|
added unfriend button to person show page
|
2010-07-09 18:54:48 -07:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|