treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
4,363 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

974 Commits (e3717ffadca8bf2aaa6699175af1ba823f803879)

Author SHA1 Message Date
JohnD28 c66403114c Update doorkeeper.fr.yml (#5317) 2017-10-11 22:04:36 +09:00
Nolan Lawson 82ff80dbad Remove prop types from external libraries (#5304) 2017-10-10 18:44:51 +02:00
Jakob Kramer d24ea1df74 Update German translation (#5302) 2017-10-10 23:12:18 +09:00
Jeong Arm a5582bf9f5 Remove timestamps on any option (#5282) 2017-10-09 17:52:02 +02:00
unarist 12bdbf38ba Fix migration failure due to StrongMigrations on production env (#5283) 2017-10-09 10:05:35 +02:00
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260) 
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
 2017-10-08 17:34:34 +02:00
m4sk1n d9e51960a2 i18n: Update Polish translation (#5270) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-08 16:00:55 +09:00
Jeong Arm 094616ad3f Translate some Esperanto (#5252) 
* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format
 2017-10-08 14:30:14 +09:00
JeanGauthier 5bff1ad44e i18n update Occitan (#5263) 
* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json
 2017-10-08 14:18:27 +09:00
Nolan Lawson 7bde8dcc08 Use ES module build of react-router-dom (#5264) 2017-10-08 02:55:58 +02:00
nullkal 81489970fb Add moderation note (#5240) 
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
 2017-10-07 20:26:43 +02:00
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243) 
* Encode custom emojis as resolveable objects in ActivityPub

* Improve code style
 2017-10-07 17:43:42 +02:00
Jeong Arm 9ea15ab021 Korean translation (#5244) 
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
 2017-10-07 14:16:59 +09:00
m4sk1n 84780cbd96 i18n: Update Polish translation (#5255) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-06 22:43:32 +02:00
Eugen Rochko 27fd33256c Clean up code style of Mastodon::TimestampId module (#5232) 
* Clean up code style of Mastodon::TimestampId module

* Update brakeman config
 2017-10-06 03:42:21 +02:00
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231) 2017-10-05 23:42:05 +02:00
Lynx Kotoura 4e822d41b9 adjust public profile pages 2 (#5223) 2017-10-04 22:49:36 +02:00
Jakob Kramer 53105c4210 Update German translation (#5221) 2017-10-04 20:03:41 +02:00
utam0k 51f8cbfbeb Implement EmailBlackList (#5109) 
* Implement BlacklistedEmailDomain

* Use Faker::Internet.domain_name

* Remove note column

* Add frozen_string_literal comment

* Delete unnecessary codes

* Sort alphabetically

* Change of wording

* Rename BlacklistedEmailDomain to EmailDomainBlock
 2017-10-04 15:16:10 +02:00
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447) 
* Separate notifications preferences from general preferences

* Refine settings/notifications/show

* remove preferences.notifications
 2017-10-04 10:22:52 +02:00
aschmitz 4f7aa88461 Configure webpack to poll for changes in development (#5040) 
* Configure webpack to poll for changes in development

Vagrant on Linux/macOS hosts shared files via NFS, which doens't
support inotify-based watching of files. This tweak makes webpack
check for changes every second, and rebuild if necessary. This
removes the need to restart Foreman every time a frontend file
changes. Note that rebuilding is still a relatively lengthy
process.

The polling frequency can be changed to taste.

* Only poll in Vagrant

This tests for the presence of the VAGRANT environment variable to
determine whether or not we're in Vagrant. It is set in .env.vagrant,
which is set up to be included in the Vagrantfile.
 2017-10-04 09:52:11 +02:00
Yamagishi Kazutoshi f7d7a92d57 Add missing Japanese translations (#5193) 
* yarn manage:translations

* Add Japanese translations for #5170

* Add Japanese translations for #5123

* Add Japanese translations for #5046

* Add Japanese translations for #5099

* Add Japanese translations for #5161

* "項目" -> "絵文字"
 2017-10-03 13:10:26 +02:00
Jakob Kramer 902e249cdb Update German translation (#5189) 2017-10-03 09:53:18 +09:00
m4sk1n 17bcb30c82 i18n: Update translation files and Polish translation (#5180) 
* Update translation files

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

* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-02 23:38:40 +02:00
Jeong Arm ee21576c19 Korean translation (#5185) 
* Add missing Korean translations

* Add Korean email confirmation template

* Fix Korean typo
 2017-10-02 23:26:28 +02:00
JeanGauthier 941a1532f2 l10n Update OC: reorganization pref. page (#5168) 2017-10-01 19:09:45 +02:00
Eugen Rochko 06ef1b0ac4 Reorganize preferences page (#5161) 2017-10-01 10:52:39 +02:00
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 2017-09-30 22:05:42 +02:00
roikale 4f18c27c43 Change wording on landing page. (#4805) 
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa".
https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
 2017-09-30 16:25:14 +02:00
Nishi, Keisuke 8f344b7bb0 Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155) 2017-09-30 14:28:29 +02:00
Jakob Kramer 6f2a885ea3 Updated German translation (#5151) 
Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.

More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.

Some small improvements.
 2017-09-29 21:11:28 +02:00
Yanaken e65378e808 Better Japanese translations (#5142) 2017-09-29 13:27:31 +09:00
Eugen Rochko 6033b8eac1 Replace self-rolled statsd instrumention with localshred/nsa (#5118) 2017-09-29 03:16:44 +02:00
Jakob Kramer d55a6ae28a Update German translation (#5133) 
Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)
 2017-09-28 20:45:09 +02:00
JeanGauthier 0f0791c563 OC 500 error (#5110) 2017-09-28 20:22:34 +02:00
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123) 
* Fix #117 - Add ability to specify alternative text for media attachments

- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input

* Add tests

* Change undo button blend mode to difference
 2017-09-28 15:31:31 +02:00
Eugen Rochko 7031e350b3 When OAuth password verification fails, return 401 instead of redirect (#5111) 
Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
 2017-09-27 23:42:49 +02:00
Yamagishi Kazutoshi 12b7306a03 Upgrade Webpacker to version 3.0.1 (#5122) 2017-09-27 14:41:54 +02:00
m4sk1n 7291f1de08 i18n: Update Polish translation (#5106) 
* i18n: Update Polish translation

* i18n: Update Polish translation
 2017-09-26 14:19:25 +09:00
Eugen Rochko 10a2b3dd4c Follow-up to #4582 and #5027, removing dead code (#5101) 2017-09-26 01:06:27 +02:00
Eugen Rochko 1767f9817c New error page graphic. Other error page improvements (#5099) 
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault
 2017-09-25 23:05:54 +02:00
Eugen Rochko 6b0ea1e79c Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) 2017-09-25 04:04:04 +02:00
Eugen Rochko 65827bd2b4 Add strong_migrations gem to warn when creating unsafe migrations (#5078) 2017-09-25 02:11:14 +02:00
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051) 2017-09-23 01:57:23 +02:00
Lynx Kotoura 88fd9f47fd Fix theme translations alphabetically (#5031) 2017-09-20 19:41:35 +02:00
Eugen Rochko f8e734ff9a Disable private status federation over OStatus (#5027) 2017-09-20 19:08:20 +02:00
Lynx Kotoura 42bacb1e30 Better Japanese translations (#5030) 2017-09-21 01:56:28 +09:00
mayaeh 0e9e5e0317 Add Japanese translations for multiple themes, custom emoji (#5026) 
* Add Japanese translations for multiple themes

* Change Japanese translation for custom emoji's created_msg.
 2017-09-20 16:09:57 +02:00
JeanGauthier acfb7a463e l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023) 
* Oauto code string

* Theme, custom emoji and more

* Site theme

* added two spaces wierdly gone away

* Update oc.yml

Changes adviced
 2017-09-20 15:00:54 +02:00