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 |
|
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 |
|
maxwell
|
38d9d75162
|
posts now have public permalinks
|
2010-12-02 18:47:48 -08:00 |
|
danielvincent
|
756824d072
|
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
|
2010-12-02 18:42:21 -08:00 |
|
danielvincent
|
6c05d01177
|
enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.
|
2010-12-02 17:36:46 -08:00 |
|
Raphael
|
3c7172822e
|
Require files needed for socketing from resque worker
|
2010-12-02 17:27:41 -08:00 |
|
Raphael
|
2ec5fae2e8
|
Require needed files for resque-worker
|
2010-12-02 16:56:14 -08:00 |
|
maxwell
|
2fbf2ddd6f
|
you dont have a pending request from everyone
|
2010-12-02 16:09:55 -08:00 |
|
Raphael
|
07fdabbbd4
|
Seperate queues for jobs
|
2010-12-02 15:34:54 -08:00 |
|
Raphael
|
8798f05ff7
|
Revert "Revert redis merge to fix bugs on master"
This reverts commit 30698d674b.
|
2010-12-02 15:33:26 -08:00 |
|
Raphael
|
3688b3982f
|
message queue should follow redirects
|
2010-12-02 15:23:26 -08:00 |
|
Raphael
|
30698d674b
|
Revert redis merge to fix bugs on master
|
2010-12-02 15:20:27 -08:00 |
|
maxwell
|
7f5dc14726
|
fix dup comment showing with comments with more than three, also fixed veribage
|
2010-12-02 15:18:54 -08:00 |
|
Raphael
|
93da0ddd25
|
Add magent back in, still need to work out environment problems with resque workers
|
2010-12-02 13:18:35 -08:00 |
|
Raphael
|
4b43eaef6b
|
Port 7894 for resque web client. HTTP basic looks in /usr/local/nginx/conf/htpasswd for user:pass.
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
236fbc7cc7
|
Final adjustments to fix resque worker
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
c76f38ca23
|
Write webfinger job for search
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
6cfa6577a5
|
Add first resque job
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
0b5bf40a8d
|
Finish resque-web run line
|
2010-12-02 12:35:26 -08:00 |
|