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
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
root
9e7d7f420f
hate text editing in nano
2010-12-02 00:57:56 +03:00
root
b1c1175c67
javascript validations for username
2010-12-02 00:54:35 +03:00
danielvincent
d392239355
removed brandongrotesque from repo, logos are now assets.
2010-12-01 11:45:54 -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
76edca1366
View fixed after rebase according to latest changes.
2010-12-01 18:23:21 +01:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +01:00
Paweł Wilk
65c796572d
Added translation scaffold for inflection of nouns by grammatical gender in some languages.
2010-12-01 17:29:04 +01:00
Paweł Wilk
279b08ae4a
Added inflection of nouns by the grammatical gender for some languages.
...
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +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
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
