dark-firepit/mastodon
Archived
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4580 commits 55 branches 15 tags 192 MiB
Commit graph

4580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Surinna Curtis 88e52f3a2a Fix wrong variable name in api/v2/mutes 2017-10-22 20:52:54 -05:00
Surinna Curtis d4bb04c45c Don't serialize "account" in MuteSerializer 
Doing so is somewhat unnecessary since it's always the current user's account.
 2017-10-22 20:52:54 -05:00
Surinna Curtis 33c56212b9 Rename /api/v1/mutes/details -> /api/v2/mutes 2017-10-22 20:52:54 -05:00
Surinna Curtis bcd4b72223 Remove superfluous blank line 2017-10-22 20:52:54 -05:00
Surinna Curtis f39bba9a90 Fix code style issues 2017-10-22 20:52:54 -05:00
Surinna Curtis 290c6b0f2e Apply white-space: nowrap to account relationships icons 2017-10-22 20:52:54 -05:00
Surinna Curtis d5d1dcab77 Fixed a typo that was breaking the account mute API endpoint 2017-10-22 20:52:54 -05:00
Surinna Curtis ef5ebdd544 minor code style fixes oops 2017-10-22 20:52:54 -05:00
Surinna Curtis da85bfc252 Refactor handling of default params for muting to make code cleaner 2017-10-22 20:52:54 -05:00
Surinna Curtis d17255c0e0 add an explanatory comment to AccountInteractions 2017-10-22 20:52:54 -05:00
Surinna Curtis 74ce229101 fix a missing import 2017-10-22 20:52:54 -05:00
Surinna Curtis fb8613d09b In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. 2017-10-22 20:52:54 -05:00
Surinna Curtis d73f437419 satisfy eslint 2017-10-22 20:52:54 -05:00
Surinna Curtis 343c358bb2 make the hide/unhide notifications buttons work 2017-10-22 20:52:54 -05:00
Surinna Curtis 8a6ad735f1 Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint 2017-10-22 20:52:54 -05:00
Surinna Curtis 9fb8a6f231 Show whether muted users' notifications are muted in account lists 2017-10-22 20:52:54 -05:00
Surinna Curtis f90ac53dc5 Expose whether a mute hides notifications in the api/v1/relationships endpoint 2017-10-22 20:52:54 -05:00
Surinna Curtis c814d19672 Add more specs for the /api/v1/mutes/details endpoint 2017-10-22 20:52:54 -05:00
Surinna Curtis 27eb75878e Define a serializer for /api/v1/mutes/details 2017-10-22 20:52:54 -05:00
Surinna Curtis a81d3a2842 Add a /api/v1/mutes/details route that just returns the array of mutes. 2017-10-22 20:52:54 -05:00
Surinna Curtis 1fc0382d29 Put the label for the hide notifications checkbox in a label element. 2017-10-22 20:52:54 -05:00
Surinna Curtis 90db8b63b0 add trailing newlines to files for Pork :) 2017-10-22 20:52:54 -05:00
Surinna Curtis 15a6cb5ca9 specs for MuteService notifications params 2017-10-22 20:52:54 -05:00
Surinna Curtis d5dc4696a7 Satisfy eslint. 2017-10-22 20:52:54 -05:00
Surinna Curtis eb6543b36b Convert profile header mute to use mute modal 2017-10-22 20:52:54 -05:00
Surinna Curtis 920c7cdaf3 Break out a separate mute modal with a hide-notifications checkbox. 2017-10-22 20:52:54 -05:00
Surinna Curtis f3aac23099 Less gross passing of notifications flag 2017-10-22 20:52:53 -05:00
Surinna Curtis aded1acfda API support for muting notifications (and specs) 2017-10-22 20:52:53 -05:00
Surinna Curtis 9855529a10 Add support for muting notifications in MuteService 2017-10-22 20:52:53 -05:00
Surinna Curtis 0ccfbe5747 specs testing that hide_notifications in mutes actually hides notifications 2017-10-22 20:52:53 -05:00
Surinna Curtis 921a1b7b2a Add specs for how mute! interacts with muting_notifications? 2017-10-22 20:52:53 -05:00
Surinna Curtis aa7e541780 block notifications in notify_service from hard muted accounts 2017-10-22 20:52:53 -05:00
Surinna Curtis dac67960e0 Add muting_notifications? and a notifications argument to mute! 2017-10-22 20:52:53 -05:00
Surinna Curtis 90a0176b0b Add a hide_notifications column to mutes 2017-10-22 20:52:53 -05:00
Marcin Mikołajczak fdb0848e08 i18n: Update Polish Translation (#5494) 2017-10-22 08:34:39 +09:00
Nolan Lawson 8392ddbf87 Remove unnecessary translateZ(0) when doing scale() (#5473) 2017-10-19 18:27:55 +02:00
masarakki 049381b284 remove-duplicated-jest-config (#5465) 2017-10-19 13:51:38 +02:00
Sho Kusano 09d81defcd Suppress type error(not a function) on calling fastSeek (#5452) 2017-10-18 17:13:51 +02:00
Eugen Rochko 3810d98cd8 Bump version to 2.0.0 🐘 2017-10-18 13:53:56 +02:00
Renato "Lond" Cerqueira 26b2a6a71e Fix pt-BR translation strings related to advanced search. (#5449) 2017-10-18 13:53:17 +02:00
Technowix edf9a5e4fc Revert #5438 for FR (#5450) 
As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.
 2017-10-18 13:51:30 +02:00
Håkan Eriksson c710069c12 Some typos and supplementation in sentence structures (#5441) 
* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

* Swedish - Typos and supplementation in sentence structure

* Update simple_form.sv.yml

* Update sv.yml

* Update sv.yml

Rearranged the alphabetical order.
 2017-10-18 13:50:52 +02:00
Yamagishi Kazutoshi 990d6dd565 Run i18n-tasks checked-normalized in Travis CI (#5443) 2017-10-18 11:57:02 +02:00
Yamagishi Kazutoshi 402da46ff6 Enable coverage for Jest (#5442) 2017-10-18 11:39:36 +02:00
JohnD28 e7099d8d9e fr.json typo (realtive time) (#5447) 
Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie
 2017-10-18 16:47:14 +09:00
Eugen Rochko 637ea3bb5b Bump version to 2.0.0rc4 2017-10-17 23:16:35 +02:00
Jeroen 363d0d3a44 Dutch: A few strings I found last minute (#5440) 
* Dutch: A few strings I found last minute

* Update simple_form.nl.yml
 2017-10-17 23:15:40 +02:00
YaQ 6e54719474 Make theme directory and Rename application.scss (#5336) 
* Rename application.scss

* Move to 'default' directory

* Follow review

Move directory, and Rename "mastodon".

* Revert rename

* undo removal of newline
 2017-10-18 05:20:07 +09:00
Eugen Rochko f3003417c5 When unreblog arrives over streaming API, just delete in UI (#5439) 2017-10-17 22:17:02 +02:00
JeanGauthier 33ea042dec i18n better wording (OC/CA/FR) + string added in FR (#5438) 
* Update oc.json

* Update fr.json

* Update ca.json

* Update fr.json

* Update simple_form.fr.yml

* Update ca.json

* Update fr.json

* Update oc.json

* Update oc.json

* Update fr.json
 2017-10-17 21:49:39 +02:00