Raphael
e9ec8cea05
Update nginx conf
2010-12-02 12:35:26 -08:00
Raphael
edf703aa78
Correct resque run line
2010-12-02 12:35:26 -08:00
Raphael
952888713f
Finish daemontools lines for resque
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
danielvincent
8cb2a3a79a
resque init, config, gemfile
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
Alec Leamas
732bde1834
Pkg update
2010-12-02 21:03:21 +01:00
maxwell
119599bfeb
Revert "Commented-on posts bubble up to the top"
...
This reverts commit 6da410079b
2010-12-02 09:51:26 -08:00
Alec Leamas
308c653945
Cleaning up db:first_user patch.
...
Removing duplicated reset task (what happened?). Hate long lines.
Let user.rb handle all error checks. Clean up.
2010-12-02 15:24:10 +01: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
Alec Leamas
1a8e0788c2
Add rake task db:first_user.
...
Purges database and adds a user without development dependencies.
Closes http://bugs.joindiaspora.com/issues/548 . Note error handling
for User.build...
2010-12-02 12:00:44 +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
9adadd39fe
new versions of lots o' stuff
2010-12-01 22:49:20 -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
d5c32b6a56
Revert "Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender)."
...
This reverts commit eb2d186a12
2010-12-01 22:29:27 -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
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
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
Dan Hansen
f81dc0fed6
remove empty specs
2010-12-01 21:25:58 -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
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
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
maxwell
75caecc6a3
reset to local to english in tests
2010-12-01 12:16:21 -08: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
Hexagon
3268e556ed
Merge branch 'cuke-features' of https://github.com/sentientwaffle/diaspora into sentientwaffle-cuke-features
2010-12-01 18:27:44 +01:00
Paweł Wilk
76edca1366
View fixed after rebase according to latest changes.
2010-12-01 18:23:21 +01:00
Paweł Wilk
1295417224
Added some specs for grammatical_gender (User model and Users controller).
2010-12-01 18:19:48 +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
eb2d186a12
Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender).
2010-12-01 17:29:04 +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
