danielvincent
|
67123c664a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
|
2010-06-29 14:36:46 -07:00 |
|
danielvincent
|
5193a20458
|
DG IZ; getting there.
|
2010-06-29 14:34:33 -07:00 |
|
maxwell
|
6532962c1c
|
trying to get google analytics working
|
2010-06-29 13:58:36 -07:00 |
|
maxwell
|
60336bd520
|
trying to get GS working
|
2010-06-29 13:45:54 -07:00 |
|
maxwell
|
f9d4eff7b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 12:32:07 -07:00 |
|
danielvincent
|
260805af64
|
DG IZ; publisher box & profile picture placeholder
|
2010-06-29 12:25:36 -07:00 |
|
maxwell
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
danielvincent
|
01f048b0a6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/stylesheets/sass/application.sass
|
2010-06-28 22:18:47 -07: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
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
ilya
|
44b25e3eaa
|
DG IZ; fixed javascript bug. stream fades in recents again.
|
2010-06-28 17:02:26 -04: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 |
|
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 |
|
danielvincent
|
39e85754d8
|
nav should be collapsed into a filter list. comments are more clear.
|
2010-06-26 00:07:21 -07: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 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
maxwell
|
671772f901
|
MS DG added tinyMCE, now a blog is better than a status messsage
|
2010-06-23 11:58:46 -07:00 |
|
maxwell
|
fba4ce9e3b
|
DG MS; fixed flash message visual bug
|
2010-06-23 11:11:58 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
maxwell
|
fd5d7c63ad
|
messy application.haml file i know, but now the sockets only update pages which want their data
|
2010-06-22 18:59:11 -07:00 |
|
maxwell
|
94de043862
|
fixed not hardcoded port for websockets
|
2010-06-22 17:20:07 -07:00 |
|
maxwell
|
aa7a2da3d1
|
put debug back into websocket
|
2010-06-22 16:23:15 -07:00 |
|
maxwell
|
cc89cd5cda
|
reload object before send to websocket
|
2010-06-22 16:12:15 -07:00 |
|
maxwell
|
3064d208eb
|
added firefox websocket stuffs, only loads if it is not safari or chrome
|
2010-06-22 14:31:16 -07:00 |
|
maxwell
|
3a8394bd59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
|
2010-06-21 19:24:07 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
danielvincent
|
1233c60f6f
|
DG IZ; user's real name displayed on top of every page
|
2010-06-21 16:09:48 -07:00 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
danielvincent
|
06271d5821
|
added dumb partial switcher function in dashboard controller
|
2010-06-21 14:23:59 -07:00 |
|
maxwell
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
danielvincent
|
26d675af11
|
some sass cleanup
|
2010-06-20 18:36:01 -07:00 |
|
danielvincent
|
c542c08e38
|
simpler
|
2010-06-20 17:06:10 -07:00 |
|
danielvincent
|
aee5f7f04f
|
took out filler elements
|
2010-06-20 11:49:05 -07:00 |
|
danielvincent
|
df2b9d6ad4
|
more shuffling
|
2010-06-19 14:44:08 -07:00 |
|
danielvincent
|
0c392a0cce
|
moved nav to bottom header
|
2010-06-19 03:01:39 -07:00 |
|
danielvincent
|
d1630b6c45
|
shrink that header
|
2010-06-19 00:53:42 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
danielvincent
|
45c926f790
|
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
|
2010-06-15 11:09:47 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
58dfefc3ca
|
added home to nav bar
|
2010-06-14 18:50:38 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
danielvincent
|
63f5fe15d6
|
nav includes users and status messages
|
2010-06-14 11:55:52 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
danielvincent
|
eaeafd3240
|
added authentication via devise
|
2010-06-12 21:56:50 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|