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 |
|
maxwell
|
3581f7a7d6
|
merged in socket
|
2010-06-20 22:13:24 -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
|
6647ce34ab
|
status message and bookmark page
|
2010-06-20 14:52:04 -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 |
|
maxwell
|
2f6a11f018
|
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
|
2010-06-19 14:42:23 -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 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
danielvincent
|
1223011a4f
|
more semi-drastic changes.
|
2010-06-19 00:01:25 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
danielvincent
|
c63eac0fd9
|
added line delimiters for post stream on dashboard
|
2010-06-15 22:34:08 -07:00 |
|
maxwell
|
9e89b2e0a7
|
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
|
2010-06-15 21:08:29 -07:00 |
|
maxwell
|
e6f3fc1d38
|
DG MS more test cleanup and removed a deprecation warning
|
2010-06-15 17:38:12 -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 |
|
danielvincent
|
99d9e50ed6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-15 10:12:14 -07:00 |
|
danielvincent
|
d70cf5b7a7
|
DG RS; fixed newest messages bug in view. moved to helper.
|
2010-06-15 10:11:28 -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
|
3c3c194ed5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-14 17:48:50 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
ilya
|
08e64450f3
|
IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version
|
2010-06-14 20:34:03 -04:00 |
|
maxwell
|
4532c39e93
|
DG MS; Status messages have owner field; defaults to user
|
2010-06-14 17:13:07 -07:00 |
|
maxwell
|
db44081186
|
MS IZ DG completed friends should be displayed on dashboard
|
2010-06-14 13:17:20 -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
|
4584f1309e
|
Merge branch 'blueprint'
|
2010-06-14 11:51:56 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
maxwell
|
0ff541ba43
|
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
|
2010-06-14 11:05:55 -07:00 |
|
maxwell
|
29c6f9fa0f
|
DG, MS, IZ; status messages now functional
|
2010-06-13 22:11:16 -07:00 |
|
maxwell
|
85e6eb2132
|
added stray local files
|
2010-06-13 21:22:52 -07:00 |
|
maxwell
|
28ba205ef3
|
blerg rspec cache sux
|
2010-06-13 21:08:17 -07:00 |
|
maxwell
|
865d7d18cb
|
user login now drops to a dashboard page
|
2010-06-13 20:00:31 -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 |
|