Raphael Sofaer
4442319560
Merge remote branch 'ticho/followed-tags-header-bold'
2011-07-28 13:15:44 -07:00
Raphael Sofaer
37bb641227
Merge branch 'master' of github.com:diaspora/diaspora
2011-07-28 13:03:06 -07:00
Dennis Schubert
bbf28f9072
That fixes the mobile-interface for now
2011-07-28 21:45:42 +02:00
Raphael Sofaer
4fa5731d5e
Merge remote branch 'jancborchardt/1410-messages-conversation'
...
Conflicts:
app/views/conversations/new.haml
2011-07-28 12:45:40 -07:00
Raphael Sofaer
192ae3a52b
Merge remote branch 'ticho/followed-tag-listing-separate-file'
2011-07-28 12:33:14 -07:00
Raphael Sofaer
7ca1d313d6
Merge remote branch 'manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier'
2011-07-28 12:20:28 -07:00
Raphael Sofaer
d043c74528
Merge remote branch 'ticho/highlight-unread-conversations'
2011-07-28 12:17:39 -07:00
Daniel Grippi
06c08ec4d8
Merge pull request #1679 from galaxor/1662-likes-give-500
...
Likes don't return 500 errors.
2011-07-28 10:05:13 -07:00
Manuel Schölling
350752269f
added underlining for hovered tags
2011-07-28 18:20:30 +02:00
Jordi Mallach
7a55d6f974
Update Catalan translation to e4a81fb.
2011-07-28 15:14:21 +02:00
Ryan Hughes
2a187ae770
Likes don't return 500 errors.
2011-07-27 23:26:54 -07:00
Raphael Sofaer
4a1bd27728
Merge pull request #1677 from ticho/conversations-send-button-action-string-fix
...
Use "Sending..." instead of "Posting..." for new conversation.
2011-07-27 17:54:35 -07:00
Raphael Sofaer
6406de89ee
Merge remote branch 'gandaro/1602-delete-profile-photo'
2011-07-27 17:19:47 -07:00
Andrej Kacian
e4a81fbc8a
Use "Sending..." instead of "Posting..." for new conversation.
2011-07-27 23:09:05 +02:00
Andrej Kacian
cb828ae9d4
Merge branch 'master' of git://github.com/diaspora/diaspora into highlight-unread-conversations
2011-07-27 22:50:59 +02:00
MrZYX
99751af5a8
let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668
2011-07-27 22:34:41 +02:00
Andrej Kacian
cc3ba8b076
Display unread post count for conversations in inbox, if appropriate.
2011-07-27 22:33:13 +02:00
Andrej Kacian
0f6f9a4b0a
Darken the background of a conversation with unread posts in inbox, instead of lightening it (since default background color is white now).
2011-07-27 22:32:15 +02:00
Manuel Schölling
f3491c34ef
issue 1594: make tags more readable
2011-07-27 22:23:00 +02:00
Manuel Schölling
aa35d1da8f
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-27 22:22:45 +02:00
MrZYX
00b0519ed3
updated locales
2011-07-27 21:52:44 +02:00
Manuel Schölling
4ff4e222e7
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-27 21:25:32 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7b572bf40b
don't display connect to services unless services are configured on that pod
2011-07-27 00:11:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
73f9627338
moved invite people to the top
2011-07-26 23:31:42 -07:00
Dan Hansen
e8bde11a92
fix failing features
2011-07-26 21:55:52 -07:00
Dan Hansen
d94f806a50
close the lightbox when a user clicks on the backdrop
2011-07-26 20:43:35 -07:00
Manuel Schölling
d38862f91c
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-27 00:00:37 +02:00
Andrej Kacian
77a654ef47
Updated copyright year in new file
2011-07-26 19:11:02 +02:00
Andrej Kacian
2dd09cfaa2
Updated to fit current upstream master
2011-07-26 19:11:02 +02:00
Andrej Kacian
26e0442f46
Display followed tags header in bold in aspects view.
2011-07-26 19:09:37 +02:00
MrZYX
ea5db03bdf
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-07-26 18:41:47 +02:00
MrZYX
b95fd33eac
updated locales
2011-07-26 18:41:26 +02:00
Jordi Mallach
0237c54452
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-26 10:27:45 +02:00
Jordi Mallach
835005ef02
Update Catalan translation to 658e836.
2011-07-26 10:27:29 +02:00
Jonne Hass
e65dd78765
Merge pull request #1664 from ticho/i18n-make-notags-translatable
...
Make the "No tags" string translatable
2011-07-25 14:13:54 -07:00
Andrej Kacian
658e836f4c
Make the "No tags" string translatable
2011-07-25 23:09:53 +02:00
Jordi Mallach
c5e3f7a231
Update Catalan translation to 384a71b.
2011-07-25 17:03:22 +02:00
Jordi Mallach
1471500166
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-25 17:00:32 +02:00
Jordi Mallach
dcda19bc17
Update Catalan translation to e88c1510.
2011-07-25 16:53:54 +02:00
Jordi Mallach
1707612628
Add missing space.
2011-07-25 16:40:12 +02:00
Jordi Mallach
986306f03c
Fix overcapitalisation in reshare strings.
2011-07-25 16:27:29 +02:00
Jonne Hass
384a71bdc4
Merge pull request #1614 from ticho/1603-likes-i18n-fix
...
Fix for issue #1603 - use different i18n string for comment likes count
2011-07-25 07:20:24 -07:00
MrZYX
6425bdc47c
added esperanto to the available languages
2011-07-25 15:38:17 +02:00
MrZYX
47e2f70e96
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-07-25 13:25:42 +02:00
MrZYX
072e48462b
updated locales
2011-07-25 13:25:16 +02:00
MrZYX
67ffdd71aa
update rails-i18n
2011-07-25 12:54:25 +02:00
Jordi Mallach
e88c151031
Harmonise spelling of ‘email’ and capitalisation.
...
Use ‘email’ everywhere and avoid capitalisation where it’s not needed.
2011-07-25 12:37:40 +02:00
Jordi Mallach
7503b0775c
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-25 12:26:00 +02:00
maxwell
7a5852e73a
fix a bug with openssl keys in development. note to future max and
...
rafi. never monkey patch anything on the top of a completely random
model. never again. ever.
TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
2011-07-24 20:06:07 -07:00
Manuel Schölling
ae0d655d5d
Revert "Revert "Fix translation reference""
...
This reverts commit 85fde3b7a3
2011-07-24 20:41:05 +02:00
