1254 Commits (201e82686f86d06e10afb62184a091417b09d5ad)

Author SHA1 Message Date
Jenkins 2a5af9c10c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh fc2155019b Add Japanese translations. (#5769)
7 years ago
Marcin Mikołajczak 1a07b83c69 i18n: Update Polish translation - back-end (#230)
7 years ago
Joan Montané 53b7b81b43 Update and fix Catalan translation (#5773)
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
mayaeh 08deec4c84 i18n: Update ja translation for moderator badge. (#5731)
7 years ago
Lynx Kotoura 3d1d3d9a20 Remove translations of default theme (#5741)
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
beatrix bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
Marcin Mikołajczak b380e9d2cb i18n: Update Polish translation (#5749)
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
Jenkins eed50514be Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 6be72a3ec6 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! a618df7998 Sets default theme to glitch
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi dc6e031364 Redirect to reports when moderator (#5733)
7 years ago
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
mayaeh f6bc6399e2 Add Japanese translation for DM block option. (#5704)
7 years ago
Eugen Rochko 546257bc7f Allow specifying STATSD_NAMESPACE (#5700)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
SerCom_KC c3ec1e87b8 Updating Chinese (Simplified) translations (#5643)
7 years ago
Marcin Mikołajczak 8087aa83d4 i18n: Update Polish translation (#5699)
7 years ago
mayaeh 249b0fe107 Add Japanese translations for moderator roles and its own admin actions. (#5689)
7 years ago
Marcin Mikołajczak a6682a3000 i18n: fix typo in Polish translation (#5688)
7 years ago
Anna e só 0e6c4cb796 l10n: PT-BR translation updated (#5681)
7 years ago
KEINOS 252d0fe020 Fix #5652 - Notify too short when abbrev in JA (#5664)
7 years ago
Marcin Mikołajczak fcb9533549 i18n: Update Polish translation (for #5635) (#5661)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Matt e5aa4128f6 Update en.yml (#5648)
7 years ago
Marcin Mikołajczak cfd7b7a0b7 i18n: Update Polish translation (#5639)
7 years ago
nullkal 36376b5e23 Translate ja (#5637)
7 years ago
Quenty31 eb97bd8af6 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
MitarashiDango cbbeec05be Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)
7 years ago
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
Yamagishi Kazutoshi 47b0c61853 Unify file upload to using fog (#5604)
7 years ago
Marcin Mikołajczak d48779cf7b i18n: Improve Polish translation (#5596)
7 years ago
Yamagishi Kazutoshi 8a588145d5 Update extract-text-webpack-plugin to version 3.0.2 (#5584)
7 years ago
beatrix 254b74c71f
add memorial to production.rb
7 years ago
Quenty31 da3adc0a73 l10n Occitan (#5586)
7 years ago
MitarashiDango 38d072446b add account search condition (instance domain) (#5577)
7 years ago
Yamagishi Kazutoshi 8ae9bd0eea Upgrade compression-webpack-plugin to version 1.0.1 (#5581)
7 years ago
Nolan Lawson 0692991b54 Add ServiceWorker caching for static assets (#5524)
7 years ago
Yamagishi Kazutoshi a2a4bf4e78 Update dependencies for Ruby (2017-10-30) (#5566)
7 years ago
SerCom_KC 29609fbb6a Updating Chinese (Simplified) translations (#5508)
7 years ago
Alda Marteau-Hardi 4080569c2d Fix a grammatical error in the notifications. (#5555)
7 years ago
Marcin Mikołajczak 2cbb8e8cd1 i18n: Update Polish translation (#5547)
7 years ago
Akihiko Odaki e4080772b5 Use contenthash for ExtractTextWebpackPlugin (#5462)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Jenkins 5f0268ab84 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 20fee786b1 Update Russian translation (#5517)
7 years ago
Anna e só 74777599cf l10n: PT-BR translation updated (#5530)
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 1a60445a5f Address unused translation errors.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson c710069c12 Some typos and supplementation in sentence structures (#5441)
7 years ago
Jeroen 363d0d3a44 Dutch: A few strings I found last minute (#5440)
7 years ago
JeanGauthier 33ea042dec i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Jakob Kramer e6c9756fa9 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi 5050719fac Add Japanese translations (#5427)
7 years ago
Yamagishi Kazutoshi 989553c69a Normalize locale files (#5429)
7 years ago
masarakki 0e0c6b1b4b use-DB_NAME-in-development (#5430)
7 years ago
Håkan Eriksson a2b600428c Swedish translation (#5406)
7 years ago
Jeroen df1a9c5ab5 Small update Dutch (nl) strings (#5424)
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Marcin Mikołajczak 3c530d95f6 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier 1e7b3bf625 i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
voidSatisfaction 3e2f793948 Add up-to-date korean translation on serverside (#5400)
7 years ago
JeanGauthier 8eb7d30a6c l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A 7fe1428cc4 Update French translation (#5401)
7 years ago
spla f63a40e7c2 Updated Catalan strings (#5323)
7 years ago
Yannick A c6f76db2e1 Update French translation (#5384)
7 years ago
Masoud Abkenar 2c704ca9c6 l10n: update Persian translation for 2.0 (#5391)
7 years ago
Mathias B c1a2707ecf Correct some misspellings (#5381)
7 years ago
Anna e só ad917cda10 l10n: PT-BR translation updated (#5362)
7 years ago
Jeroen f398ad1994 Updating more Dutch strings for 2.0 (#5359)
7 years ago
Alda Marteau-Hardi 3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
JohnD28 691e9112f3 Update fr.yml (#5330)
7 years ago
David Yip 13e05fece2 Merge tag 'v2.0.0rc2' into gs-master
7 years ago
Marcin Mikołajczak 9d84b6e606 i18n: Update Polish translation (#5346)
7 years ago
JeanGauthier bf0f7e8846 Moderation notes (#5344)
7 years ago
nullkal 4817744b87 Update ja.yml (#5342)
7 years ago
Sylvhem 3ebe03b729 Fixes and updates for the French translation (#5340)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
JohnD28 fe6941e28e Update doorkeeper.fr.yml (#5317)
7 years ago
Nolan Lawson bebaa6eced Remove prop types from external libraries (#5304)
7 years ago
Jakob Kramer 616f53eea8 Update German translation (#5302)
7 years ago
Jeong Arm 9d97054fe6 Remove timestamps on any option (#5282)
7 years ago
unarist 7fd66cf2fe Fix migration failure due to StrongMigrations on production env (#5283)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
m4sk1n f0c939c431 i18n: Update Polish translation (#5270)
7 years ago
Jeong Arm ebadfe0ab7 Translate some Esperanto (#5252)
7 years ago
JeanGauthier 94f15338c3 i18n update Occitan (#5263)
7 years ago
Nolan Lawson 7de6d269d2 Use ES module build of react-router-dom (#5264)
7 years ago
DJ Sundog 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Jeong Arm 0e0a9e716c Korean translation (#5244)
7 years ago
m4sk1n 4413d81d7f i18n: Update Polish translation (#5255)
7 years ago
Eugen Rochko eb5ac23434 Clean up code style of Mastodon::TimestampId module (#5232)
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Lynx Kotoura 32e8a87830 adjust public profile pages 2 (#5223)
7 years ago
Jakob Kramer 636acb5712 Update German translation (#5221)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 2076c557c9 Configure webpack to poll for changes in development (#5040)
7 years ago
Yamagishi Kazutoshi eb6ec3d068 Add missing Japanese translations (#5193)
7 years ago
Jakob Kramer 395a57d03d Update German translation (#5189)
7 years ago
m4sk1n a767ef85fa i18n: Update translation files and Polish translation (#5180)
7 years ago
Jeong Arm c30e492587 Korean translation (#5185)
7 years ago
JeanGauthier 04fa4eb7f9 l10n Update OC: reorganization pref. page (#5168)
7 years ago
Eugen Rochko 0b3f1ec62a Reorganize preferences page (#5161)
7 years ago
Eugen Rochko eb605141ff Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
roikale 1df453aff6 Change wording on landing page. (#4805)
7 years ago
Nishi, Keisuke 83ffc4dc07 Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)
7 years ago
Jakob Kramer 1a72813b53 Updated German translation (#5151)
7 years ago
Yanaken c3f9c74719 Better Japanese translations (#5142)
7 years ago
Eugen Rochko 35a8cafa35 Replace self-rolled statsd instrumention with localshred/nsa (#5118)
7 years ago
Jakob Kramer d0b4709b2a Update German translation (#5133)
7 years ago
JeanGauthier 3406e30526 OC 500 error (#5110)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko db3ed498b0 When OAuth password verification fails, return 401 instead of redirect (#5111)
7 years ago
Yamagishi Kazutoshi 901fc48aae Upgrade Webpacker to version 3.0.1 (#5122)
7 years ago
m4sk1n 9d53a38a44 i18n: Update Polish translation (#5106)
7 years ago
kibigo! f7ca205f38 Fixed webpack config code
7 years ago
kibigo! 86e617a839 Better themeing support!!
7 years ago
Eugen Rochko e528114c53 Follow-up to #4582 and #5027, removing dead code (#5101)
7 years ago
Eugen Rochko 3b60832214 New error page graphic. Other error page improvements (#5099)
7 years ago
Eugen Rochko 2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
7 years ago
Eugen Rochko b982d549f4 Add strong_migrations gem to warn when creating unsafe migrations (#5078)
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Lynx Kotoura 8fcfcddc8f Fix theme translations alphabetically (#5031)
7 years ago
Eugen Rochko d68df88d4e Disable private status federation over OStatus (#5027)
7 years ago
Lynx Kotoura f41e70ca38 Better Japanese translations (#5030)
7 years ago
mayaeh 7b8ecde32d Add Japanese translations for multiple themes, custom emoji (#5026)
7 years ago
JeanGauthier 1607bb445a l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023)
7 years ago
mayaeh 33c39784e4 Add japanese translations for custom emoji. (#5007)
7 years ago
m4sk1n 1de6c52545 i18n: Update Polish translation (#5015)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko 09a94b575e Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko d43944143a Run i18n-tasks normalize (#5003)
7 years ago
BruWalfas c155d843f4 A few updates to the Spanish translation and some typos fixing (#4997)
7 years ago
unarist 6db034a866 Re-allow underscore on valid_url_path_ending_chars (#4999)
7 years ago
Lynx Kotoura 4c14ff659b Oauth code in input form and add description message (#4986)
7 years ago
Patrick Figel 8811778b55 Randomize sidekiq-scheduler cron schedule (#4980)
7 years ago
Mingye Wang c8969dca35 Minor Chinese check & jsx addition (#4973)
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
Anna e só e77cc032c2 l10n: PT-BR translation updated (#4953)
7 years ago
sdukhovni 67559361e8 Add scheduled worker to purge old user IPs (#4951)
7 years ago
Yamagishi Kazutoshi bdcc9e2ceb Add missing Japanese translations (#4947)
7 years ago
ふぁぼ原 3816943e6b Enable to recognize most kinds of characters as URL paths (#4941)
7 years ago
Masoud Abkenar b39d512ade l10n: update Persian translation (#4946)
7 years ago
abcang 1aad015bbb Revert unique retry job (#4937)
7 years ago
m4sk1n 94fba44eec i18n: Update Polish translation (#4942)
7 years ago
Jeroen 721460a59b Another Dutch language update (#4944)
7 years ago
Quent-in aad3df6afc l10n update OC/FR video redesign (#4938)
7 years ago
N氏 1023f52eaa Add Japanese translate for #4913 (#4936)
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
m4sk1n 06f26e09b4 i18n: Update Polish translation (#4929)
7 years ago
Jeroen 331263270b Updating Dutch translation (#4927)
7 years ago
Eugen Rochko 56af04dbb4 Fix #4918 - Limit pinned toots to 5 (#4923)
7 years ago
unarist af10c9fbff Add section for protocol specific information on the admin page (#4910)
7 years ago
Patrick Figel 3018043fc2 Add OpenStack Keystone V3 support (#4889)
7 years ago
Anna e só c2bee07dbc l10n: Full PT-BR translation (#4882)
7 years ago
Masoud Abkenar a345479de2 l10n: update Persian translation (#4880)
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
m4sk1n 08f00df94b i18n: Update Polish translation (#4881)
7 years ago
yoshipc 15b886a6f0 Fix Japanese translation (#4876)
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
Yamagishi Kazutoshi 3f333a8d31 Set fallback address when empty notification address (#4868)
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
m4sk1n 7c2d84910c i18n: Update Polish translation (#4845)
7 years ago
abcang 6859d4c028 Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)
7 years ago
Masoud Abkenar aec5097d44 i18n: update Persian translation (#4822)
7 years ago
Adam Thurlow 6994664a13 swift-enable the paperclip! 📎 (#2322)
7 years ago
abcang be7ffa2d75 Do not execute the job with the same arguments as the retry job (#4814)
7 years ago
voidSatisfaction 4d67bf18fe Translation korean added (#4802)
7 years ago
ButterflyOfFire f09a250a7c Update ar.yml (#4810)
7 years ago
Eugen Rochko 8b12e3cc7f Fix short number locales (#4790)
7 years ago
Andreas Drop d3f46a77c3 Make german translation more gender neutral #4755 (#4789)
7 years ago