tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,121 Commits 10 Branches 0 Tags
3bf3b4cb225374476ef1337debeb027d5dd4c1cc
Commit Graph
9121 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
abcangandEugen Rochko be7ffa2d75 Do not execute the job with the same arguments as the retry job (#4814) 2017-09-05 20:56:20 +02:00
Eugen RochkoandGitHub e821c00e74 Fix mentions in direct statuses not being delivered via AP (#4806) 2017-09-05 20:55:25 +02:00
Eugen RochkoandGitHub 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799) 2017-09-05 17:48:13 +02:00
Lynx KotouraandEugen Rochko 4c3dd0b254 Adjust status embeds (#4808) 
* Adjust status embeds

Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.

* Remove trailing whitespace

* Using width from the variable
 2017-09-05 12:31:24 +02:00
takayamakiandEugen Rochko 672df4ecc0 add index_notifications_on_id_and_account_id_and_activity_type on notifications table (#4750) 2017-09-05 12:30:01 +02:00
Treyssat-Vincent NinoandEugen Rochko aefb4719bc comment correction (#4812) 2017-09-05 12:13:25 +02:00
voidSatisfactionandEugen Rochko 4d67bf18fe Translation korean added (#4802) 2017-09-04 20:40:01 +02:00
ButterflyOfFireandEugen Rochko f09a250a7c Update ar.yml (#4810) 
Some little changes to "ar" locale
 2017-09-04 19:54:12 +02:00
Eugen RochkoandGitHub 9b50a9dd83 Fix some ActivityPub JSON bugs (#4796) 
- Fix assumption that `url` is always a string. Handle it if it's an
  array of strings, array of objects, object, or string, both for
  accounts and for objects
- `sharedInbox` is actually supposed to be under `endpoints`, handle
  both cases and adjust the serializer
 2017-09-04 18:26:33 +02:00
nullkalandEugen Rochko 2293466edd Show pinned statuses only in the top of the profile page (#4803) 
* Show pinned statuses only in the top of the profile page

* Refactor AccountsController#show_pinned_statuses?
 2017-09-04 12:53:18 +02:00
voidSatisfactionandEugen Rochko b6f3869f8d Fix streaming url to lowercase (#4804) 2017-09-04 12:52:06 +02:00
Eugen RochkoandGitHub 09cffaaf04 Fix #4551 - Use correct syntax for content preloading (#4798) 2017-09-04 02:14:12 +02:00
abcangandEugen Rochko 334a633c2a Fix a problem that notification column goes to top (#4792) 2017-09-03 20:31:51 +02:00
Eugen RochkoandYamagishi Kazutoshi 8b12e3cc7f Fix short number locales (#4790) 
Overwrite values from rails-i18n by manually overwriting in every locale.
We want numbers like 1.5K in every language
 2017-09-03 22:17:34 +09:00
Andreas DropandEugen Rochko d3f46a77c3 Make german translation more gender neutral #4755 (#4789) 2017-09-03 15:17:24 +02:00
Akihiko OdakiandEugen Rochko a789315361 Use next instead of return in task (#4787) 2017-09-03 12:39:39 +02:00
May Kittens Devour Your SoulandYamagishi Kazutoshi 579c7a88e0 Croatian translation - updated (#4183) 
* Update hr.json

* Update hr.json
 2017-09-03 18:10:53 +09:00
Quent-inandYamagishi Kazutoshi 8538170c2d l10n Occitan update for Embed, cancel follow request, ... (#4788) 
* Update: some missing strings

* Updates missing strings

* New string

* Update oc.json

* Update oc.yml

* Update oc.json
 2017-09-03 18:08:37 +09:00
Akihiko OdakiandEugen Rochko 249bdc169c Explicitly define attached file of DeprecatedPreviewCard (#4786) 
The path template of the attached files must explicitly be defined because
it is contradicting to the name of the class.
 2017-09-03 07:58:58 +02:00
Eugen RochkoandGitHub 9dd8dff683 Bump version to 1.6.0rc1 (#4768) 2017-09-03 01:12:05 +02:00
Eugen RochkoandGitHub a187dcefa1 Instantly upgrade account to ActivityPub if we receive ActivityPub payload (#4766) 2017-09-03 01:11:23 +02:00
Eugen RochkoandGitHub 5d170587e3 Improve client-side German i18n (#4785) 2017-09-02 23:21:48 +02:00
Eugen RochkoandGitHub 37fdddd927 Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779) 
See: <https://www.w3.org/wiki/Activity_Streams_extensions#as:manuallyApprovesFollowers>
 2017-09-02 23:13:35 +02:00
abcangandEugen Rochko 6ec1aa372d Validate data of Imports (#4782) 2017-09-02 20:45:42 +02:00
m4sk1nandEugen Rochko 2c3544eedd i18n: Improve Polish translation (#4783) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-09-02 20:45:20 +02:00
Eugen RochkoandGitHub d3b6746173 Make "unfollow" undo pending outgoing follow request too (#4781) 
* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
 2017-09-02 20:44:41 +02:00
PFMandEugen Rochko 2a5d1d5a1b fix text position of NSFW in Safari (Mac/iPhone) (#4570) 2017-09-02 18:52:56 +02:00
unaristandEugen Rochko 6a4e2db661 Raise an error for remote url in StatusFinder (#4776) 
* Raise an error for remote url in StatusFinder

Previous implementation had allowed remote url with status id which also exists on local.

Then that bug leads /api/web/embed to return wrong embed url.

* Fix oembed_controller_spec
 2017-09-02 17:42:47 +02:00
unaristandEugen Rochko bfa7f9ebf2 Fix WebPush (regression from #4524) (#4778) 
* Fix NoMethodError in Web::PushSubscription

```
undefined method `site_contact_email' for #<Class:0x00005976d13c40>

/usr/local/bundle/gems/activerecord-5.1.3/lib/active_record/dynamic_matchers.rb:22:in `method_missing'
/usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted.rb:295:in `method_missing'
/usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted/adapters/active_record.rb:129:in `method_missing_with_attr_encrypted'
/mastodon/app/models/web/push_subscription.rb:53:in `push_payload'
```

* Specify serializer in Web::NotificationSerializer
 2017-09-02 16:50:42 +02:00
Surinna CurtisandEugen Rochko 8cc1ed3c55 Don't unconditionally call preventDefault and stopPropagation on all keyup events (#4777) 
* UploadArea should only preventDefault for Escape

This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.

* Remove workaround for fixed bug in SettingToggle

SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
 2017-09-02 16:27:16 +02:00
m4sk1nandEugen Rochko 5e1e466da0 i18n: Update Polish translation (#4775) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-09-02 16:25:54 +02:00
Lynx KotouraandEugen Rochko cfe39fb58d Adjust settings pages (#4765) 
* views: Adjust heading positions

* Adjust settings pages

Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.

* Remove trailing whitespace
 2017-09-02 15:49:28 +02:00
Yamagishi KazutoshiandEugen Rochko a0294c8880 Add Japanese translate for #4561 (#4771) 2017-09-02 14:02:29 +02:00
Yamagishi KazutoshiandEugen Rochko ba8fb2fd0f Add text color style for noscript link (#4772) 2017-09-02 14:02:15 +02:00
Yamagishi KazutoshiandEugen Rochko 6fd2e8c3c5 Fix profile page when use system's font (#4774) 2017-09-02 14:01:59 +02:00
Yamagishi KazutoshiandEugen Rochko 15963a15c6 Disable embed modal when private status (#4773) 
* Disable embed modal when private status

* Remove `reblogDisabled`
 2017-09-02 14:01:44 +02:00
Eugen RochkoandGitHub 1b5806b744 Define missing JSON-LD properties (#4767) 
Using _: property names is discouraged, as in the future,
canonicalization may throw an error when encountering that instead
of discarding it silently like it does now.

We are defining some ActivityStreams properties which we expect
to land in ActivityStreams eventually, to ensure that future versions
of Mastodon will remain compatible with this even once that happens.
Those would be `locked`, `sensitive` and `Hashtag`

We are defining a custom context inline for some properties which we
do not expect to land in any other context. `atomUri`, `inReplyToAtomUri`
and `conversation` are part of the custom defined OStatus context.
 2017-09-02 14:01:23 +02:00
Eugen RochkoandGitHub 1b1e025b41 Use updated ActivityStreams context (added: sharedInbox) (#4764) 2017-09-02 14:00:58 +02:00
mayaehandYamagishi Kazutoshi ab9f1b6e50 Add japanese translations for embed modal feature. (#4770) 2017-09-02 14:48:51 +09:00
Yamagishi KazutoshiandEugen Rochko b767eb7ff8 Add RoutingHelper (#4769) 2017-09-02 03:03:20 +02:00
m4sk1nandEugen Rochko 0b32338e3f Add link to 'noscript' message (#4561) 
* Add link to 'noscript' message

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

* remove indent
 2017-09-02 01:52:28 +02:00
Eugen RochkoandGitHub e482595a5d Add ActivityPub handler for Delete->Actor activities (#4761) 2017-09-01 21:54:42 +02:00
Eugen RochkoandGitHub 9c04fadec9 Finish up embed modal feature (#4759) 
* Add embed button to dropdowns of in-timeline statuses

* yarn run manage:translations
 2017-09-01 21:30:13 +02:00
Eugen RochkoandGitHub 390bfec6da Avoid sending some ActivityPub payloads if the receiver will get them through distribution (#4739) 2017-09-01 21:26:01 +02:00
Eugen RochkoandGitHub c2980d5b17 Do not rely on activity arriving exactly once after delete arrived (#4754) 2017-09-01 21:12:59 +02:00
CygnanandEugen Rochko a75aa62f5b Adjust padding on the public profile page (#4757) 
* Fix a style issue on the public profile page for some mobile browsers

Signed-off-by: Cygnan <email@cygnan.com>

* Set padding-bottom to 20px

Signed-off-by: Cygnan <email@cygnan.com>
 2017-09-01 21:01:23 +02:00
unaristandEugen Rochko 8fd8f81ae7 Deduplicate with local status on Create activity (#4763) 2017-09-01 21:00:43 +02:00
Eugen RochkoandGitHub 921cf3e9c8 Fix NoMethodError (#4762) 2017-09-01 20:50:42 +02:00
Eugen RochkoandGitHub 7dc5035031 Make PreviewCard records reuseable between statuses (#4642) 
* Make PreviewCard records reuseable between statuses

**Warning!** Migration truncates preview_cards tablec

* Allow a wider thumbnail for link preview, display it in horizontal layout (#4648)

* Delete preview cards files before truncating

* Rename old table instead of truncating it

* Add mastodon:maintenance:remove_deprecated_preview_cards

* Ignore deprecated_preview_cards in schema definition

* Fix null behaviour
 2017-09-01 16:20:16 +02:00
Yamagishi KazutoshiandEugen Rochko 2305f7c391 Use system's default font on non web UI pages (#4553) 
* Use system's default font on non web UI pages

* Remove import for Redirect
 2017-09-01 16:13:31 +02:00