tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,864 Commits 10 Branches 0 Tags
3aa2418217edf77ccfd499064938896dce4c2bee
Commit Graph
1716 Commits
Author SHA1 Message Date
Yamagishi KazutoshiandEugen Rochko 3f333a8d31 Set fallback address when empty notification address (#4868) 2017-09-09 21:31:48 +02:00
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 2017-09-09 14:27:47 -05:00
m4sk1nandYamagishi Kazutoshi 7c2d84910c i18n: Update Polish translation (#4845) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-09-08 05:51:48 +09:00
abcangandEugen Rochko 6859d4c028 Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836) 2017-09-07 16:44:14 +02:00
Masoud AbkenarandEugen Rochko aec5097d44 i18n: update Persian translation (#4822) 2017-09-06 17:31:54 +02:00
Adam ThurlowandEugen Rochko 6994664a13 swift-enable the paperclip! 📎 (#2322) 2017-09-05 23:17:06 +02:00
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
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 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
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
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
Yamagishi KazutoshiandEugen Rochko a0294c8880 Add Japanese translate for #4561 (#4771) 2017-09-02 14:02:29 +02:00
Eugen RochkoandGitHub 1b1e025b41 Use updated ActivityStreams context (added: sharedInbox) (#4764) 2017-09-02 14:00:58 +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 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
Damien ErambertandEugen Rochko 1a0df58878 Update FR locales (#4714) 
* Make the fr locales up-to-date with the last changes (new profile view, applications)

* Use the same wording for toots in fr.yml and fr.json

* Translate the pin related strings

* Translate pin-related locales on the front-end

* Add missing locales in doorkeeper.fr.yml and remove un-used ones

* Change "posts" back to "status" in the /about/more page in fr.yml

* Fix typos for "status" in fr.yml

* fix typo for "status" in fr.json

* Remove duplicate string

* Non-breaking space before punctuation

* 'Better' translation for "unpin"

* Put back 'pouet' where it was already

* Fix

* Fix
 2017-09-01 14:09:01 +02:00
Eugen RochkoandGitHub 74437c6bff Refactor Web::PushSubscription, remove welcome message (#4524) 
* Refactor Web::PushSubscription, remove welcome message

* Add missing helper

* Use locale of the receiver on push notifications (#4519)

* Remove unused translations

* Fix dir on notifications
 2017-09-01 13:35:23 +02:00
Eugen RochkoandGitHub d1a78eba15 Embed modal (#4748) 
* Embed modal

* Proxy OEmbed requests from web UI
 2017-08-31 03:38:35 +02:00
Eugen RochkoandGitHub 2db9ccaf3e Add sharedInbox to actors (#4737) 2017-08-31 00:02:59 +02:00
Eugen RochkoandGitHub e95bdec7c5 Update status embeds (#4742) 
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
 2017-08-30 10:23:43 +02:00
Lynx KotouraandYamagishi Kazutoshi 8f527bd588 Add japanese translations for shorten display of large numbers (#4722) 2017-08-28 08:16:49 +09:00
Eugen RochkoandGitHub 15093f9113 Shorten display of large numbers on public profiles (#4711) 2017-08-27 17:04:45 +02:00
mayaehandYamagishi Kazutoshi f92d991e52 Add japanese translations for Pinned statuses based on pawoo. (#4717) 
Add japanese translations for pin_errors.
 2017-08-28 00:03:27 +09:00
Eugen RochkoandGitHub 00840f4f2e Add handling of Linked Data Signatures in payloads (#4687) 
* Add handling of Linked Data Signatures in payloads

* Add a way to sign JSON, fix canonicalization of signature options

* Fix signatureValue encoding, send out signed JSON when distributing

* Add missing security context
 2017-08-26 13:47:38 +02:00
Quent-inandYamagishi Kazutoshi 04c3fb2189 i18n Updated strings (#4675 - pinned toot) (#4695) 
* Added string for pinned toots

* Pinned toot #4675 + missing string

Somehow I deleted it "enabled_success"

* update after advice
 2017-08-25 23:04:52 +09:00
m4sk1nandYamagishi Kazutoshi 409051c22c i18n: Update Polish translation #4675 (#4692) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-08-25 17:58:31 +09:00
Eugen RochkoandGitHub 9caa90025f Pinned statuses (#4675) 
* Pinned statuses

* yarn manage:translations
 2017-08-25 01:41:18 +02:00
Yamagishi KazutoshiandEugen Rochko da172a8b1b Disable babel-loader cache when development environment (#4684) 2017-08-24 19:27:52 +02:00
Eugen RochkoandGitHub cf615abbf9 Add configuration to disable private status federation over PuSH (#4582) 2017-08-24 17:51:32 +02:00
Quent-inandYamagishi Kazutoshi e4c761f902 l18n update OC new strings (#4664) (#4680) 
* New strings

* Update

Thin non breaking spaces

* Update

Thin non breaking spaces

* Update

Thin non breaking spaces
 2017-08-24 16:16:32 +09:00
m4sk1nandEugen Rochko 829e2e8c5d Update Polish translation (#4674) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-08-23 17:45:29 +02:00
Yamagishi KazutoshiandEugen Rochko 8d23667536 Add Japanese translations for #2758, #4506, #4521, #4600 and #4664 (#4665) 
* Add Japanese translations for #2758, #4506, #4521, #4600 and #4664

* Do not translate Inbox URL and Outbox URL

* Remove "あなたの"

* Remove "あなたの"
 2017-08-23 14:14:22 +02:00
unaristandYamagishi Kazutoshi 9846806cb5 Fix Japanese translation (#4669) 2017-08-23 20:07:29 +09:00
Eugen RochkoandGitHub c1b086a538 Fix up the applications area (#4664) 
- Section it into "Development" area
- Improve UI of application form, index, and details
 2017-08-23 00:59:35 +02:00
Colin MitchellandEugen Rochko 871c0d251a Application prefs section (#2758) 
* Add code for creating/managing apps to settings section

* Add specs for app changes

* Fix controller spec

* Fix view file I pasted over by mistake

* Add locale strings. Add 'my apps' to nav

* Add Client ID/Secret to App page. Add some visual separation

* Fix rubocop warnings

* Fix embarrassing typo

I lost an `end` statement while fixing a merge conflict.

* Add code for creating/managing apps to settings section

- Add specs for app changes
- Add locale strings. Add 'my apps' to nav
- Add Client ID/Secret to App page. Add some visual separation
- Fix some bugs/warnings

* Update to match code standards

* Trigger notification

* Add warning about not sharing API secrets

* Tweak spec a bit

* Cleanup fixture creation by using let!

* Remove unused key

* Add foreign key for application<->user
 2017-08-22 18:33:57 +02:00
Yamagishi KazutoshiandEugen Rochko 11a7507318 Add delete account link for French (#4659) 2017-08-22 18:31:42 +02:00
Eugen RochkoandGitHub f391a4673a Periodically remove expired PuSH subscribers (#4654) 2017-08-21 22:56:33 +02:00
m4sk1nandYamagishi Kazutoshi 4c23544714 i18n: Minor changes in Polish translation (#4649) 
* i18n: Minor changes in Polish translation

* i18n: pl
 2017-08-21 07:57:28 +09:00
Quent-inandYamagishi Kazutoshi 93d4192a67 l10n update OC : Redesign public profiles (#4608) (#4646) 
New strings added to be shown on the new profile page
 2017-08-20 21:49:12 +09:00
Naoki KosakaandYamagishi Kazutoshi 462c30e26c Update Japanese Translation. (Redesign public profiles) (#4612) 2017-08-17 06:19:37 +09:00
m4sk1nandEugen Rochko 2a04bdc87a i18n: Update Polish translation (#4613) 
* i18n: Update Polish translation

* Update pl.json
 2017-08-16 22:14:23 +02:00
Eugen RochkoandGitHub ca7ea1aba9 Redesign public profiles (#4608) 
* Redesign public profiles

* Responsive design

* Change public profile status filtering defaults and add options

- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option

* Redesign account grid cards

* Fix style issues
 2017-08-16 17:12:58 +02:00
Quent-inandYamagishi Kazutoshi e33c28a6d8 Update ActivityPub (#4600) (#4609) 
Update: new string + more translations for the time in words
 2017-08-16 17:21:34 +09:00
unaristandEugen Rochko 5b9ae7981e Update /admin/accounts/:id view for ActivityPub (#4600) 
* Add protocol field
* Switch protocol specific information according to active protocol
* Hide PuSH subscription related buttons if ActivityPub is active
 2017-08-14 14:09:00 +02:00
Eugen RochkoandGitHub 3c6503038e Add protocol handler. Handle follow intents (#4511) 
* Add protocol handler. Handle follow intents

* Add share intent

* Improve code in intents controller

* Adjust share form CSS
 2017-08-14 04:53:31 +02:00
Eugen RochkoandGitHub 6df8bd277b Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
Eugen RochkoandGitHub 40be4ea239 Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587) 
Force SSL only cookies for remember_me, adjust confirmation
expiration time to fit with the user cleanup scheduler
 2017-08-12 16:30:59 +02:00