MrZYX
78eebc8920
fixed #935
2011-03-17 16:59:02 +01:00
Jordi Mallach
57aa8e71bf
Updated Catalan translation to a787106.
2011-03-17 15:57:12 +01:00
Jordi Mallach
25691ac8b2
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-03-17 15:45:27 +01:00
Jordi Mallach
f7391ca7ae
Fix some leftovers thanks to MrZYX's diff-yml-keys.py.
2011-03-17 15:42:14 +01:00
MrZYX
c661bce988
updated locales
2011-03-17 15:23:34 +01:00
MrZYX
a78710690a
moar translations
2011-03-17 15:11:24 +01:00
Jordi Mallach
4ee9642d02
Correct indentation and re-add requests & message_inbox tags.
2011-03-17 14:44:10 +01:00
Jordi Mallach
a2da1240b8
Adding "1" to notification message.
2011-03-17 14:34:53 +01:00
MrZYX
5a8ba0e805
fixed syntax errors in ca.yml
2011-03-17 14:31:14 +01:00
Jordi Mallach
5c9370f2e0
Two of the keys are verb, not noun. Adapt accordingly.
2011-03-17 14:16:25 +01:00
Jordi Mallach
a03238ec40
Fix typo.
2011-03-17 13:45:02 +01:00
Jordi Mallach
e8a3537520
Updated Catalan translations to 6a33ae7.
2011-03-17 13:44:13 +01:00
Jordi Mallach
7b93c0a64b
Adapt Catalan translation to the reformatting of ed8d4db. Hopefully
...
everything is correct, but it wouldn't be surprising if something has been
overlooked.
2011-03-17 13:04:37 +01:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e
moved the fixture to the right place
2011-03-16 18:10:50 -07:00
danielgrippi
e9c094fc2f
add styling on tag header
2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
Kiran Soumya
6d113da242
Bug Fix:868 for Users unable to download photos
2011-03-17 01:14:05 +05:30
MrZYX
5457f48c2a
updated locales
2011-03-16 16:11:51 +01:00
MrZYX
e7b4d4e494
the build was failing for a reason
2011-03-16 15:40:56 +01:00
danielgrippi
09756c17c1
change tags to #tags in translations
2011-03-15 22:19:31 -07:00
danielgrippi
20b5ca7570
added tag helper text on profile, edit on hover
2011-03-15 22:10:20 -07:00
Raphael Sofaer
7636fec270
Fix select in postscontroller
2011-03-15 18:36:27 -07:00
danielgrippi
68479481cf
made websockets far less dumb. don't render partials for people not connected.
2011-03-15 18:21:09 -07:00
maxwell
1164303251
do not call a remote job if their are no remote subscribers
2011-03-15 17:49:43 -07:00
danielgrippi
9115a8f1f5
Only show searchable people in postscontroller
2011-03-15 16:22:17 -07:00
danielgrippi
8c7ad9a0a3
Remove unused receive local job
2011-03-15 16:13:09 -07:00
danielgrippi
4943531013
Add stream class to side_stream
2011-03-15 15:20:02 -07:00
danielgrippi
67de069469
Inline the person partial on posts index
2011-03-15 15:13:43 -07:00
danielgrippi
be42ccfa16
Be less glib
2011-03-15 15:03:20 -07:00
danielgrippi
39b8fed431
Change includes aspects to joins aspects
2011-03-15 15:00:17 -07:00
MrZYX
4e4e4d763a
fixed translations
2011-03-15 21:58:15 +01:00
danielgrippi
3bbc766abc
fixed cucumber tests
2011-03-15 13:38:13 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb
a user can put tags in their profile and they show up on the person/show page.
2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
MrZYX
00bb5167f8
fixed spec
2011-03-15 18:35:27 +01:00
MrZYX
73f852c6c2
fixed video embedding in comments
2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a
fixed some 500 on mobile site
2011-03-15 17:02:04 +01:00
MrZYX
cf66e3aebb
fixed test in invitation email
2011-03-15 16:25:47 +01:00
MrZYX
879aa9eb4a
updated locales
2011-03-15 16:03:45 +01:00
MrZYX
09ba0c8d00
made catalan translation usable again
2011-03-15 15:52:42 +01:00
Ritchie Wilson
81661d61fc
changes the 'You are not sharing with...' button to static text instead of inserting the persons name
2011-03-15 10:00:15 -04:00
maxwell
a419ddac11
make sure audio player does not delete sm text
2011-03-14 18:20:03 -07:00
maxwell
2e72fc09c6
made 3+ plus collapse in notifications index
2011-03-14 18:09:51 -07:00
Raphael Sofaer
1666843aa9
Fix 500 in publicsController
2011-03-14 16:48:07 -07:00
Raphael Sofaer
ae22dcc274
Fix jasmine spec
2011-03-14 12:37:20 -07:00
maxwell
b14ac9606f
fix typo, puts in a test, and made the emails types a constant in UserPreferences
2011-03-14 12:21:30 -07:00
