Philip Champon
|
47ae57d4dd
|
Issue #650: this closes the netstat on mac problem http://bugs.joindiaspora.com/issues/650
|
2010-12-04 18:52:07 -08:00 |
|
Philip Champon
|
213f1c5e42
|
fixed bsd netstat issue
|
2010-12-04 18:52:07 -08:00 |
|
maxwell
|
8fb97072df
|
Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict
|
2010-12-04 18:40:17 -08:00 |
|
Sarah Mei
|
c9f7866955
|
Random extra spec for people_controller
|
2010-12-04 18:13:15 -08:00 |
|
maxwell
|
23eb192524
|
double the time that notifications are seen on the page
|
2010-12-04 17:45:52 -08:00 |
|
maxwell
|
55c0bd684b
|
remove some puts
|
2010-12-04 17:43:15 -08:00 |
|
maxwell
|
e47730b63f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 17:39:19 -08:00 |
|
danielvincent
|
105c788bf8
|
fixed comment js. fadeToggle is only supported in jquery >= 1.4.4
|
2010-12-04 17:37:57 -08:00 |
|
danielvincent
|
948707ea23
|
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
|
2010-12-04 17:22:22 -08:00 |
|
Michael Sofaer
|
a522655a19
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 17:19:11 -08:00 |
|
Michael Sofaer
|
3ca89bde57
|
Put photos create spec back in. I am not going to check who left it pending.
|
2010-12-04 17:18:08 -08:00 |
|
danielvincent
|
4251a3a093
|
prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted
|
2010-12-04 17:02:29 -08:00 |
|
maxwell
|
b9ab799569
|
ironing out invites
|
2010-12-04 16:49:45 -08:00 |
|
danielvincent
|
4daebfd147
|
archlinux env load fixed in resque
|
2010-12-04 16:35:05 -08:00 |
|
maxwell
|
b300adbef5
|
fixed a potentially bad bug with nil invite tokens
|
2010-12-04 16:13:44 -08:00 |
|
maxwell
|
4c3de52f68
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 16:03:54 -08:00 |
|
maxwell
|
8306cfffde
|
add token back to invite form
|
2010-12-04 16:03:35 -08:00 |
|
danielvincent
|
d1ad2efed1
|
HttpPost job now follows redirects
|
2010-12-04 15:23:54 -08:00 |
|
danielvincent
|
177cc16e2f
|
fixed the build
|
2010-12-04 14:26:13 -08:00 |
|
maxwell
|
88aa67dba7
|
actually put the post in the xml param where we expecting it. also, throw the errors so we know in whats going on in resque
|
2010-12-04 13:54:39 -08:00 |
|
OhaiBBQ
|
c55a867f61
|
fix build, .remove is the callback, don't call it immediately
|
2010-12-05 00:26:10 +03:00 |
|
danielvincent
|
addbaaeb70
|
JSON::Pure::Generator::State fix when using resque. huge thanks to this post: http://blog.ethanvizitei.com/2010/11/json-pure-ruins-my-morning.html
|
2010-12-04 13:16:30 -08:00 |
|
Iuri Kothe
|
7d847e16d0
|
Added missing translations
|
2010-12-04 18:16:56 -02:00 |
|
danielvincent
|
34a1a35bf1
|
skip getting started is not ajaxy
|
2010-12-04 12:06:08 -08:00 |
|
maxwell
|
544ab993ac
|
only show the url when the post has photos
|
2010-12-04 11:58:34 -08:00 |
|
Iuri Kothe
|
f22289ae0a
|
Added missing translations
|
2010-12-04 13:49:59 -02:00 |
|
OhaiBBQ
|
75e81577c6
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2010-12-04 11:55:08 +03:00 |
|
OhaiBBQ
|
ba23bd7a0a
|
Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs
|
2010-12-04 11:54:59 +03:00 |
|
danielvincent
|
c68ebc1d14
|
removed comic sans from the entire codebase. marker felt remains on os x.
|
2010-12-04 00:29:15 -08:00 |
|
danielvincent
|
c29bc0ce65
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 23:40:25 -08:00 |
|
danielvincent
|
47b6d66b83
|
fixed proportions in stream, etc.
|
2010-12-03 23:38:29 -08:00 |
|
maxwell
|
c5f2e8bb2d
|
now you can not invite yourself. we have a bug as send_contact_request_to was taken out but Invitation still used it
|
2010-12-03 22:58:37 -08:00 |
|
maxwell
|
7dce94814c
|
fixing the invite user job
|
2010-12-03 22:41:16 -08:00 |
|
Sarah Mei
|
713c98ce51
|
don't require redis for cucumber
|
2010-12-03 20:49:41 -08:00 |
|
maxwell
|
94c7b86a55
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 19:34:12 -08:00 |
|
maxwell
|
0a831cfbf4
|
invites are now on the queue
|
2010-12-03 19:33:54 -08:00 |
|
danielvincent
|
5da5ee26bb
|
two column aspect listing on manage page. made avatars smaller.
|
2010-12-03 16:22:20 -08:00 |
|
maxwell
|
0684c40660
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 15:51:44 -08:00 |
|
danielvincent
|
f9e4a744a5
|
put spec helper methods in spec_helper
|
2010-12-03 15:50:17 -08:00 |
|
maxwell
|
b8ece9381a
|
fixing up public image show
|
2010-12-03 15:48:27 -08:00 |
|
danielvincent
|
a7823485c7
|
made http calls synchronous. messagehandler enqueues POSTs into resque.
|
2010-12-03 15:26:52 -08:00 |
|
maxwell
|
f4fa3191bc
|
just call Jobs::Receive directly for now
|
2010-12-03 15:03:32 -08:00 |
|
maxwell
|
c99bc05886
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 13:58:12 -08:00 |
|
maxwell
|
85a85716c6
|
made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions
|
2010-12-03 13:57:47 -08:00 |
|
danielvincent
|
6f1783664a
|
load mailer in resque-workers
|
2010-12-03 12:07:39 -08:00 |
|
Philip Champon
|
2633dbc268
|
Issue 658: user object creation comes before person object creation,
preventing spurrious handle creation errors, if user creation
fails
|
2010-12-03 14:59:35 -05:00 |
|
danielvincent
|
60ae7ff74f
|
Take magent out of chef recipes
|
2010-12-03 11:52:48 -08:00 |
|
danielvincent
|
b9dbdd09fa
|
start redis in script/server. removed magent. redis-server does not close on script/server kill
|
2010-12-03 11:51:04 -08:00 |
|
danielvincent
|
71cae6b89f
|
Move request mail into resque
|
2010-12-03 11:51:04 -08:00 |
|
maxwell
|
8e8398fdea
|
change the assets to only package in production mode
|
2010-12-03 11:39:38 -08:00 |
|