maxwell
|
23c446c8bf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 21:57:55 -08:00 |
|
Sarah Mei
|
9da69a4b01
|
Mobile log in form is usable. Also, added mixins for sass.
|
2010-12-04 20:45:52 -08:00 |
|
danielvincent
|
03961bce7b
|
removed last reference to invitation fancybox
|
2010-12-04 20:06:24 -08:00 |
|
maxwell
|
fb310560df
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 19:37:47 -08:00 |
|
Michael Sofaer
|
9e575ea765
|
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
|
2010-12-04 19:36:22 -08:00 |
|
danielvincent
|
4c4f5c6aa4
|
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
|
2010-12-04 19:36:22 -08:00 |
|
maxwell
|
68e7fdf6b7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 19:34:14 -08:00 |
|
maxwell
|
b56b2fbd1b
|
added spec for periods in usernames; unpendify a couple of specs
|
2010-12-04 19:33:58 -08:00 |
|
Sarah Mei
|
fea6884acc
|
Mobile homepage looks decent.
|
2010-12-04 19:30:14 -08:00 |
|
maxwell
|
b3ca504c40
|
no periods in username
|
2010-12-04 19:28:08 -08:00 |
|
OhaiBBQ
|
1b7749f282
|
typo on last commit
|
2010-12-05 06:21:06 +03:00 |
|
OhaiBBQ
|
05f54e0ebd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-05 06:18:30 +03:00 |
|
OhaiBBQ
|
78ac693dcd
|
only tipsy on avatars in left_pane and manage_aspect_zone
|
2010-12-05 06:17:14 +03:00 |
|
Sarah Mei
|
06cc99b19e
|
git ignores mobile.css
|
2010-12-04 19:16:14 -08:00 |
|
Sarah Mei
|
c3736729c9
|
removing mobile.css from git
|
2010-12-04 19:16:14 -08:00 |
|
danielvincent
|
c4db32c253
|
adding jquery 1.4.4 back re sentientwaffle's fix.
|
2010-12-04 18:59:01 -08:00 |
|
sentientwaffle
|
b303cf6830
|
fixed issue with post deletion confirmation for the latest verison of jquery
|
2010-12-04 18:55:15 -08:00 |
|
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 |
|