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

5090 commits

This branch
This branch
All branches
Author SHA1 Message Date
SerCom_KC
282f0d7479 Updating Chinese (Simplified) translations (#5508) 
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines

* i18n: (zh-CN) fix punctuation

* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677

* i18n: (zh-CN) Update missing translations

* i18n: (zh-CN) Fixing errors

* i18n: (zh-CN) Fix indent error

* i18n: (zh-CN) Fix language tag

* i18n: (zh-CN) Remove quotes

* i18n: (zh-CN) Update translation (#5485)

* i18n: (zh-CN) Remove whitespaces, x -> ×

* i18n: (zh-CN) Rewording on time distance

* i18n: (zh-CN) Overall improvements

* i18n: (zh-CN) i18n-tasks normalization

* i18n: (zh-CN) Add missing translation
 2017-10-30 12:34:58 +09:00
ThibG
fec32921d5 Update remote ActivityPub users when fetching their toots (#5545) 2017-10-30 00:24:16 +09:00
Nolan Lawson
aa85f4cf73 Avoid modifying emoji data inline (#5548) 2017-10-30 00:23:38 +09:00
Nolan Lawson
6c6c67b52b Add margin to account for Edge disappearing scrollbar (#5522) 
* Add margin to account for Edge disappearing scrollbar

* Fix 16px margin for DMs and horizontal line
 2017-10-30 00:11:32 +09:00
Nolan Lawson
fc075b16d9 Reactor unfollow_modal, boost_modal, delete_modal (#5505) 2017-10-30 00:10:15 +09:00
Alda Marteau-Hardi
29559b2e7a Fix a grammatical error in the notifications. (#5555) 2017-10-29 02:08:37 +09:00
Marcin Mikołajczak
dc5053109b i18n: Update Polish translation (#5547) 2017-10-28 12:43:20 +09:00
Herbert Kagumba
c652eefd3c Separate Follow/Unfollow and back buttons (#5496) 2017-10-27 19:14:11 +02:00
ThibG
b41ed24f74 Instantiate service classes for each call (fixes #5540) (#5543) 2017-10-27 19:08:30 +02:00
Nolan Lawson
6a7deb8fc8 Avoid unnecessary Motion components in icon_button.js (#5544) 2017-10-27 19:08:07 +02:00
Nolan Lawson
7286e6dcf0 Directly use <Motion/> if not reducing motion (#5546) 2017-10-27 19:06:54 +02:00
David Yip
4d1b81e0db Add artist, title, and date metadata to boop.{mp3,ogg} (#5531) 
For boop.mp3, this commit adds both ID3v1 and ID3v2 tags.  For boop.ogg,
we use Vorbis metadata.

In the case of boop.mp3, this also adds a cover image. Interestingly, it
didn't seem to affect the size of boop.mp3 much, despite being ~8k.
boop.ogg seemed to be much more affected and so no cover image was added
to that version.
 2017-10-28 00:05:04 +09:00
Nolan Lawson
2085c1fa33 Refactor initial state: reduce_motion and auto_play_gif (#5501) 2017-10-28 00:04:44 +09:00
Akihiko Odaki
38d5aa3073 Use contenthash for ExtractTextWebpackPlugin (#5462) 
[hash] is not documented.
 2017-10-27 23:54:20 +09:00
David Yip
2aec3c073b Merge branch 'master' into gs-master 2017-10-27 09:45:25 -05:00
nullkal
0a9cc96cdc Feature: Unlisted custom emojis (#5485) 2017-10-27 16:11:30 +02:00
puckipedia
2c06b21883 Allow ActivityPub Note's tag and attachment to be single objects (#5534) 2017-10-27 16:10:36 +02:00
unarist
75776cf237 Optimize FixReblogsInFeeds migration (#5538) 
We have changed how we store reblogs in the redis for bigint IDs. This process is done by 1) scan all entries in users feed, and 2) re-store reblogs by 3 write commands.

However, this operation is really slow for large instances. e.g. 1hrs on friends.nico (w/ 50k users). So I have tried below tweaks.

* It checked non-reblogs by `entry[0] == entry[1]`, but this condition won't work because `entry[0]` is String while `entry[1]` is Float. Changing `entry[0].to_i == entry[1]` seems work.
  -> about 4-20x faster (feed with less reblogs will be faster)
* Write operations can be batched by pipeline
  -> about 6x faster
* Wrap operation by Lua script and execute by EVALSHA command. This really reduces packets between Ruby and Redis.
  -> about 3x faster

I've taken Lua script way, though doing other optimizations may be enough.
 2017-10-27 16:10:22 +02:00
Andrew
120fc4ef61 Theme: Windows 95 2017-10-26 23:22:48 -07:00
Jenkins
c388f66ecc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-10-26 15:08:34 +00:00
erin
fe11a72c0b Fix copying emojos: redirect to the page you were on (#5509) 2017-10-26 23:44:24 +09:00
David Yip
d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master 2017-10-26 09:18:27 -05:00
りんすき
e6f7ccb786 Fix column design broken with very long title (#5493) 
* Fix #5314

* fix not beautiful code

* fix broken design with mobile view

* remove no longer needed code
 2017-10-26 22:52:48 +09:00
unarist
4472c5723a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489) 
Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.
 2017-10-26 22:48:35 +09:00
Nolan Lawson
afe5176ee8 Remove translateZ(0) on modal overlay (#5478) 2017-10-26 22:46:50 +09:00
beatrix
ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute 
Keyword muting
 2017-10-25 17:37:48 -04:00
beatrix
a5b1005315 Merge pull request #198 from glitch-soc/gs-direct-timeline 
Direct messages timeline from tootsuite/mastodon#4514
 2017-10-25 17:37:06 -04:00
David Yip
eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 2017-10-25 16:01:20 -05:00
Jenkins
cfc46d7334 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-10-25 16:17:14 +00:00
Ratmir Karabut
51d4add08d Update Russian translation (#5517) 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line

* Update Russian translation (sessions)

* Update Russian translation

* Update Russian translation

* Fix merge conflicts (revert)

* Update Russian translation

* Update Russian translation (fix)

* Update Russian translation (fix quotes)

* Update Russian translation (fix quotes)

* Update Russian translation (fix)

* Update Russian translation

* Add quotes

* bundle exec i18n-tasks normalize
 2017-10-26 00:21:58 +09:00
Anna e só
93255b003f l10n: PT-BR translation updated (#5530) 2017-10-25 23:11:03 +09:00
Olivier Nicole
fe8646f078 Complete Esperanto translation (#5520) 2017-10-25 22:38:37 +09:00
David Yip
b8c462c42b Remove nil check in Glitch::KeywordMute#=~. 
@regex can no longer be nil, so we don't need to check it.
 2017-10-24 19:03:59 -05:00
David Yip
53c2ea1a86 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't. 
There's nothing useful we can display if the destroy action messes up,
so might as well assert it does and complain loudly if it doesn't.
 2017-10-24 18:56:57 -05:00
David Yip
2da4eca986 Use edit template for displaying errors in update. 2017-10-24 18:56:44 -05:00
David Yip
22f9b4f2c0 Also filter notifications containing muted keywords. 2017-10-24 18:51:27 -05:00
David Yip
7caca589c1 Override Action View name inference in settings/keyword_mutes. 
Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in
templates this turns into e.g. settings/glitch/keyword_mutes.  Going
along with this convention means a lot of file movement, though, and for
a UI that's as temporary and awkward as this one I think it's less
effort to slap a bunch of as: options everywhere.

We'll do the Right Thing when we build out the API and frontend UI.
 2017-10-24 18:40:28 -05:00
David Yip
1d726a72c6 Fix example description. 
This example actually checks matches at the end of a string.
 2017-10-24 18:33:02 -05:00
David Yip
05fecda52d Switch to Regexp.union for building the mute expression. 
Also make the keyword-building methods private: they always probably
should have been private, but now I have encoded enough fun and games
into them that it now seems wrong for them to *not* be private.
 2017-10-24 18:31:34 -05:00
Ondřej Hruška
77cad0daf0 option to add title to <Button>, use for toot buttons (#197) 2017-10-24 19:08:07 +02:00
David Yip
86b0a24362 Merge pull request #196 from glitch-soc/fix-imports 
Added app/javascript for imports
 2017-10-23 23:34:43 -05:00
kibigo!
e8dc70ac81 Added app/javascript for imports 2017-10-23 20:22:48 -07:00
David Yip
763fd4b275 Only cache the regex text, not the regex itself. 
It is possible to cache a Regexp object, but I'm not sure what happens
if e.g. that object remains in cache across two different Ruby versions.
Caching a string seems to raise fewer questions.
 2017-10-23 19:31:59 -05:00
David Yip
2b753ac54f Merge remote-tracking branch 'origin/master' into gs-master 2017-10-22 22:57:41 -05:00
Matthew Walsh
897931099c Changes to match other timelines in 2.0 2017-10-22 18:45:35 -07:00
Matthew Walsh
737ab88c86 Added a timeline for Direct statuses 
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
 2017-10-22 18:35:14 -07:00
David Yip
e8314ee2a6 KeywordMute matcher: more closely mimic Regexp#=~ behavior. 
Regexp#=~ returns nil if it does not match.  An empty mute set does not
match any status, so KeywordMute::Matcher#=~ ought to return nil also.
 2017-10-22 01:12:21 -05:00
David Yip
4ab1534f6c Address unused translation errors. 2017-10-22 01:05:56 -05:00
David Yip
156ebf53f6 Use current_account from ApplicationController. 
This avoids copy-pasting definitions of set_account.
 2017-10-22 01:02:52 -05:00
David Yip
3b2bf30644 Don't add \b to whole-word keywords that don't start with word characters. 
Ditto for ending with \b.

Consider muting the phrase "(hot take)".  I stipulate it is reasonable
to enter this with the default "match whole word" behavior.  Under the
old behavior, this would be encoded as

    \b\(hot\ take\)\b

However, if \b is before the first character in the string and the first
character in the string is not a word character, then the match will
fail.  Ditto for after.  In our example, "(" is not a word character, so
this will not match statuses containing "(hot take)", and that's a very
surprising behavior.

To address this, we only add leading and trailing \b to keywords that
start or end with word characters.
 2017-10-22 00:38:54 -05:00