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 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
Raphael
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
ilya
|
36c06349c5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 20:59:18 -07:00 |
|
ilya
|
284601c6b1
|
got moved photo.image.stuff to photo.url[:stuff]
|
2010-08-18 20:59:01 -07:00 |
|
Raphael
|
0459631d47
|
Show debug
|
2010-08-18 20:49:06 -07:00 |
|
ilya
|
3243435015
|
the album create doesn't crash the app
|
2010-08-18 20:14:31 -07:00 |
|
ilya
|
5cae2b21b1
|
RS, IZ fixed the url for the image
|
2010-08-18 18:06:13 -07:00 |
|
Raphael
|
5a2b42e4e5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:37:12 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
d0b2a23fcb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:17:00 -07:00 |
|
ilya
|
21f70c643d
|
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
|
2010-08-18 16:15:10 -07:00 |
|
Raphael
|
ac694eda8c
|
A bunch of dumb checks to make the group index publisher pass tests
|
2010-08-18 15:42:06 -07:00 |
|
ilya
|
f5811df5b7
|
DG IZ; added info text to add new friend button
|
2010-08-18 11:59:20 -07:00 |
|
ilya
|
055c222fc2
|
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
|
2010-08-18 10:53: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 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
2b8e637934
|
no names in publisher
|
2010-08-17 19:03:47 -07:00 |
|
Raphael
|
f75ff0b680
|
Remove links from publisher
|
2010-08-17 18:57:26 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
d554b3ef1a
|
flashsocket
|
2010-08-17 18:49:23 -07:00 |
|
ilya
|
daf08cd9f9
|
DG IZ posts by the user get websocketed on the group page and albums
get signed?
|
2010-08-17 18:06:35 -07:00 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -07:00 |
|
Raphael
|
08de5caf97
|
make signup page look better
|
2010-08-17 17:20:29 -07:00 |
|
ilya
|
054dafdf99
|
couple more
|
2010-08-17 17:16:11 -07:00 |
|
ilya
|
c1ff8544d3
|
removed a couple of js lines
|
2010-08-17 17:04:37 -07:00 |
|
ilya
|
e5036862f6
|
DG IZ removed the latest message javascript as well as the hash
|
2010-08-17 16:49:58 -07:00 |
|
ilya
|
d211abb1bc
|
DG IZ on page for group js method now returns true
|
2010-08-17 16:32:14 -07:00 |
|
ilya
|
d5d1a2d00f
|
DG IZ; javascript variable misnamed
|
2010-08-17 16:29:51 -07:00 |
|
ilya
|
7d68089c8b
|
DG IZ using group_id when passing the id around the app
|
2010-08-17 16:02:12 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
ilya
|
fc7f59bdfc
|
DG IZ stream for the current user's posts
|
2010-08-17 10:13:23 -07:00 |
|
ilya
|
33ed838b79
|
DG IZ added an error message on request delete
|
2010-08-16 15:08:05 -07:00 |
|
ilya
|
4a36df29e5
|
DG IZ now the links are of button style
|
2010-08-16 14:59:23 -07:00 |
|
ilya
|
92aa72447f
|
DG IZ fixed the css in selector
|
2010-08-16 14:57:30 -07:00 |
|
ilya
|
b1c29083df
|
changed the link data-method
|
2010-08-16 14:34:16 -07:00 |
|
ilya
|
2bc9d0156d
|
2 arguments in the hidden field
|
2010-08-16 11:59:13 -07:00 |
|
ilya
|
0ee03afe1d
|
DG IZ selector box on request page
|
2010-08-16 11:39:33 -07:00 |
|
danielvincent
|
18cd4b858a
|
broke out group index and show
|
2010-08-14 00:27:43 -07:00 |
|
danielvincent
|
c81ea5a632
|
minor changes
|
2010-08-14 00:21:10 -07:00 |
|
danielvincent
|
a7eab9e50c
|
minor section header tweaks (album stuff)
|
2010-08-13 23:20:39 -07:00 |
|
danielvincent
|
f7e43ee3d0
|
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
|
2010-08-12 00:27:26 -07:00 |
|
danielvincent
|
013a6d0849
|
add photo is now in a fancy-pancy box
|
2010-08-11 20:45:57 -07:00 |
|
danielvincent
|
97b04fc0d7
|
nevermind
|
2010-08-11 20:12:10 -07:00 |
|
danielvincent
|
3e1081acaa
|
commented out tinyMCE js for the time being
|
2010-08-11 20:09:16 -07:00 |
|
Raphael
|
eb36190188
|
DG, RS; Albums create failure prettier
|
2010-08-11 18:13:23 -07:00 |
|
Raphael
|
144d673dac
|
DG, RS; album button looks better
|
2010-08-11 17:16:20 -07:00 |
|
Raphael
|
599d1da620
|
Moved socket code out to lib, unsocketing from view should now work again
|
2010-08-11 12:03:26 -07:00 |
|
Raphael
|
355aba75df
|
RS, DG; removing the last link_to_person
|
2010-08-11 10:02:45 -07:00 |
|