Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -07:00 |
|
Raphael
|
240dda4eab
|
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
|
2010-09-09 12:21:36 -07:00 |
|
Raphael
|
5fd1602731
|
Group batch edit is for all groups
|
2010-09-08 10:00:31 -07:00 |
|
Daniel Vincent Grippi
|
20d9334ce1
|
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
|
2010-09-07 17:20:48 -07:00 |
|
Daniel Vincent Grippi
|
41afd86fe7
|
DG IZ; fixed photos.
|
2010-09-07 12:03:43 -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 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
5babda044d
|
cleaned up group controller. added custom as_json to group model.
|
2010-08-29 21:56:10 -07:00 |
|
maxwell
|
34cb15c423
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-27 13:33:39 -07:00 |
|
maxwell
|
d1bac3e078
|
MS added a log route for easy access
|
2010-08-27 13:33:28 -07: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 |
|
danielvincent
|
390bf24e14
|
Don't try to put yourself in any groups
|
2010-08-26 17:34:06 -07:00 |
|
danielvincent
|
1d515e7b7e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:02:29 -07:00 |
|
danielvincent
|
239ae048cc
|
group names are now editable
|
2010-08-26 15:02:13 -07:00 |
|
Raphael
|
9f11a474d8
|
Take out some logging, put in log user on receive
|
2010-08-26 11:46:04 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -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 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
maxwell
|
6a613c3304
|
addded the draggable javascript
|
2010-08-25 13:53:53 -07:00 |
|
danielvincent
|
90ce31173a
|
fixed errors on album/photo pages
|
2010-08-25 09:59:18 -07:00 |
|
Raphael
|
f9dd462957
|
Check for current user again
|
2010-08-24 19:32:38 -07:00 |
|
Raphael
|
5ac5f58679
|
Tabs on the top aren't all selected on group select, some other view tweaks
|
2010-08-24 19:22:43 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
ilya
|
385472351d
|
not going through user.post
|
2010-08-24 16:25:12 -07:00 |
|
ilya
|
0f04cad670
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:05:43 -07:00 |
|
ilya
|
f5ae090e9b
|
posting empty albums to people
|
2010-08-24 16:05:29 -07:00 |
|
Raphael
|
de3044fa0a
|
Remove publisher selection remnants, fix posting
|
2010-08-24 15:55:35 -07:00 |
|
maxwell
|
ec3d902c36
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:48:02 -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 |
|
ilya
|
f3f2eb5abf
|
Made it green now making it clean
|
2010-08-24 15:43:53 -07:00 |
|
ilya
|
82d140aa80
|
trying to redeploy to get photos working
|
2010-08-24 15:23:58 -07:00 |
|
ilya
|
19e2c8f898
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:48:41 -07:00 |
|
ilya
|
17080730f8
|
opening the file in the set photo
|
2010-08-24 14:48:26 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
ef9cf8fc52
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:41:04 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
ilya
|
27de7f930a
|
forgot the backer number set photo
|
2010-08-24 14:29:05 -07:00 |
|
ilya
|
d92ae1c871
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:22:47 -07:00 |
|
ilya
|
a70132fcdc
|
IZ we update profile in zombie friends accept
|
2010-08-24 14:22:21 -07:00 |
|
maxwell
|
b4ab91043a
|
MS added check for current user
|
2010-08-24 13:45:38 -07:00 |
|
Raphael
|
ebfe77fc6d
|
Making warzombie work again
|
2010-08-24 12:17:06 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
Raphael
|
fb33d955c9
|
Fix group show controller/view and haml error in nav
|
2010-08-24 11:11:25 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|