fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-16 11:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4798 commits 129 branches 266 tags 977 MiB
Commit graph

4798 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lynx Kotoura 1e3b1d7211 Adjust landing pages 2 (#4967) 
* Adjust landing pages 2

Fix styles of terms page
Remove action buttons from timeline in about page
Adjust styles of short description
Adjust form inputs
Set autocomplete off for username and email box in registration form. Remove line breakings.

* Revert removing action buttons
 2017-09-16 18:39:11 +02:00
David Yip f5d6bdd9c0 Merge pull request #147 from yipdw/sync/upstream 
Fix error when following locked accounts (#4896)
 2017-09-16 11:37:53 -05:00
unarist 0698c610a6 Fix an error in ReplyDistributionWorker when replied status was deleted (#4974) 
Reply distribution is proceed by Sidekiq, so replied status may be deleted before this.
 2017-09-16 18:18:00 +02:00
Eugen Rochko ad8e856a5b Fix error when following locked accounts (#4896) 
(cherry picked from commit 0ef9d45d05)
 2017-09-16 11:10:33 -05:00
ふぁぼ原 629fae8b3b correct URL pattern used in text length counter in WebUI (#4968) 2017-09-16 15:01:15 +02:00
unarist c30e6433de Fix AP serialization error when thread is missing (#4970) 
`Status#reply?` may returns true even if the thread is missing.
e.g. the replied status was deleted or couldn't be fetched.

Then it raises NoMethodError on various AP json serialization.

This issue won't happen on Atom serialization because it checks thread
existence using `StreamEntry#threaded?` instead.
 2017-09-16 15:00:36 +02:00
Naoki Kosaka cea5597722 Fix hasSize condition in secSet and sizes. (#4969) 2017-09-16 15:00:01 +02:00
Akihiko Odaki 48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966) 2017-09-16 14:59:41 +02:00
Eugen Rochko efec507230 Bump to 1.6.1 2017-09-16 03:08:29 +02:00
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955) 
* When accessing uncached media attachment, redownload it

* Prevent re-download of rejected media
 2017-09-16 03:01:45 +02:00
unarist 6c81f9d6e5 Fix invisible load more button (#4962) 
* Fix behavior while the button is invisible
e.g. pointer cursor, couldn't open contextmenu
* Avoid rendering the button to remove blank space if no more items are available or no items are rendered
 2017-09-16 00:32:43 +02:00
Eugen Rochko 472df24579 When web UI URL used while logged out, redirect to static page (#4954) 2017-09-15 00:57:08 +02:00
Eugen Rochko 0d1215e82f Remove redundant width/height values from SVGs to fix Safari bug (#4956) 2017-09-15 00:51:00 +02:00
Anna e só e77cc032c2 l10n: PT-BR translation updated (#4953) 
* devise.pt-BR.yml now fully translated

* pt-BR.json now fully translated

* pt-BR.yml partially translated; 46 lines left

* pt-BR.yml now fully translated

* simple_form.pt-BR.yml fully translated

* doorkeeper.pt-BR.yml now fully translated

* E-mail instructions on app/views/user_mailer added and fully translated

* PT-BR translation for #4871

* Deleted an unwanted caracter on pt-BR.yml

* Fixing typos on pt-BR.yml

* Added translation for Pinned toots tab on pt-BR.json

* Added missing translation for navigation_bar.pins

* Fixed spelling on pt-BR.yml

* Update pt-BR.json
 2017-09-15 00:02:38 +02:00
sdukhovni 67559361e8 Add scheduled worker to purge old user IPs (#4951) 
* Add scheduled worker to purge old user IPs

* Use ruby 1.9 hash syntax
 2017-09-14 22:26:38 +02:00
ThibG 4a73615193 Fix race condition when receiving an ActivityPub Create multiple times (#4930) 
* Fix race condition when receiving an ActivityPub Create multiple times

* Use a RedisLock to avoid concurrent processing of a same Create activity
 2017-09-14 22:26:22 +02:00
Yamagishi Kazutoshi bdcc9e2ceb Add missing Japanese translations (#4947) 2017-09-14 18:03:34 +02:00
ふぁぼ原 3816943e6b Enable to recognize most kinds of characters as URL paths (#4941) 2017-09-14 18:03:20 +02:00
Masoud Abkenar b39d512ade l10n: update Persian translation (#4946) 2017-09-15 00:13:38 +09:00
Eugen Rochko 04046a4983 Fix #4908 - Do not keep remote file names, generate random (#4934) 2017-09-14 16:41:59 +02:00
unarist a4c500176b Include requested URL into the message on network errors (#4945) 2017-09-14 16:12:50 +02:00
abcang 1aad015bbb Revert unique retry job (#4937) 
* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)"

This reverts commit 6859d4c028.

* Revert "Do not execute the job with the same arguments as the retry job (#4814)"

This reverts commit be7ffa2d75.
 2017-09-14 15:12:43 +02:00
m4sk1n 94fba44eec i18n: Update Polish translation (#4942) 
* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Update pl.yml
 2017-09-14 21:58:48 +09:00
Jeroen 721460a59b Another Dutch language update (#4944) 
* Update nl.json

* Update nl.yml

* Update nl.json
 2017-09-14 21:52:47 +09:00
Surinna Curtis 7ebd6ed03c Apply white-space: nowrap to account relationships icons 2017-09-14 07:37:39 -05:00
Naf 45b595cdca Add Japanese translate for #4911 (#4943) 2017-09-14 18:20:04 +09:00
Quent-in aad3df6afc l10n update OC/FR video redesign (#4938) 
* l10n update for Redesign video player (#4911)

* Update videp

* Update

I hope this time format works well.

* One missing string

* Update time format

I'd like the complete name of the month in the Long format and the short one in the short format.
I hope it works now
 2017-09-14 16:32:14 +09:00
Surinna Curtis 59936b7a98 Tweak title text for mute notifications toggle to be clearer 2017-09-13 22:54:14 -05:00
Surinna Curtis fd9a171129 fix typos in the migration 2017-09-13 22:35:48 -05:00
Surinna Curtis 6ba35630bc Add migration to default Mute#hide_notifications? to true 2017-09-13 22:26:43 -05:00
N氏 1023f52eaa Add Japanese translate for #4913 (#4936) 2017-09-14 12:25:18 +09:00
Surinna Curtis 79d8911116 Fixed a typo that was breaking the account mute API endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis d880b3182b minor code style fixes oops 2017-09-13 21:47:30 -05:00
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner 2017-09-13 21:47:30 -05:00
Surinna Curtis 211f0a9513 add an explanatory comment to AccountInteractions 2017-09-13 21:47:30 -05:00
Surinna Curtis 4a527154b7 fix a missing import 2017-09-13 21:47:30 -05:00
Surinna Curtis df71eadaae In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. 2017-09-13 21:47:30 -05:00
Surinna Curtis 323d437a09 satisfy eslint 2017-09-13 21:47:30 -05:00
Surinna Curtis 3278c08c29 make the hide/unhide notifications buttons work 2017-09-13 21:47:30 -05:00
Surinna Curtis 0284fd723b Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis 0e0703dbd8 Show whether muted users' notifications are muted in account lists 2017-09-13 21:47:30 -05:00
Surinna Curtis 7dbcc7ed3d Expose whether a mute hides notifications in the api/v1/relationships endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis 83b3a0389c Add more specs for the /api/v1/mutes/details endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis af2d793398 Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes. 2017-09-13 21:47:30 -05:00
Surinna Curtis 30b5254a5d Put the label for the hide notifications checkbox in a label element. 2017-09-13 21:47:30 -05:00
Surinna Curtis 0a207be99d add trailing newlines to files for Pork :) 2017-09-13 21:47:30 -05:00
Surinna Curtis 500c465226 specs for MuteService notifications params 2017-09-13 21:47:30 -05:00
Surinna Curtis 2ea9b164d3 Satisfy eslint. 2017-09-13 21:47:30 -05:00
Surinna Curtis b1576c52df Convert profile header mute to use mute modal 2017-09-13 21:47:30 -05:00