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
Raphael
4f3d031e89
Always set translations
2010-11-30 15:58:25 -08:00
Raphael
f2cb43bb4e
Take queries out of aspect contacts pane on home page
2010-11-30 15:58:07 -08:00
Raphael
3dc3efc103
Move aspect contacts pane js to public
2010-11-30 15:57:32 -08:00
Raphael
d733d2c3bf
Take out print statements
2010-11-30 15:51:37 -08:00
Raphael
bfcae7fd80
Always set translations
2010-11-30 15:44:27 -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
Raphael
a683512e6e
Take queries out of reshare
2010-11-30 13:31:48 -08:00
danielvincent
fa66162de5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/helpers/application_helper.rb
app/views/comments/_comment.html.haml
app/views/people/_person.html.haml
app/views/shared/_stream_element.html.haml
2010-11-30 13:19:17 -08:00
Raphael
f44b02e22c
Clean up people/person
2010-11-30 13:07:02 -08:00
Raphael
93bbfd19d2
Move back to image link helper, but static
2010-11-30 13:07:02 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Maxwell Salzberg
7bce44ef28
remove brandon from author_info
2010-11-30 12:30:36 -08:00
Raphael
b5ed2ec5b0
Actually use the photos set in the controller
2010-11-30 12:25:56 -08:00
Raphael
49e8347aa3
Use static helper for aspect links
2010-11-30 12:23:43 -08:00
Raphael
b84d2bcc56
Don't use owns? in streamelement
2010-11-30 11:58:41 -08:00
Raphael
b0522535ac
Take queries out of reshare
2010-11-30 11:43:27 -08:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
maxwell
2d3f2df1fd
dont use object_path
2010-11-29 19:57:20 -08:00
