me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5848 commits 2 branches 0 tags 429 MiB
Commit graph

5848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lynx Kotoura
b5ec3346fa 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
5f9fab87fe Merge pull request #147 from yipdw/sync/upstream 
Fix error when following locked accounts (#4896)
 2017-09-16 11:37:53 -05:00
unarist
5ae5cb40b1 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
f10a687118 Fix error when following locked accounts (#4896) 
(cherry picked from commit e054961051)
 2017-09-16 11:10:33 -05:00
ふぁぼ原
f48dc2f2d8 correct URL pattern used in text length counter in WebUI (#4968) 2017-09-16 15:01:15 +02:00
unarist
23671fbffc 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
eda52774d0 Fix hasSize condition in secSet and sizes. (#4969) 2017-09-16 15:00:01 +02:00
Akihiko Odaki
d4a1ddd46a Fix filterable_languages method of SettingsHelper (#4966) 2017-09-16 14:59:41 +02:00
Eugen Rochko
f3c22d480e Bump to 1.6.1 2017-09-16 03:08:29 +02:00
Eugen Rochko
26c797bf0d 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
e4b7984624 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
2d1048d041 When web UI URL used while logged out, redirect to static page (#4954) 2017-09-15 00:57:08 +02:00
Eugen Rochko
43af63268c Remove redundant width/height values from SVGs to fix Safari bug (#4956) 2017-09-15 00:51:00 +02:00
Anna e só
584d2d8e02 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
1fb5e3b009 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
67dd48a449 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
175c2a9df2 Add missing Japanese translations (#4947) 2017-09-14 18:03:34 +02:00
ふぁぼ原
c71727ca55 Enable to recognize most kinds of characters as URL paths (#4941) 2017-09-14 18:03:20 +02:00
Masoud Abkenar
d08cf543a3 l10n: update Persian translation (#4946) 2017-09-15 00:13:38 +09:00
Eugen Rochko
74626108b6 Fix #4908 - Do not keep remote file names, generate random (#4934) 2017-09-14 16:41:59 +02:00
unarist
f7ae3f39f6 Include requested URL into the message on network errors (#4945) 2017-09-14 16:12:50 +02:00
abcang
579a7c2654 Revert unique retry job (#4937) 
* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)"

This reverts commit 0080804f44.

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

This reverts commit 892aeb7ffe.
 2017-09-14 15:12:43 +02:00
m4sk1n
4d80e3c550 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
8cd10e7df6 Another Dutch language update (#4944) 
* Update nl.json

* Update nl.yml

* Update nl.json
 2017-09-14 21:52:47 +09:00
Surinna Curtis
f55b76afba Apply white-space: nowrap to account relationships icons 2017-09-14 07:37:39 -05:00
Naf
da2b2cfa70 Add Japanese translate for #4911 (#4943) 2017-09-14 18:20:04 +09:00
Quent-in
6279f70e60 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
7de500297b Tweak title text for mute notifications toggle to be clearer 2017-09-13 22:54:14 -05:00
Surinna Curtis
5c5416aa7a fix typos in the migration 2017-09-13 22:35:48 -05:00
Surinna Curtis
06ed918632 Add migration to default Mute#hide_notifications? to true 2017-09-13 22:26:43 -05:00
N氏
3d5170251e Add Japanese translate for #4913 (#4936) 2017-09-14 12:25:18 +09:00
Surinna Curtis
c872ae6e76 Fixed a typo that was breaking the account mute API endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis
e6a8692d0e minor code style fixes oops 2017-09-13 21:47:30 -05:00
Surinna Curtis
3688a48100 Refactor handling of default params for muting to make code cleaner 2017-09-13 21:47:30 -05:00
Surinna Curtis
d6b0f5fb2c add an explanatory comment to AccountInteractions 2017-09-13 21:47:30 -05:00
Surinna Curtis
97469efc35 fix a missing import 2017-09-13 21:47:30 -05:00
Surinna Curtis
11088e5667 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
5774861ece satisfy eslint 2017-09-13 21:47:30 -05:00
Surinna Curtis
20fd564109 make the hide/unhide notifications buttons work 2017-09-13 21:47:30 -05:00
Surinna Curtis
b2ba83bbda 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
27567d9ce9 Show whether muted users' notifications are muted in account lists 2017-09-13 21:47:30 -05:00
Surinna Curtis
d629e90628 Expose whether a mute hides notifications in the api/v1/relationships endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis
86d02930c7 Add more specs for the /api/v1/mutes/details endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis
8a90d61de0 Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
Surinna Curtis
2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes. 2017-09-13 21:47:30 -05:00
Surinna Curtis
27ee70ba19 Put the label for the hide notifications checkbox in a label element. 2017-09-13 21:47:30 -05:00
Surinna Curtis
b7227d05f8 add trailing newlines to files for Pork :) 2017-09-13 21:47:30 -05:00
Surinna Curtis
5fa430ba7c specs for MuteService notifications params 2017-09-13 21:47:30 -05:00
Surinna Curtis
9cdcd429d9 Satisfy eslint. 2017-09-13 21:47:30 -05:00
Surinna Curtis
62fde4c01c Convert profile header mute to use mute modal 2017-09-13 21:47:30 -05:00