Raphael Sofaer
|
560269ef87
|
cleaning up sprinkle
|
2010-06-17 20:52:51 -07:00 |
|
maxwell
|
81016729c4
|
fixing dans commit
|
2010-06-17 20:35:16 -07:00 |
|
maxwell
|
855fc62e01
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-17 20:34:45 -07:00 |
|
maxwell
|
e7835955eb
|
fixed a bug
|
2010-06-17 20:33:59 -07:00 |
|
danielvincent
|
cbdb3ecbc7
|
quick fix with notify_friends. sets xml variable in post request.
|
2010-06-17 20:32:44 -07:00 |
|
danielvincent
|
1ce01be534
|
DG MS; fixed infinate loop
|
2010-06-17 20:06:44 -07:00 |
|
danielvincent
|
39118293eb
|
DG MS; fixed minor webhook bug when generating xml collection.
|
2010-06-17 18:45:50 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
Raphael Sofaer
|
06465ec50b
|
IZ, RS; Capistrano now works. Sort of.
|
2010-06-17 18:05:47 -07:00 |
|
Raphael Sofaer
|
9dd72123fc
|
deleted confusing deploy.rb
|
2010-06-17 16:24:02 -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
|
3371b87fff
|
DG MS; queue works. just need to move some tests over.
|
2010-06-17 11:32:13 -07:00 |
|
danielvincent
|
4cecb522b6
|
DG MS; queue still working. half-way finished cleaning up code.
|
2010-06-17 10:36:54 -07:00 |
|
danielvincent
|
d91cec0881
|
queue works. needs cleanup.
|
2010-06-17 10:29:30 -07:00 |
|
Maxwell Salzberg
|
67535c1113
|
tried to git rid of error in em-http-request
|
2010-06-17 09:20:59 -07:00 |
|
danielvincent
|
43207aeb41
|
pending: resolving post action in queue
|
2010-06-16 23:12:23 -07:00 |
|
Raphael Sofaer
|
bcf99af84d
|
IZ working on start, stop
|
2010-06-16 22:48:41 -07:00 |
|
Raphael Sofaer
|
3aa2191365
|
RS IZ deploy stuffz
|
2010-06-16 19:42:39 -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 |
|
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 |
|
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 |
|