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 |
|
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 |
|
maxwell
|
3d066e09db
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 11:35:15 -08:00 |
|
maxwell
|
c43077d318
|
fixed twitter, added logging for constants, added job for local recieve
|
2010-12-03 11:34:42 -08:00 |
|
Raphael
|
3cb0064835
|
Take out server start logging for now, maybe put in a more useful one later"
|
2010-12-03 11:29:49 -08:00 |
|
Raphael
|
d35badd7ea
|
Remove log rotator, it seems to be disrupting log_overrider
|
2010-12-03 11:02:28 -08:00 |
|
MrZYX
|
acc8803cee
|
try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9
|
2010-12-03 16:33:28 +01:00 |
|
MrZYX
|
dd326699bd
|
changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :)
|
2010-12-03 16:04:37 +01:00 |
|
MrZYX
|
a605ab482b
|
made sender address in notifier.rb configurable. This fixes #657
|
2010-12-03 15:49:34 +01:00 |
|
Alec Leamas
|
acb3381dc6
|
Sticking to git: urls for git repos, as we always do.
Using a single type of url means just a single type of problems ;)
|
2010-12-03 12:20:48 +01:00 |
|
danielvincent
|
7fdbc9015b
|
swapped new invitation lightbox for a proper page.
|
2010-12-03 00:57:53 -08:00 |
|
danielvincent
|
30668bf2e6
|
visual touchups
|
2010-12-02 23:19:30 -08:00 |
|
Raphael
|
7a89c1d3e4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-02 19:42:52 -08:00 |
|
Raphael
|
3ee246d873
|
Merge branch 'resque-receive'
Conflicts:
Gemfile.lock
|
2010-12-02 19:42:05 -08:00 |
|
maxwell
|
9bd77916a8
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/sass/application.sass
|
2010-12-02 19:18:21 -08:00 |
|
maxwell
|
9ad9e205a5
|
upping zindex on photo button
|
2010-12-02 19:17:26 -08:00 |
|
Raphael
|
46e49c764d
|
sorry
|
2010-12-02 19:16:52 -08:00 |
|
Raphael
|
2e87bece60
|
Final fixes for person socketing
|
2010-12-02 19:03:15 -08:00 |
|
maxwell
|
8aaedb4240
|
upping zindex on photo button
|
2010-12-02 19:02:33 -08:00 |
|
maxwell
|
579a288351
|
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
11f04a060e
|
frustrated
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
b9131c0e46
|
pushing to my website for further debugging
|
2010-12-02 18:47:48 -08:00 |
|