ilya
|
0fa11806ba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 21:32:18 -04:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
maxwell
|
36b5a90d34
|
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
|
2010-06-28 17:35:38 -07:00 |
|
maxwell
|
3dce5f1b34
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 16:15:48 -07:00 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
ilya
|
2ac4759067
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 18:21:03 -04:00 |
|
ilya
|
2b42ef216c
|
DG IZ; added a profile; one-to-one relation with Person (non-singleton)
|
2010-06-28 18:20:56 -04:00 |
|
maxwell
|
b6c6316886
|
trying to fix status message bug
|
2010-06-28 15:03:45 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
44b25e3eaa
|
DG IZ; fixed javascript bug. stream fades in recents again.
|
2010-06-28 17:02:26 -04:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
danielvincent
|
fd082f52bc
|
fixed stream's sans font showing up on linux.
|
2010-06-28 12:35:31 -07:00 |
|
danielvincent
|
762cbcb0f2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/comments/_comment.html.haml
app/views/layouts/application.html.haml
|
2010-06-28 12:09:35 -07:00 |
|
ilya
|
a540f09109
|
RS, IZ; Added ids to views
|
2010-06-28 14:46:43 -04:00 |
|
ilya
|
3d76fa26ba
|
RS IZ testing GUID
|
2010-06-28 14:28:01 -04:00 |
|
maxwell
|
2b5cf0d265
|
my websocket works. wut up
|
2010-06-28 10:11:47 -07:00 |
|
maxwell
|
60091012bf
|
on client connect, websockets now tell the server where the user is. nothing more
|
2010-06-28 01:12:21 -07:00 |
|
danielvincent
|
462bd96189
|
ui fixup
|
2010-06-27 16:17:42 -07:00 |
|
danielvincent
|
5be27f33ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
app/views/status_messages/_status_message.html.haml
|
2010-06-27 10:32:23 -07:00 |
|
maxwell
|
b017f1b0f9
|
forgot to add partial file to git...sorry
|
2010-06-26 23:43:30 -07:00 |
|
Maxwell Salzberg
|
b804bdc220
|
forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts
|
2010-06-26 15:40:33 -07:00 |
|
Maxwell Salzberg
|
4402a84c32
|
fixed the webhook bug, now going to deploy and test
|
2010-06-26 15:21:23 -07:00 |
|
Maxwell Salzberg
|
2bbfcb0bb1
|
putting debug in for master so I can check deployed servers out
|
2010-06-26 14:16:19 -07:00 |
|
ilya
|
0818450c6e
|
IZ deploy script now deploys to both, changed the password on both boxes
|
2010-06-26 05:43:50 -04:00 |
|
danielvincent
|
39e85754d8
|
nav should be collapsed into a filter list. comments are more clear.
|
2010-06-26 00:07:21 -07:00 |
|
maxwell
|
4a2049033a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:09:24 -07:00 |
|
maxwell
|
c99416ca67
|
fixed a broken common.rb spec
|
2010-06-25 23:08:59 -07:00 |
|
ilya
|
cda2d9eeab
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-26 02:08:34 -04:00 |
|
ilya
|
a7d46bffab
|
removed socket.js
|
2010-06-26 02:08:19 -04:00 |
|
maxwell
|
6467f943da
|
MS^2 Comments serialize and deserialize properly
|
2010-06-25 22:49:53 -07:00 |
|
maxwell
|
e4e2d52bcb
|
reverting typos
|
2010-06-25 22:29:36 -07:00 |
|
maxwell
|
0d700046c4
|
MS^2 Object parser can handle comments
|
2010-06-25 22:29:08 -07:00 |
|
maxwell
|
a6c33b3e7b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:49 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
ilya
|
ad28f0cf82
|
RS, IZ; Maybe commited
|
2010-06-26 00:58:24 -04:00 |
|
ilya
|
a7f6eaefdf
|
no friends panel on page
|
2010-06-26 00:47:21 -04:00 |
|
ilya
|
d9ffb0d07d
|
RS IZ No Friends list before signin
|
2010-06-25 23:53:04 -04:00 |
|
ilya
|
f5ecfebcb9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:23:44 -04:00 |
|
ilya
|
d4f528bba8
|
Removed bookmark new page, moved form to index
|
2010-06-25 23:23:37 -04:00 |
|
maxwell
|
faa5d21636
|
Change the form_for not to need a message passed, and adding it to the home page
|
2010-06-25 19:58:40 -07:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
ilya
|
f5d1ab14fb
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:58 -04:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
maxwell
|
a89e0d4a7f
|
We are sorry.
|
2010-06-25 18:46:27 -07:00 |
|
ilya
|
5fb8d90738
|
added a validation to bookmark
|
2010-06-25 21:46:20 -04:00 |
|
maxwell
|
2566b2d4e1
|
added person validations
|
2010-06-25 18:31:35 -07:00 |
|
maxwell
|
884af9a3b6
|
added debug partial
|
2010-06-25 15:35:40 -07:00 |
|
maxwell
|
b105b0d6f2
|
merged in
|
2010-06-25 15:34:40 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|