Raphael
3ee246d873
Merge branch 'resque-receive'
...
Conflicts:
Gemfile.lock
2010-12-02 19:42:05 -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
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
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
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
cee5e4c26e
Bring in resque recipes and rake tasks
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
9aa093a0a3
api compatabile, but ugly
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
1f789e5f2b
typeof regex implemented inconsistently across browsers...sigh
2010-12-01 23:08:57 -08: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
ef89d49b1a
Revert "Added some specs for grammatical_gender (User model and Users controller)."
...
This reverts commit 1295417224
2010-12-01 22:29:19 -08:00
Dan Hansen
f81dc0fed6
remove empty specs
2010-12-01 21:25:58 -08:00
root
5d31a24e9e
fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function
2010-12-02 02:54:38 +03: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
Raphael
f0df1ec8df
Remove dev utilities controller
2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874
Fix rest of specs
2010-12-01 15:38:56 -08:00
Raphael
199eb8945d
clean up posting spec, move socket_to_uid into add_to_streams
2010-12-01 15:38:56 -08:00
Raphael
836b5685f7
Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post
2010-12-01 15:38:56 -08:00
Raphael
e63a29be64
Change v_aspect_ids to prune_aspect_ids
2010-12-01 15:38:55 -08:00
root
5cd0a60073
Moved to it's own file, added specs
2010-12-02 02:22:05 +03:00
maxwell
75caecc6a3
reset to local to english in tests
2010-12-01 12:16:21 -08:00
maxwell
7fc9d239b9
you can no longer send a request to yourself at the Request model level
2010-12-01 11:37:54 -08:00
Raphael
ef083c6770
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-01 11:21:36 -08:00
Raphael
5791ffba79
Add administrative mail method
2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations
2010-12-01 19:13:39 +01:00
Paweł Wilk
1295417224
Added some specs for grammatical_gender (User model and Users controller).
2010-12-01 18:19:48 +01:00
Josh Lubaway
ecd1d2ecd6
Bug #624 Can't unset birthday
...
This change allows users to "unset" their birthday.
Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.
Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
2010-11-30 21:23:47 -08:00
Dan Hansen & Sarah Mei
b2f4e064fc
stream.js now semi-split into functions (still needs work); specs for toggling comments
2010-11-30 16:24:11 -08:00
Raphael
a520c756ea
Fix spec
2010-11-30 16:02:14 -08:00
danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
maxwell
c5f71184be
profile now knows about three images sizes, even in federation case
2010-11-30 15:58:25 -08:00
Hexagon
160198c152
Added rake task to check pod_url and terse_pod_url
2010-11-30 15:58:25 -08:00
maxwell
fdbc7dff86
profile now knows about three images sizes, even in federation case
2010-11-30 15:56:43 -08:00
Hexagon
b15032de39
Added rake task to check pod_url and terse_pod_url
2010-11-30 15:56:43 -08:00
Raphael
366734ca5e
Take queries out of aspect contacts pane on home page
2010-11-30 15:35:32 -08:00
Raphael
57485e7093
Move aspect contacts pane js to public
2010-11-30 13:55:37 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
Hexagon
ec5145777e
Added rake task to check pod_url and terse_pod_url
2010-11-30 13:32:46 -08:00
Hexagon
c98f6f21c8
config spec now makes sense
2010-11-30 22:27:19 +01:00
danielvincent
185e84537e
fixed build
2010-11-30 13:19:25 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Hexagon
4fa3e801a8
Added rake task to check pod_url and terse_pod_url
2010-11-30 20:48:55 +01:00
