Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
danielvincent
cdd225c076
don't show new comment form on a non-contact's post
2010-12-08 18:23:30 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
maxwell
d6c5a88836
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 14:34:31 -08:00
maxwell
1f8f07f48d
added slightly better error message on aspect update failure
2010-12-08 14:21:14 -08:00
maxwell
3dbb80bf9f
added slightly better error message on aspect update failure
2010-12-08 14:14:49 -08:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
Raphael
f421f1327c
Take nested queried out of aspects manage
2010-12-07 00:21:05 -08:00
Raphael
9442553504
Refactor aspectscontroller and aspect_contacts.haml
2010-12-06 17:20:21 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
Raphael
3ef5ac5252
Add some specs to Invitation, use I18n in InvitationsController
2010-12-05 14:37:43 -08:00
MrZYX
4df13d56e1
made that latest change translatable
2010-12-05 16:02:52 +01:00
maxwell
53b38a3bca
fixing p-controller for real
2010-12-05 00:52:45 -08:00
maxwell
65c22020e8
fixing photo controllers spec
2010-12-05 00:45:13 -08:00
maxwell
2c09c35425
MS DG photos now delete sm if they are empty status messages, and status messages delete their photos
2010-12-05 00:45:13 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
Michael Sofaer
9e575ea765
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
2010-12-04 19:36:22 -08:00
Sarah Mei
fea6884acc
Mobile homepage looks decent.
2010-12-04 19:30:14 -08:00
maxwell
e47730b63f
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 17:39:19 -08:00
Michael Sofaer
3ca89bde57
Put photos create spec back in. I am not going to check who left it pending.
2010-12-04 17:18:08 -08:00
maxwell
b9ab799569
ironing out invites
2010-12-04 16:49:45 -08:00
maxwell
b300adbef5
fixed a potentially bad bug with nil invite tokens
2010-12-04 16:13:44 -08:00
maxwell
8306cfffde
add token back to invite form
2010-12-04 16:03:35 -08:00
danielvincent
177cc16e2f
fixed the build
2010-12-04 14:26:13 -08:00
danielvincent
34a1a35bf1
skip getting started is not ajaxy
2010-12-04 12:06:08 -08:00
maxwell
7dce94814c
fixing the invite user job
2010-12-03 22:41:16 -08:00
maxwell
0a831cfbf4
invites are now on the queue
2010-12-03 19:33:54 -08:00
maxwell
b8ece9381a
fixing up public image show
2010-12-03 15:48:27 -08:00
maxwell
c43077d318
fixed twitter, added logging for constants, added job for local recieve
2010-12-03 11:34:42 -08:00
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
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
maxwell
2fbf2ddd6f
you dont have a pending request from everyone
2010-12-02 16:09:55 -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
db0106f13c
Rename EMWebfinger to Webfinger, clean up some related things
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
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
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
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
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
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +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
