tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
6,392 Commits 20 Branches 113 Tags 222 MiB
a7a61889d7
Commit Graph

6392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ncls7615
02db8aa3a0
Add en and ja 2017-12-22 12:01:38 +09:00
nightpool
9592b5e31e enforce LOCAL_HTTPS=true in production (#6061) 
* enforce https in production

* note changes in production env sample

* typo fix
 2017-12-22 02:17:59 +01:00
ThibG
cea98e0c12 Reduce the number of synchronous resolves when posting toots (#6075) 2017-12-22 02:15:08 +01:00
ThibG
6eb60260b1 Display deleted users' role as “Suspended” (#6080) 
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
 2017-12-22 02:14:17 +01:00
beatrix
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements 
Getting started column improvements
 2017-12-21 18:47:07 -05:00
beatrix
f78d169d71
Merge pull request #278 from KnzkDev/fix/acc-header-avatar 
Fix account header avatar
 2017-12-21 17:46:53 -05:00
ncls7615
191b625a27
Fix account header avatar 2017-12-22 07:12:49 +09:00
beatrix
a3cb5a6b64
Merge pull request #277 from glitch-soc/273-add-data-status-by-to-detailed-status 
Add data-status-by back to DetailedStatus component.  Fixes #273.
 2017-12-21 16:10:36 -05:00
David Yip
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273. 2017-12-21 13:22:33 -06:00
cwm
d736739e8f <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049) 2017-12-21 13:04:40 -06:00
cwm
7917d45396 remove themes.default from i18n-tasks unused check 2017-12-21 12:45:11 -06:00
beatrix
bc0152974f
Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab 
Wrap <Avatar> in account header in a link to that account's page (fixes #245)
 2017-12-21 08:30:22 -05:00
beatrix
4d34b3495d
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages 
Set packs on 2FA-related pages.  Fixes #271.
 2017-12-21 08:30:05 -05:00
David Yip
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245. 2017-12-21 05:25:16 -06:00
David Yip
00d1f8eea1
Remove themes.default from i18n-tasks unused check 
This translation key comes in from tootsuite, but the flavours system
does not use it.
 2017-12-21 05:24:17 -06:00
David Yip
a1ddc89da6
Remove unused themes.default key in ko locale. 2017-12-20 20:02:50 -06:00
cwm
9042f9a813 add keyboard shortcuts to getting started (fixes #275) 2017-12-20 09:50:29 -06:00
David Yip
bf1eb0912c
Set packs on 2FA-related pages. Fixes #271. 
Specifically, this commit:

- changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from
  S::BaseController, because this gives us the necessary actions and
  packs
- prepends set_pack to Auth::SessionsController's action chain so that
  it takes effect in time for render :two_factor
 2017-12-20 03:15:54 -06:00
Jenkins
6f11aa8383 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-20 08:17:15 +00:00
Akihiko Odaki
81d29e4126 Rename settingKey in setting_toggle to settingPath (#6046) 2017-12-20 16:19:59 +09:00
Neetshin
c11a52d888 Replace <code> to <kbd> in KeyboardShortcuts component (#6049) 
* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

* Change code elements in keyboard-shortcuts component to kbd
 2017-12-20 11:46:25 +09:00
Jeong Arm
e52293482e Update Korean translation (#6050) 
* Update Korean translation

* Translate Korean for javascript

* Add missing translations on simple_form
 2017-12-20 11:45:50 +09:00
beatrix
6cb47f17fc
Merge pull request #272 from KnzkDev/add-en-ja 
i18n: Update some locale files
 2017-12-19 10:35:02 -05:00
ncls7615
d3b2677775
Add en and ja 2017-12-19 20:16:48 +09:00
cwm
14aae9c05c missed a semicolon 2017-12-17 22:21:15 -06:00
cwm
be50e45a74 use makeMapStateToProps 2017-12-17 22:00:25 -06:00
cwm
e4ebbf4f07 use list-ul icon in list header and web/lists 2017-12-17 21:25:18 -06:00
Jenkins
e7fa7fce25 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-17 03:17:14 +00:00
Peter
f38e6a14f2 Add Slovak translation (#6052) 
* Add Slovak translation

* Slovak translation: i18n-normalize
 2017-12-17 11:26:42 +09:00
Jenkins
05a2a70ca2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-16 15:17:12 +00:00
beatrix
e202efdf8a
Merge pull request #253 from glitch-soc/prevent-local-only-federation 
prevent federation of local-only statuses
 2017-12-16 09:26:48 -05:00
beatrix
5325c2ab3e
Merge pull request #270 from KnzkDev/fix/action_logs 
Fix admin/action_logs page
 2017-12-16 09:25:57 -05:00
ncls7615
9e8fa3caee fix admin/action_logs page 2017-12-16 20:27:26 +09:00
kibigo!
e677dda07c Fixes #244 to make search results scrollable 2017-12-15 12:49:23 -08:00
Daigo 3 Dango
a434d9c0cc Remove period from the version number (#6039) 
2.1.0. -> 2.1.0
 2017-12-15 21:38:25 +01:00
David Yip
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation 
Conflicts:
	db/schema.rb
 2017-12-15 12:20:56 -06:00
Jenkins
40afadfb01 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 18:17:14 +00:00
Eugen Rochko
a29432f0cd
Bump version to 2.1.0 🎆 2017-12-15 19:14:57 +01:00
beatrix
e0a573a2ce Merge pull request #269 from ncls7615/patch-1 
Update ja.js
 2017-12-15 09:12:54 -05:00
NCLS
e9a5bde9a0
Update ja.js 2017-12-15 19:43:10 +09:00
NCLS
61ed5b972c
Update ja.js 2017-12-15 19:38:13 +09:00
Jenkins
37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 01:17:12 +00:00
Eugen Rochko
098c7d27fe
Bump version to 2.1.0rc6 2017-12-15 02:00:28 +01:00
Eugen Rochko
3d3b403359
Do not hide statuses from silenced accounts from other silenced accounts (#6030) 2017-12-15 01:54:05 +01:00
Naoki Kosaka
25b0d7538e Fix oEmbed image_modal src. (#6027) 2017-12-14 23:31:14 +01:00
Eugen Rochko
a3b2ea599d
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026) 2017-12-14 21:35:30 +01:00
SerCom_KC
573414f728 Improve Chinese (Simplified) Translations (#6024) 
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109

* i18n: (zh-CN) Change `协管` to `监察员`

* i18n: (zh-CN) Fix all "Are you" questions

* i18n: (zh-CN) Various improvements

* i18n: (zh-CN) Final clean-up

* i18n: (zh-CN) Change translation for 500

* i18n: (zh-CN) Remove spaces between time distances

* i18n: (zh-CN) Improve translations
 2017-12-14 19:33:29 +01:00
Jeroen
aa273a2718 Last minute Dutch string updates (#6025) 
* Last minute Dutch strinfupdate

* Last minute Dutch strings update

* Fixing Weblate output errors

* Fixing Weblate output errors

* Fixing more Weblate rubish

Weblate is also changing some " to ' - I think that is not a problem

* Fixing more weblate stuff

* Fixing

* Update nl.yml
 2017-12-14 18:45:32 +01:00
David Yip
6abb0950c6
Examples for Status.as_public_timeline. 
Also adjust the examples for Status.as_tag_timeline to match the
nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").
 2017-12-14 02:57:59 -06:00
David Yip
e35a350119
Examples for Status#set_locality and .as_tag_timeline. 
This commit also:

- exposes the local-only emoji so that it can be used in examples
- allows local_only to be set explicitly, i.e. for timeline filtering
  specs
 2017-12-14 02:27:42 -06:00