Commit graph

16493 commits

Author SHA1 Message Date
maxwell
e6f3fc1d38 DG MS more test cleanup and removed a deprecation warning 2010-06-15 17:38:12 -07:00
maxwell
497b477e89 DG MS added a post model, going to put it more places than just status message now 2010-06-15 17:21:57 -07:00
danielvincent
4da68fc4b1 fixed merge error 2010-06-15 12:28:21 -07:00
ilya
a46b0479f4 IZ merge conflicts 2010-06-15 14:59:35 -04:00
ilya
653392f738 IZ factories in controller specs as well as bookmark 2010-06-15 14:56:32 -04:00
danielvincent
f69a2bd8a1 RS; Merging whitespace 2010-06-15 11:14:00 -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
ilya
8a37843cd9 IZ no more message= in newest in status message model 2010-06-15 13:23:24 -04:00
ilya
ee295d01ff IZ using factories for the spec 2010-06-15 13:18:26 -04: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
1f73c2351e DG MS IZ; Status message renders to and from xml; Friend model in place 2010-06-14 16:20:57 -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
5d273ef049 removed stray rails.png file 2010-06-14 11:51:03 -07:00
danielvincent
98abb75097 added blueprint 2010-06-14 11:50:17 -07:00
maxwell
f6e662a3fa moved redirect commitment to cucumber, delivering stories 2010-06-14 11:41:15 -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
maxwell
1029fd5854 made devise routes slightly more intutive. chore completed MS 2010-06-13 16:28:48 -07:00
maxwell
c84c99f993 created the rspec runner so you dont have to worry about cleaning mongoid every run completed chore MS 2010-06-13 16:12:32 -07:00
maxwell
3fd7f2719b added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster 2010-06-13 15:46:40 -07:00
danielvincent
f9f12860b2 fixed spec bug 2010-06-12 22:04:21 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
danielvincent
8ecaf240e6 user session model authenticates against users 2010-06-12 19:51:54 -07:00
danielvincent
583067b05c cleaned up user specs 2010-06-12 18:52:36 -07:00
maxwell
8b0c3725a5 push for rafi 2010-06-12 15:55:29 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00
maxwell
e1a0c2f365 got rspec fully working 2010-06-12 14:44:58 -07:00
Maxwell Salzberg
a663844eef MS IZ set up mongoid and got rid of activerecord sqlite3 nonsense 2010-06-12 00:59:19 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00