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 |
|
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 |
|
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 |
|
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 |
|
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
|
71cae6b89f
|
Move request mail into resque
|
2010-12-03 11:51:04 -08:00 |
|
maxwell
|
c43077d318
|
fixed twitter, added logging for constants, added job for local recieve
|
2010-12-03 11:34:42 -08: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 |
|
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
|
3ee246d873
|
Merge branch 'resque-receive'
Conflicts:
Gemfile.lock
|
2010-12-02 19:42:05 -08:00 |
|
Raphael
|
2e87bece60
|
Final fixes for person socketing
|
2010-12-02 19:03:15 -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 |
|
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
|
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
|
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
|
db0106f13c
|
Rename EMWebfinger to Webfinger, clean up some related things
|
2010-12-02 12:35:25 -08:00 |
|
maxwell
|
be00a2f1b3
|
webfingering is now syncrounous
|
2010-12-02 12:35:25 -08:00 |
|
maxwell
|
119599bfeb
|
Revert "Commented-on posts bubble up to the top"
This reverts commit 6da410079b.
|
2010-12-02 09:51:26 -08:00 |
|
MrZYX
|
c3356af8d1
|
mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though
|
2010-12-02 13:54:39 +01:00 |
|
Sarah Mei
|
c7b1fcc806
|
Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master
|
2010-12-01 22:53:58 -08:00 |
|
Sarah Mei
|
a09f299cfa
|
Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages."
This reverts commit 65c796572d.
|
2010-12-01 22:29:32 -08:00 |
|
Sarah Mei
|
967fcd9a52
|
Revert "Added genderized variants of t() to views, controllers and helpers."
This reverts commit 017251fef9.
|
2010-12-01 22:29:24 -08:00 |
|
Sarah Mei
|
d6e8873b64
|
Revert "View fixed after rebase according to latest changes."
This reverts commit 76edca1366.
|
2010-12-01 22:29:04 -08:00 |
|
Dan Hansen
|
d76ae86180
|
|
2010-12-01 22:13:15 -08:00 |
|
Dan Hansen
|
f3e3e0f344
|
|
2010-12-01 22:12:57 -08:00 |
|
maxwell
|
e18b918676
|
MS DG only show three comments by default
|
2010-12-01 18:09:41 -08:00 |
|
danielvincent
|
ee47a2ffda
|
fixed diaspora logo asset on landing page
|
2010-12-01 16:18:13 -08:00 |
|
Raphael
|
6da410079b
|
Commented-on posts bubble up to the top
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
8d853a88a3
|
Remove some old views, clean up routes, clean up.
|
2010-12-01 15:38:56 -08:00 |
|