about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-11-17Merge pull request #221 from glitch-soc/local-only-policybeatrix
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17Merge pull request #218 from glitch-soc/themed-prefetchingDavid Yip
Themed preloading
2017-11-17Update StatusPolicy to check current_account for local_only? toots.David Yip
StatusPolicy#account was renamed to StatusPolicy#current_account in upstream. This commit renames the local-only changes to match and augments the #show? policy spec with what we expect for local-only toots.
2017-11-17Add trailing comma in mapStateToPropsDavid Yip
Consistency, eslint, etc.
2017-11-17Merge pull request #219 from glitch-soc/no-spinDavid Yip
Remove 'spin' theme
2017-11-17Throw layout, isWide, navbarUnder back into mapStateToProps.David Yip
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-16Removes spin themekibigo!
2017-11-16Themed prefetchingkibigo!
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Redirect to reports when moderator (#5733)Yamagishi Kazutoshi
2017-11-17Remove empty strings (#5732)ysksn
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-17Display moderator badge (green), admin badge changed to red (#5728)Eugen Rochko
2017-11-16Improve language filter (#5724)Renato "Lond" Cerqueira
* Scrub text of html before detecting language. * Detect language on statuses coming from activitypub. * Fix rubocop comments. * Remove custom emoji from text before language detection
2017-11-16Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)ysksn
2017-11-16Merge pull request #216 from glitch-soc/merge-upstream-3023725Surinna Curtis
Merge upstream at commit 3023725
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-16Add tests for Status#verb (#5717)ysksn
2017-11-15Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-envDavid Yip
Allow streaming server to take bindhost from HOST env
2017-11-15Allow streaming server to take bindhost from HOST envDaggertooth
2017-11-16Add tests for Status#hidden? (#5719)ysksn
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
Allow hiding reblogs on a per-follow basis
2017-11-15[Nanobox] Apply Release Notes Changes (#5670)Daniel Hunsaker
Apparently I missed some things in earlier commits/releases that needed to be applied to the Nanobox setup. All minor things, nothing that breaks anything, but still best to get them in place. - Move cron jobs to their own component, so the Sidekiq component can be scaled up to multiple instances without causing issues with running the same cron job multiple times at once. - Update cron jobs to the latest requirements, removing extraneous ones - Add new variables to `.env.nanobox` - Update Nginx to use correct cache header directives
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
* Move some tests of User into Settings::ScopedSettings * Add a test for User@settings
2017-11-15Add a test for Tag#to_param (#5705)ysksn
2017-11-15reusable-streaming (#5709)masarakki
2017-11-15Add Japanese translation for DM block option. (#5704)mayaeh
2017-11-15Optional notification muting (#5087)Surinna Curtis
* Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes
2017-11-15Add tests for StreamEntry (#5687)ysksn
* Add tests for StreamEntry - `#object_type` - `#verb` - `#mentions` * Fix to test results instead of implementations
2017-11-15Filter searched toots to be consistent with blocking behaviors (#5383)ThibG
2017-11-15Use already-known remote user data if resolving temporarily fails in ↵ThibG
mentions (#5702)
2017-11-15Allow specifying STATSD_NAMESPACE (#5700)Eugen Rochko
2017-11-14Add option to block direct messages from people you don't follow (#5669)Eugen Rochko
* Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)
2017-11-14Updating Chinese (Simplified) translations (#5643)SerCom_KC
* i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e886213e827cd985d4f62419db57534. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations
2017-11-14Add a test for SiteUpload#cache_key (#5685)ysksn
2017-11-14Refactor remote_follow_spec.rb (#5690)Yamagishi Kazutoshi
2017-11-14Add uniqueness to block email domains (#5692)Yamagishi Kazutoshi
2017-11-14i18n: Update Polish translation (#5699)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14Add Japanese translations for moderator roles and its own admin actions. (#5689)mayaeh
2017-11-14i18n: fix typo in Polish translation (#5688)Marcin Mikołajczak
2017-11-14Add tests for Setting (#5683)ysksn
2017-11-14l10n: PT-BR translation updated (#5681)Anna e só
* Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated
2017-11-13Merge pull request #214 from glitch-soc/keyword-muteDavid Yip
Maintain case-insensitivity when merging multiple matchers (#213)
2017-11-13Maintain case-insensitivity when merging multiple matchers (#213)David Yip
When given two regexps, Regexp.union preserves the options set (or not set) on each regex; this meant that none of the multiline (m), case-insensitivity (i), or extended syntax (x) options were set. Our regexps are written expecting the m, i, and x options were set on all of them, so we need to make sure that we preserve that behavior.
2017-11-13Add code of conduct from GitHub generator (#5674)Eugen Rochko
2017-11-13fix Code Climate badge on README.md (#5671)takayamaki
and change badge's URI to https
2017-11-13Add tests for SessionActivation (#5668)ysksn
* Fabricate SessionActivation not only user_id but user association. * Add tests for SessionActivation
2017-11-12Update model annotations to use BIGINT for IDs (#5461)Daniel Hunsaker
All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.
2017-11-12Fix #5652 - Notify too short when abbrev in JA (#5664)KEINOS
* Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`
2017-11-12Add tests for RemoteProfile (#5665)ysksn
generated by cgit-pink (git 2.37.1) at 2024-11-09 06:39:50 +0000