Raphael
|
0ff87037cb
|
Added inheritance spec to user
|
2010-06-23 11:28:53 -07:00 |
|
Raphael
|
129e84336b
|
commented out use transactional fixtures, seemingly without effect
|
2010-06-23 10:33:02 -07:00 |
|
maxwell
|
5e5dea85a8
|
pushing small js fixes
|
2010-06-23 10:25:49 -07:00 |
|
maxwell
|
663b99924f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 01:26:06 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
Maxwell Salzberg
|
e6e1c22b07
|
DG; webhooks apply incoming posts to current friends with a silent fail on no match
|
2010-06-23 01:20:56 -07:00 |
|
Maxwell Salzberg
|
523cb6f15f
|
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
|
2010-06-22 23:27:31 -07:00 |
|
Maxwell Salzberg
|
9a44578c37
|
DG; Person is now the parent of Friend and User
|
2010-06-22 23:11:55 -07:00 |
|
maxwell
|
a6b36cb93e
|
terrible fix for 50 tests by stubbing WebSocket.stub in spec helper... warrenwarrents refator
|
2010-06-22 19:20:11 -07:00 |
|
maxwell
|
989949a8c9
|
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
|
2010-06-22 15:14:55 -07:00 |
|
Raphael
|
540b56805d
|
Fixed misc_spec.rb
|
2010-06-22 10:50:35 -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 |
|
danielvincent
|
a1361da770
|
DG IZ; friend and owner now require a real name
|
2010-06-21 15:56:40 -07:00 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
ilya
|
eb2c3fd2e5
|
fixed one spec bug in bookmarks
|
2010-06-21 15:01:12 -04:00 |
|
maxwell
|
3581f7a7d6
|
merged in socket
|
2010-06-20 22:13:24 -07:00 |
|
maxwell
|
ea7abccd72
|
fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh::
|
2010-06-19 14:56:20 -07:00 |
|
maxwell
|
63866a8128
|
playing
|
2010-06-18 23:47:42 -07:00 |
|
maxwell
|
5286b6be69
|
DG MS; require XML root node; added header to XML (not yet required)
|
2010-06-18 18:03:13 -07:00 |
|
maxwell
|
34df8fa946
|
DG MS; resolved unknown types going to receive handler. only post objects are inputted
|
2010-06-18 16:47:34 -07:00 |
|
maxwell
|
c430aaff18
|
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
|
2010-06-18 14:35:51 -07:00 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
danielvincent
|
ba6d136bc7
|
DG MS; added specs for common module
|
2010-06-17 15:22:02 -07:00 |
|
danielvincent
|
628af0372f
|
DG MS; completed event-queue intergration.
|
2010-06-17 14:29:41 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
Raphael Sofaer
|
ed26c82be4
|
RS, IZ; merged day's commits
|
2010-06-15 21:41:39 -07:00 |
|
Raphael Sofaer
|
8213443afd
|
RS, IZ; stubbed out and wrapped curl backtick
|
2010-06-15 21:34:52 -07:00 |
|
maxwell
|
b8e2fd018f
|
fixed dashboard test
|
2010-06-15 21:10:59 -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 |
|
Raphael Sofaer
|
34127b070a
|
IZ Made the specs pass, time to clean
|
2010-06-15 20:38:14 -07:00 |
|
Raphael Sofaer
|
c4b931c309
|
IZ RS getting remote messages (not yet done)
|
2010-06-15 18:41:54 -07:00 |
|
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 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07: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
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12: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 |
|