maxwell
|
9b690b863a
|
droping things
|
2010-08-25 21:53:04 -07:00 |
|
Raphael
|
9ae65cbfd8
|
Symlink images on deploy
|
2010-08-25 18:28:25 -07:00 |
|
Raphael
|
6d3d37b7c6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:20:37 -07:00 |
|
Raphael
|
2c54fee1af
|
Adding minified jquery
|
2010-08-25 18:20:21 -07:00 |
|
Raphael
|
ad67798004
|
User to_id on groups_with_post
|
2010-08-25 18:15:38 -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 |
|
Raphael
|
e714e0d457
|
Comment sets now pop open on receiving a new comment
|
2010-08-25 18:00:53 -07:00 |
|
Raphael
|
50459d896c
|
Socket received comments
|
2010-08-25 17:34:12 -07:00 |
|
Raphael
|
00f8a3e628
|
removed ensure_bson in user. added to_id method to String and ObjectID classes
|
2010-08-25 17:11:57 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
Raphael
|
3a91858bcf
|
Don't alert
|
2010-08-25 16:47:11 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
Raphael
|
be6dc1d443
|
Delete tinymce
|
2010-08-25 13:58:16 -07:00 |
|
Raphael
|
2c89a96e79
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 13:56:49 -07:00 |
|
Raphael
|
9d2653ecd4
|
Move some stuff out of document ready
|
2010-08-25 13:56:38 -07:00 |
|
maxwell
|
c9e64ae209
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 13:54:27 -07:00 |
|
maxwell
|
6a613c3304
|
addded the draggable javascript
|
2010-08-25 13:53:53 -07:00 |
|
Raphael
|
f8d63052d4
|
Remove stream lives from ready block
|
2010-08-25 13:52:59 -07:00 |
|
Raphael
|
17636f4fd2
|
View modifications, refactored stream javascript to another file
|
2010-08-25 13:51:16 -07:00 |
|
Raphael
|
c3b75703ac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 11:35:56 -07:00 |
|
Raphael
|
3121cf57d3
|
Refactored top nav haml, added non-functional gear link next to group
|
2010-08-25 11:35:50 -07:00 |
|
ilya
|
ea1c3e10ec
|
forgotten to add the actual images
|
2010-08-25 10:19:13 -07:00 |
|
ilya
|
75d5f19a7d
|
added photos to tom and korth
|
2010-08-25 10:17:31 -07:00 |
|
danielvincent
|
8497586547
|
linked group titles on group pages
|
2010-08-25 10:09:39 -07:00 |
|
danielvincent
|
90ce31173a
|
fixed errors on album/photo pages
|
2010-08-25 09:59:18 -07:00 |
|
danielvincent
|
f4b3a2eb3a
|
more cleaning up of comment box. javascript stuff.
|
2010-08-24 20:49:32 -07:00 |
|
danielvincent
|
501f98b9e1
|
fixed comments from not showing. also, touched them up a bit.
|
2010-08-24 20:13:37 -07:00 |
|
danielvincent
|
d87f330369
|
added titles for columns in layout
|
2010-08-24 19:46:57 -07:00 |
|
Raphael
|
f9dd462957
|
Check for current user again
|
2010-08-24 19:32:38 -07:00 |
|
Raphael
|
174dbc069b
|
Fix publisher checkboxes on index
|
2010-08-24 19:25: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
|
d3c10f8777
|
made left column in layout a little wider
|
2010-08-24 19:02:00 -07:00 |
|
Raphael
|
008c450f66
|
Add friend button resized
|
2010-08-24 18:52:50 -07:00 |
|
Raphael
|
5779610659
|
messed with the views
|
2010-08-24 18:31:16 -07:00 |
|
Raphael
|
559b6cd02f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 17:43:35 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
maxwell
|
326f17567e
|
bad signature valid hack
|
2010-08-24 17:34:13 -07:00 |
|
Raphael
|
41aa8ed10e
|
Specs pass again, need to make albums have a group
|
2010-08-24 17:12:27 -07:00 |
|
Raphael
|
f23a9d80b2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:56:16 -07:00 |
|
Raphael
|
c102e81b03
|
put the visible back in
|
2010-08-24 16:56:04 -07:00 |
|
ilya
|
55c43b4498
|
grr, silly comma
|
2010-08-24 16:48:40 -07:00 |
|
ilya
|
35e2523b95
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:45:52 -07:00 |
|
ilya
|
b62d76bd66
|
going back to the old simple way of doing things
|
2010-08-24 16:45:38 -07:00 |
|
maxwell
|
61ba4bfd65
|
adding symlink to deploy script for pivots
|
2010-08-24 16:42:04 -07:00 |
|
Raphael
|
7861fe5abc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:39:42 -07:00 |
|
Raphael
|
3f5df61810
|
minor tab tweaks
|
2010-08-24 16:38:42 -07:00 |
|
maxwell
|
356d88f7f8
|
adding symlink to deploy script for pivots
|
2010-08-24 16:37:45 -07:00 |
|
maxwell
|
2da3a497b3
|
adding symlink to deploy script for pivots
|
2010-08-24 16:35:18 -07:00 |
|
ilya
|
385472351d
|
not going through user.post
|
2010-08-24 16:25:12 -07:00 |
|