Commit Graph

741 Commits

Author SHA1 Message Date
pinfort 38e24a699b fix Japanese translation (#1623)
* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx

* fix translations
翻訳の誤りの修正と改善

* freeの訳修正

* いいねをお気に入りに統一

* Revert "いいねをお気に入りに統一"

This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f.
間違ってtranslateブランチにコミットしたため取り消し

* Revert "freeの訳修正"

This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf.

* revertでミスったので戻す

* Revert "ミスったので戻す"

This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing
changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116.

* freeの訳修正

* いいねをお気に入りに統一

* 一回戻す

* 戻しきれてなかった

* 再度変更

* 戻す

* 再度変更

* 再度変更

* Update doorkeeper.ja.yml

Fixed a lot of unnatural translations

* Update ja.yml

資格情報 isn't easy to understanding. so fixed to ログイン情報.

* Update ja.yml

fixed some unnatural translations

* Update simple_form.ja.yml

Fixed wrong translate 「アカウント」 to 「アイコン画像」

* Update simple_form.ja.yml

* Update doorkeeper.ja.yml

* Revert "多くの不自然な翻訳を解消しました。"

* Update ja.jsx

fixed typo

* 文字化け修正
2017-04-12 20:19:38 +02:00
goofy-bz 9b698bf448 Update fr.jsx (#1551)
fixing to minor typos
2017-04-12 20:11:09 +02:00
karlyeurl dab9b5bd3a locale-fr: fix typo (#1603)
In this case, the adjective applies to a feminine noun.
2017-04-12 19:54:16 +02:00
Rachel H 0930ce5560 Focus textarea when text is inserted (#1320)
Place space after uploaded filenames
2017-04-12 18:21:07 +02:00
Carlos A. Escobar 3064ef96a1 Added missing Spanish translations strings (#1292)
* Added missing Spanish translations strings

* fix bad translation

* resolve conflict with tootsuite/master

* agreements from spanish community

* Add some missing strings
2017-04-12 17:16:40 +02:00
lindwurm ee69ece7b5 [web] Moving docs link to tootsuite/documentation (#1581)
related: 1236529e39 and fc47c1d00e

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12 17:13:19 +02:00
Thor Harald Johansen 1f5ff46fd9 Working translation for Norwegian. (#1611) 2017-04-12 17:07:51 +02:00
Koala Yeung 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby

* Added translations for Ruby.

* Added Chinese Traditional Hong Kong (zh-HK) for JS

* Added translations for javascript code.

* Rearrange language references in mastodon.jsx

* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).

* Sort application.rb locale with alphabetical order

With exception that English (default language) goes first.
Improve code readability.

* Resort language selection box alphabetically

Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).

Improve usability.
2017-04-12 08:50:50 +02:00
Eugen 8ead070b94 Improve emoji picker look (#1493)
* Improve emoji picker look

* Add hover animation to emojis in picker
2017-04-11 23:23:34 +02:00
Eugen b22b2cbfac Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548) 2017-04-11 22:53:58 +02:00
Henry Smith 1921c5416b Fix console error when scrolling a column with no scrollable content (#1574) 2017-04-11 21:58:28 +02:00
Thomas Citharel 327a6e166f Update french locale (#1525)
* Update devise.fr.yml fixing minor typos

* add missing strings

* Fix a translation and add translation for devise part

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-11 21:54:40 +02:00
pinfort 6f5268b02d Add Japanese translation (#1552)
* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx
2017-04-11 21:52:09 +02:00
Eugen Rochko 960181fd99 Fix look of the modals 2017-04-11 21:24:17 +02:00
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-04-11 20:43:56 +02:00
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences 2017-04-11 10:10:16 -04:00
blackle f53fb6aa66 Bypass boost confirm modal if alt is pressed 2017-04-11 08:34:14 -04:00
blackle 01e5447e35 Add boost confirm modal 2017-04-10 22:35:55 -04:00
Eugen 12f72e1740 When avatar/header are GIF, generate static versions (#1428)
* When avatar/header are GIF, generate static versions.
Account API returns "avatar"/"avatar_static", "header"/"header_static"
Static version is the same as original for other cases
Web UI de-animates avatars in toots, lists of users

Fix #441, fix #596, prerequisite for #1064

* Fix JS test

* Add rake task to generate static avatars/headers from GIF ones, add test
2017-04-11 00:38:58 +02:00
Matthias Jouan 3fd5385e7b Add username as a title for mentions (#1385)
Add a title attribute on mention links for both notifications
and mentions in statuses.

Related to #1350
2017-04-11 00:35:35 +02:00
Eugen 2810013b93 API param to exclude notification types from response (#1341)
* Add exclude_types param to /api/v1/notifications

* Exclude notification types in web UI through exclude_types in the API
2017-04-10 23:45:29 +02:00
Chris Martin ae57b3a8c5 Add more specific class names to notification divs (#1120) 2017-04-10 22:41:52 +02:00
Rachel H f690320fb9 Keep newlines in xml (#1397) 2017-04-10 21:32:45 +02:00
Stephen Burgess 553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434) 2017-04-10 21:31:26 +02:00
Jessica Stokes 8a6096a3de Allow typing a toot while an image uploads (#1429)
This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! 
2017-04-10 21:30:58 +02:00
Jessica Stokes db7c7d1af1 Improve scrolling behaviour (#1415)
* Replace column margin with padding

This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird.

* Move clear column button styling to css
2017-04-10 16:27:30 +02:00
Ratmir Karabut 9043b32183 Add Russian translation (ru) (#1023)
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency
2017-04-10 12:52:06 +02:00
Gavin Mogan 8bdf02812c Add search to emoji picker (#1395) 2017-04-10 09:58:09 +02:00
Hugo Gameiro 4ea4ef9d0f update portuguese translation (#1280)
added the missing fields and improved the translation
2017-04-09 18:49:26 +02:00
StefOfficiel 12e29c9660 Update fr.jsx (#1329)
* Update fr.jsx

* Remove duplicate translation
2017-04-09 14:58:08 +02:00
Jonathan Klee ba2aea3a80 add empty notifications french translation (#1111) 2017-04-09 14:54:02 +02:00
Rachel H b1881a3d48 Fix nonworking clear notices button (#1316) 2017-04-09 11:35:23 +02:00
Thomas Citharel 41f8fde83e Update french translation (#1148)
Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-08 13:11:16 +02:00
Markus Amalthea Magnuson 157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101) 2017-04-08 13:07:55 +02:00
Nicolai von Neudeck c803f5b440 Updated German translation (#1248)
Fixed various spelling and grammar mistakes.
Used more gender-neutral language.
2017-04-08 13:04:58 +02:00
Alda Marteau-Hardi 35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230) 2017-04-08 12:16:16 +02:00
André Lewin bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
JantsoP 20b53e6add Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoP b8a867adcc updated translation
Updated some translations after seeing them in service. Should be better now
2017-04-05 09:56:10 +02:00
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder 2017-04-04 20:54:42 +02:00
JantsoP 10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
halna_Tanaguru 3abb0f7bc7 Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
JantsoP db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP b8243c1b49 changed line 25 for better translation 2017-04-04 08:26:59 +02:00
halna_Tanaguru 3f30ae1f97 accessibility fix
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
David Baumgold 5652f00d81 GitHub should be capitalized 2017-04-03 11:44:11 -04:00
JantsoP a229840ffe fixed typo 2017-04-03 14:16:03 +02:00
JantsoP bfa99981e5 Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP 22f88b845a add finnish translation
add finnish translation
2017-04-03 13:33:43 +02:00
JantsoP eabb86b124 add finnish language
add finnish language
2017-04-03 13:32:10 +02:00
JantsoP 69fc95a2f5 Create Finnish translation for Mastodon
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
Marvin Kopf 1236a12cae add mute option in status dropdown 2017-04-03 10:44:08 +02:00
Eugen d2358aefec Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Kazhnuz c76d20c2a0 Add forgotten comma 2017-04-02 23:39:41 +02:00
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Kazhnuz 633e5ec6f6 Update French Translation 2017-04-02 23:18:01 +02:00
Eugen 09b4b65fde Merge pull request #740 from 0x70b1a5/master
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales
Improve/add some French locales
2017-04-02 22:22:44 +02:00
Eugen Rochko a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
button would be displayed in account lists for unloaded relationships
2017-04-02 22:02:38 +02:00
Eugen Rochko aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant
refreshes on navigation
2017-04-02 21:44:06 +02:00
Tobias Merkle f25fc04ea1 single-quotes 2017-04-02 14:55:13 -04:00
Tobias Merkle ca21be3e16 remove black border on buttons 2017-04-02 14:54:24 -04:00
Eugen Rochko 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
2017-04-02 16:45:49 +02:00
Eugen Rochko e809caa0e1 Fix feed regeneration bug 2017-04-02 15:46:31 +02:00
Damien Erambert 3ed75efc31 Add fr locale for community_timeline in fr.jsx 2017-04-01 23:45:53 -07:00
Tobias Merkle ae43978433 improve video button visibililty 2017-04-01 21:02:30 -04:00
Eugen Rochko a8c2e44fee Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko 60ebfa182f Made modal system more generic 2017-04-01 22:11:28 +02:00
Eugen Rochko 13dfd8d109 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko d93d6f5124 Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen Rochko b4046c5957 Rework search 2017-03-31 21:11:09 +02:00
shel f20f6b25b9 Merge branch 'master' into patch-2 2017-03-31 10:34:14 -04:00
Eugen Rochko 680f9efe9c Fix web UI profile clickable area overlapping with follow button area 2017-03-31 14:23:44 +02:00
Eugen Rochko 5e26295e06 Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko bf61bc1b96 Fix drag & drop overlay flickering 2017-03-31 11:48:25 +02:00
Eugen Rochko 333e44c3fc Improve emojis - use SVGs where possible 2017-03-29 22:27:24 +02:00
Eugen Rochko bb7006bda1 Hide drag & drop area on drop event regardless of success 2017-03-28 14:17:24 +02:00
shel 76188d61f2 Clarify post privacy warning
I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users.
2017-03-26 12:49:14 -04:00
Eugen Rochko c334541011 Add tooltip to privacy dropdown 2017-03-26 13:30:57 +02:00
Eugen Rochko 6ec6fe259a Compose form layout fixes 2017-03-26 13:08:15 +02:00
shel c66dc0d114 Clarify privacy options
Descriptions of differences between scope are more clear
2017-03-25 19:59:38 -04:00
Eugen Rochko 1fd88e3bad Fix up visual indicators for compose form privacy 2017-03-25 20:24:30 +01:00
Eugen Rochko a9303e7062 When replying to status with content warning, prefill content warning 2017-03-25 19:30:56 +01:00
Eugen Rochko bd1ceb1daa Privacy dropdown i18n 2017-03-25 19:22:24 +01:00
Eugen Rochko d8c5a83827 Redesigned compose form 2017-03-25 19:14:12 +01:00
Eugen Rochko d7c6c6dbe1 Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295) 2017-03-24 03:55:45 +01:00
Eugen Rochko 5aa3df017b Fix full-text search query quotation, improve tag search performance with an index,
add ability to open status by URL from search (fix #53)
2017-03-22 17:36:34 +01:00
Eugen Rochko 88f32708c3 Web UI support for the new omnisearch 2017-03-22 04:09:28 +01:00
Eugen Rochko 8aae42f3d8 German toot -> "tröt" 2017-03-22 03:22:44 +01:00
shel 38dceb3bf7 Promote Apps (#670)
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
Eugen Rochko 74ae158c2f Add "direct" visibility level in the backend. Web UI is not yet
adjusted to allow choosing it, yet
2017-03-15 22:55:45 +01:00
Eugen Rochko 952bce3023 Replace howler.js with simple <audio />, will hopefully resolve
some weird mobile browser behaviours
2017-03-13 17:12:30 +01:00
Eugen Rochko 47bf592db7 Try to detect iOS and *not* autoplay any videos
Technically the check for iOS from components is a side effect, because it's
neither in state nor props, but the user agent does not change, so I think
that's okay.
2017-03-07 09:54:57 +01:00
Eugen Rochko 07b166af64 Make gifvs always use media gallery component 2017-03-05 02:04:31 +01:00
Eugen Rochko caf5b8e975 Fix #431 - convert gif to webm during upload. Web UI treats them like it did
before. In the API, attachments now can be either image, video or gifv. Gifv
is to be treated like images in terms of behaviour, but are videos by file
type.
2017-03-04 23:02:24 +01:00
Eugen Rochko 5d100293fb Rename "the whole known network" timeline to "federated timeline"
Remove note about following Gargron@mastodon.social from getting started text
2017-03-04 00:19:18 +01:00
Eugen Rochko 4690236724 Make confirmation text more specific 2017-03-02 19:25:11 +01:00
Eugen Rochko b9345b3fc6 Fix #620 - Add confirmation dialog for notifications clear 2017-03-02 19:24:12 +01:00
Eugen Rochko c64a1c25c4 Fix #231 - Muting 2017-03-02 18:49:32 +01:00
Kit Redgrave 442fdbfc53 Mute button progress so far. WIP, doesn't entirely work correctly. 2017-03-01 22:31:21 -06:00
Eugen Rochko 89fc2d7f48 Fix #372 - Emoji picker 2017-03-02 00:57:55 +01:00
Eugen Rochko 95ebfa5610 Simplify passing of prop 2017-03-01 13:57:30 +01:00
Eugen Rochko 1fa2e7cc86 Merge branch 'mastodon-paste-support' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-paste-support 2017-03-01 13:54:52 +01:00
Kibigo 91c79f2445 Better smart/dumb component separation 2017-03-01 02:56:15 -08:00
Kibigo 5f6f7aaa27 Making the back button a little smarter 2017-02-28 22:24:34 -08:00
Kibigo e84c1dc95f Support for pasting images from clipboard 2017-02-28 18:52:46 -08:00
Eugen Rochko 5960bac11e Fix incorrect detection of local vs remote user in web UI 2017-03-01 02:00:21 +01:00
Eugen Rochko 3208979655 Fix typo 2017-03-01 01:57:48 +01:00
Eugen Rochko fbdb3bcf1e Revert infinite scroll in timelines back to looking at ID of oldest
loaded status; do not preload submitted statuses into community/public
timelines, unless those timelines have already been loaded; do not
close streaming API connections for community/public timelines, once
they have been established (most users navigate back to them eventually)
2017-03-01 01:43:29 +01:00
Eugen Rochko e1b00757a6 Fix #291 - Add visual indication that numbers for remote users may be inaccurate 2017-03-01 01:18:34 +01:00
Eugen Rochko 92569b1f0d Improved dropdowns 2017-03-01 00:53:11 +01:00
Eugen Rochko 955e9088d7 Fix #561 - Detect presence of audio in video, hide mute toggle when none 2017-02-28 23:48:41 +01:00
Eugen Rochko d180aaa2a7 Fix #186 - Add RTL support to the compose form textarea and statuses output 2017-02-28 01:52:31 +01:00
Kibigo 4d2af0d664 Character counter fix 2017-02-27 04:32:41 -08:00
Eugen Rochko 4fbdf100c4 Add <MissingIndicator /> when status or account are not found, skip alerts
for those errors
2017-02-26 23:06:27 +01:00
Eugen Rochko 4bb8ff7c8e Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626 2017-02-26 22:44:31 +01:00
Eugen Rochko b44dd38360 Fix broken dependency on inner react utility function 2017-02-26 01:34:56 +01:00
Eugen Rochko e2209e1104 Fix local timeline showing unread status of TWKN timeline 2017-02-26 01:27:22 +01:00
Eugen Rochko 2c50687279 Improve compose form performance, upgrade JS dependencies. LightingBox
now allows to cycle through multiple images
2017-02-26 01:23:44 +01:00
Eugen Rochko 9d4cad6307 Improve glow 2017-02-23 02:14:35 +01:00
Eugen Rochko c96fd24f48 Improve status reselect, do not display "load more" when no next link available 2017-02-22 16:30:09 +01:00
Eugen Rochko 974d712fbe Improve performance of compose form 2017-02-22 15:43:07 +01:00
Eugen Rochko 5997bb47a8 Fix #38 - Unread indicator when new content appears above the fold 2017-02-21 00:10:49 +01:00
Eugen f338cc6c94 Fix scroll to top not registering because of wrong debounce usage 2017-02-20 19:01:47 +01:00
Eugen Rochko e8ea9669c9 Fix links and wording 2017-02-19 22:42:38 +01:00
Eugen Rochko 6b4ef92c6f Adjust naming of public timeline -> "local timeline" vs "whole known network" 2017-02-19 21:49:14 +01:00
Eugen Rochko c50256d25c Fix infinite scrolling breaking after navigation 2017-02-19 21:37:04 +01:00
Eugen Rochko 4aa5ebe591 Split public timeline into "public timeline" which is local, and
"whole known network" which is what public timeline used to be

Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed
2017-02-19 20:25:54 +01:00
Rakib Hasan dfd4a42b35 added if else clause in fetchContext
So that if we get an error, then we will
only delete status if it is an 404 error
2017-02-19 10:55:22 +00:00
Rakib Hasan 910df0f795 Removing dispatch of fetchContextFail
No need to flash error message when status is not found.
The column will display the message "status not found"
2017-02-19 08:21:45 +00:00
Rakib Hasan 8e760d5f62 adding new react class StatusNotFound 2017-02-19 08:21:37 +00:00
Rakib Hasan 9e0dbb7337 Fixing issue #626
The status is not showing anymore after clicking on it
2017-02-19 08:21:05 +00:00
Eugen Rochko 9e99b8c068 Fix #642 - Add "empty column" text to home/notifications 2017-02-18 02:37:59 +01:00
shel 6a6d8f60c4 Add target="_blank" to github link
This makes so clicking the link to the github opens in a new tab or windows.

I just keep getting frustrated clicking the link to github and then losing my place in my home timeline >_> that's all
2017-02-17 14:50:50 -05:00
nicolas ca57f17d3d French translation update 2017-02-17 10:27:00 +01:00
Eugen Rochko a1e96ae94f Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening
Fix issue with detailed status view not supporting unreblogging/unfavouriting
2017-02-17 02:33:10 +01:00
Eugen Rochko dbd80465c8 Fix small styling issues 2017-02-17 02:05:15 +01:00
Eugen Rochko 8b16f81882 Close dropdown when clicking items 2017-02-17 01:44:06 +01:00
Eugen Rochko 0cbf3a146f Speed up/optimize loading of statuses, context and cards by not re-fetching what is already loaded 2017-02-17 01:34:37 +01:00
Eugen Rochko 8132cf8153 Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
Make replies default to privacy settings of the status being replied to
2017-02-17 01:30:24 +01:00
Eugen Rochko 0a2427f79b Fix #634 - Only include innermost-level statuses in report UI
Fix #635 - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses
2017-02-15 00:01:52 +01:00
Eugen Rochko 3b81baaaaf Adding POST /api/v1/reports API, and a UI for submitting reports 2017-02-14 20:59:26 +01:00
Eugen Rochko ec521e6bfc Add remote mentions warning when composing a private status 2017-02-13 18:38:00 +01:00
Eugen Rochko 2ab7bd13e2 Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5 2017-02-13 17:22:40 +01:00
Eugen Rochko 677e95031e Clean up collapsible components 2017-02-13 17:20:18 +01:00
shel 968fae2603 Add privacy disclaimer
I haven't had a chance to test this, because I don't currently have a fully functioning computer I can set up a dev-environment on, but this *should* make it so when a user toggles a post to be private, a disclaimer appears clarifying what "private" really means.
2017-02-11 17:42:19 -05:00
shel 3893ff1604 Add privacy disclaimer
Add variable for text of privacy disclaimer
2017-02-11 16:47:01 -05:00
Eugen Rochko 5c4c046132 Finish up moving colors from JSX to Sass (#584, #348) 2017-02-10 22:58:29 +01:00
Eugen 73e388e0d8 Merge pull request #617 from halcy/style-changes
Style changes
2017-02-10 19:10:15 +01:00
Lorenz Diener cbb962fd77 Move more colours to scss 2017-02-10 16:30:06 +00:00
Lorenz Diener c9f42a7b85 Move more inline colours to scss 2017-02-10 15:35:19 +00:00
Eugen Rochko 6331ed16e5 Fix #614 - extra reply-boolean on statuses to account for cases when replied-to
status is not in the system at time of distribution; fix #607 - reset privacy
settings to defaults when cancelling replies
2017-02-09 20:25:39 +01:00
Eugen Rochko c424df5192 Progress on moving color styles to Sass 2017-02-09 01:20:09 +01:00
Isabelle Knott 1d273e4430 Change blocked users icon to fa-ban in getting started view (#608) 2017-02-07 23:48:50 +01:00
Eugen Rochko 02e91a96dd Make streaming API use one pattern-matching redis pubsub connection
Refresh timelines when streaming API reconnects in the UI
2017-02-07 14:39:08 +01:00
Eugen Rochko 8a081ce588 Fix wrong prediction of whether toot will apear on public timeline in UI 2017-02-07 00:40:35 +01:00
Eugen Rochko ac035108aa Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines 2017-02-07 00:06:40 +01:00
Eugen Rochko c8252759df Add streaming API channels for local-only statuses 2017-02-06 23:46:14 +01:00
Eugen Rochko 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
Eugen Rochko 0af3401553 Don't allow people to follow people they blocked without unblocking first 2017-02-05 21:04:22 +01:00
Eugen Rochko eee8afb0b7 Remove bios from blocked users list, filter out broken entries from API response 2017-02-05 19:39:00 +01:00
Eugen Rochko c5a08eb56e Add link to blocked users to getting started page 2017-02-05 19:22:05 +01:00
Eugen Rochko 920ba5fc4e Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
Try to fix Travis CI setup
2017-02-05 19:18:11 +01:00
Eugen Rochko 87830f99e7 Fix #552 - Replace image links with image icons in status text in the UI 2017-02-05 15:25:55 +01:00
Eugen Rochko ff2da21d3c Fix content warning margin 2017-02-05 14:50:58 +01:00
Eugen Rochko b5bf807a34 Remove react-dnd as it was interfering with text selection. Move content
warning mentions preview into area where actual content would be
2017-02-05 04:11:14 +01:00
Eugen Rochko fb6aa7ad5c Add tracking of delay to streaming API 2017-02-05 03:19:04 +01:00
Eugen Rochko 6cdcac1396 Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer
overshadow requirement for remote-lookup
2017-02-05 03:01:23 +01:00
Eugen Rochko 44fad0160f Add next/previous navigation in modal for media attachments 2017-02-05 02:48:11 +01:00
Eugen Rochko 21972bb398 No replies filter on home timeline no longer hides self-replies 2017-02-05 02:02:46 +01:00
Eugen Rochko dbb7e5a644 Getting started on draggable columns 2017-02-05 01:58:25 +01:00
Eugen Rochko a012e4c7ff Fix column settings not being scrollable on short screens 2017-02-05 01:27:31 +01:00
Eugen Rochko af007f2def Display mentions prepended to the content warning 2017-02-05 01:19:27 +01:00
hoodie d4d3a10c25 untested!! spoiler hotfix for replies
untested, my vagrant is bugged again, submitted at gargron's request
2017-02-04 17:33:46 -05:00
Eugen Rochko ccb8ac8573 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
hoodie ac3f5a8316 easier comprehension of toot settings and properties (#595)
sounds complex, but really it just reorganizes the posting options and
adds a seperator line
2017-02-03 15:54:23 +01:00
Eugen Rochko 1ee4a17f37 Add logging and filtering to the node.js streaming API 2017-02-02 13:56:14 +01:00
Eugen Rochko 17ae7d132c Prevent potential issue with public/hashtag statuses arriving after
they have been loaded and favourited/reblogged from another source

Since the status JSON returned from public/hashtag streams does not
contain favourited/reblogged attributes, merging them should not
override existing ones.
2017-02-02 00:49:25 +01:00
Eugen Rochko d9ca46b464 Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
Eugen Rochko bf60f2898d Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI 2017-01-31 22:35:38 +01:00
Eugen Rochko 8ef79d8dc9 Revert to animating avatars by default 2017-01-31 19:16:35 +01:00
Eugen Rochko 52d68be157 Fix CORS issue on avatars resampling 2017-01-31 19:06:13 +01:00
Eugen Rochko 86b3cb5120 Fix not reloading account/fetching relationship on newly independent components 2017-01-30 22:35:36 +01:00
Eugen Rochko f21e7d6ac0 Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer
nested inside a common parent (<Account>), instead they all embed <HeaderContainer />
2017-01-30 21:44:11 +01:00
Eugen Rochko 404d2050d3 Add explicit "load more" link to the bottom of StatusList and notifications 2017-01-30 18:07:17 +01:00
Eugen Rochko 02cd2e42b2 Improve avatar resampling of non-animated canvas 2017-01-30 15:43:48 +01:00
Eugen Rochko 9bde804ba2 Resolve confusion between ColumnBackButton and the slim version that
the public timeline has been using
2017-01-30 15:22:04 +01:00
Billie Thompson b1571b1e1d
Add missing back button to "Follow Requests"
Currently we have the problem where the follow request button is missing
from the Follow request tab. This means that when you visit that tab you
either have to press the back button in the browser or re-enter the home
page, which breaks the app flow.

This will resolve that issue by adding a new back button to that tab,
in the same way that the public timeline, and favourites have.
2017-01-29 18:53:51 +00:00
Misty De Meo a30e669df2 Fix avatar scaling on high-DPI displays (#573) 2017-01-29 14:26:50 +01:00
Eugen Rochko 04bce0cdf2 Clean up 2017-01-27 20:38:35 +01:00
Zachary Spector 237cb41ab4 Less ambiguous sensitive content toggle label (#556) 2017-01-27 19:31:14 +01:00
Eugen Rochko 450ad43180 Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,
fix ProcessFeedService pushing status into distribution if called a second time
while the first is still running (i.e. when a PuSH comes after a Salmon slap),
fix not running escape on spoiler text before emojify
2017-01-27 16:57:23 +01:00
Eugen Rochko 7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style
for extremely wide monitors
2017-01-26 18:48:56 +01:00
Eugen Rochko cc5c1e5feb Removed accidental n+1 query from notifications, updated some deps,
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
Anthony Bellew 589837cfc7 Removed line break before spoiler link, changed color of bg for spoiler link 2017-01-26 03:07:02 -07:00
Anthony Bellew ebe5095665 Add Padding to inline styles for spoiler 2017-01-26 03:03:26 -07:00
Anthony Bellew 8f18c8f9ad Added inline spoiler button styles 2017-01-26 03:02:42 -07:00
Anthony Bellew d944946c52 Moved brackets outside of localized strings at Gargron's suggestion 2017-01-26 00:24:52 -07:00