Commit graph

53 commits

Author SHA1 Message Date
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
8c8ff1f8b8 there's no need anymore to specify all possible pluralization keys unless there are other keys alongside them 2012-06-24 12:43:15 +02:00
movilla
bca5d3ffa7 Translation "[X] Close" photo-post 2012-05-05 14:39:58 +02:00
movilla
4d3ba4f274 Little traslation "HOME" /post 2012-05-01 17:43:51 +02:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
Florian Staudacher
0dee8aae36 [reshares] display flash message instead of just appending it to the stream (fixes #2094) 2012-04-27 00:57:20 +02:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a change language around explore/participate. 2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e Bring the likes back. Ditch the pins.
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
danielgrippi
398ca3d97b Participate / Explore have been upgraded to top-level status. 2012-02-09 14:29:01 -08:00
Maxwell Salzberg
d06ccb9ba9 first pass at strickly user level rename from like => pin. still need to update assets 2012-02-01 12:57:07 -08:00
Jonne Haß
ca87a3f9ea add two to the javascript pluralizations 2012-01-14 16:43:35 +01:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23:27 -08:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
Raphael Sofaer
609894fb70 Fix personalized, closing #2308. Thanks Pistos. 2011-11-03 15:20:58 -04:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)"
This reverts commit 3d8f971ca9.
2011-10-27 23:53:55 -07:00
danielgrippi
f7afcd96b4 that good, huh? 2011-10-27 20:16:42 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Jonne Hass
2addd32274 shit we violoated the LDML
close #1920

* added two to pluralizations, see
  http://www.unicode.org/reports/tr35/tr35-21.html#Language_Plural_Rules
* updated pluralization rules to CLDR 2.0.1
2011-09-08 02:00:46 +02:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
Jordi Mallach
1707612628 Add missing space. 2011-07-25 16:40:12 +02:00
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
danielgrippi
402e84708b ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug 2011-05-13 16:05:37 -07:00
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
Dan Hansen
d28a2cdb1e Show the user that the websocket connection has been closed and posts will no longer socket in 2011-04-27 16:50:23 -05:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05: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
MrZYX
ece7cddc51 added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture 2011-02-18 17:22:19 +01:00
zhitomirskiyi
7241177421 translating the warning about removing the person from the last aspect 2011-02-08 15:44:12 -08:00