Raphael Sofaer
|
807314d469
|
added htop to sprinkle
|
2010-06-18 23:54:32 -07:00 |
|
maxwell
|
63866a8128
|
playing
|
2010-06-18 23:47:42 -07:00 |
|
Raphael Sofaer
|
acfa7df1c5
|
Merge Capistrano into master
|
2010-06-18 23:41:02 -07:00 |
|
Raphael Sofaer
|
c3e557f47d
|
MS RS IZ start nginx & science
|
2010-06-18 23:38:58 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
Raphael Sofaer
|
fbe8915250
|
IZ uncommented the lines for the rackspace deploy
|
2010-06-18 22:08:17 -07:00 |
|
Raphael Sofaer
|
cd1ed1d164
|
Hopefully final conf changes
|
2010-06-18 19:02:59 -07:00 |
|
Raphael Sofaer
|
c435ba28f9
|
changing configures...
|
2010-06-18 18:09:57 -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 |
|
Raphael Sofaer
|
ac24a9bcef
|
changing configures...
|
2010-06-18 17:58:11 -07:00 |
|
Raphael Sofaer
|
b9d3930c61
|
changing configures...
|
2010-06-18 17:56:12 -07:00 |
|
Raphael Sofaer
|
8c988be7d9
|
changed yml again
|
2010-06-18 17:49:46 -07:00 |
|
Raphael Sofaer
|
bc9158eaeb
|
changed thin yml
|
2010-06-18 17:46:52 -07:00 |
|
Raphael Sofaer
|
414b18fb15
|
added thin to gemfile
|
2010-06-18 17:37:56 -07:00 |
|
Raphael Sofaer
|
178085b984
|
RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf
|
2010-06-18 17:33:43 -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 |
|
maxwell
|
043924b5f5
|
made everyting so the lastest is the first thing you see
|
2010-06-17 20:58:20 -07:00 |
|
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 |
|