Eugen Rochko
cb45282e47
Fix stats expiring too quickly because of variable mistake ( #6155 )
7 years ago
Akihiko Odaki
5d02615063
Rename key to path in actions and reducers for settings ( #6105 )
7 years ago
Otakan
1cd5812c6b
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
7 years ago
Branko Kokanovic
1c4142da5b
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
David Yip
fa4960ea74
More ../ -> ~.
7 years ago
David Yip
ed572490c1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
7 years ago
Akihiko Odaki
7549f264e6
Use const instead of let for constant ( #6106 )
7 years ago
Akihiko Odaki
616b6867a0
Show mastodon on modal ( #6129 )
7 years ago
cwm
d5770ef7ac
bug fix (tootsuite pr #6120 )
7 years ago
Jenkins
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
David Yip
08ecfe990d
Merge pull request #291 from glitch-soc/merge-upstream
...
Merge with upstream @ fc8c2c9b4a
7 years ago
David Yip
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
David Yip
f19b436c83
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
7 years ago
David Yip
5ec1a9b484
Use ~ notation in components for image references
...
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
7 years ago
cwm
a4ae9c4109
remove unused 'saveSettings' from column_settings_container
7 years ago
cwm
093c27fe46
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
7 years ago
Jeong Arm
fc8c2c9b4a
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
7 years ago
beatrix
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
7 years ago
Eugen Rochko
9427823d5c
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
7 years ago
MitarashiDango
a52820a7fd
bug fix (WebPush does not work) ( #6120 )
7 years ago
cwm
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
7 years ago
ThibG
3df85a843c
Make host_meta/webfinger replies cacheable ( fixes #6100 ) ( #6101 )
...
* Make host_meta/webfinger replies cacheable (fixes #6100 )
Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.
Also explicitly mark results as cacheable with “expires_in”.
* Add “Vary: Accept” header for caching since content-negociation is used
7 years ago
David Yip
f722fcb5a6
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
7 years ago
Akihiko Odaki
093af89c43
Move the mastodon on Getting Started column to drawer column ( #6109 )
...
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
7 years ago
Akihiko Odaki
d8a0c19166
Fix XML oEmbed support discovery ( #6104 )
7 years ago
beatrix
dde1db7efb
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
7 years ago
cwm
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
7 years ago
cwm
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
7 years ago
cwm
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
7 years ago
cwm
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
7 years ago
cwm
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
7 years ago
cwm
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
7 years ago
cwm
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
7 years ago
cwm
15796d0b5f
use 'flavours/glitch/' prefix in new imports
7 years ago
cwm
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
7 years ago
Jenkins
2bd6532e63
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Chris
1f0ae8d173
Add mute, block, conversation mute actions to detailed status dropdown menu ( #6099 )
...
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226 )
* remove unused withDismiss in detailed status
7 years ago
MitarashiDango
b4047027d4
Additional prop name change. ( #6098 )
7 years ago
Jenkins
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Neetshin
fad20b7830
Add validation for onMuteNotifications ( #6092 )
...
* 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
* Add validation for onMuteNotifications
7 years ago
Nolan Lawson
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
7 years ago
Akihiko Odaki
3f52d12a4c
Refactor web_push_subscription ( #6047 )
...
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
7 years ago
Chris
65cabbe8ef
removed references to hideOnMobile in column_link and getting_started ( #6082 )
...
* removed references to hideOnMobile in column_link and getting_started
* move keyboard shortcuts back below blocked users
7 years ago
cpsdqs
7f1828166d
Move dropdown transform origin to top edge ( #6091 )
7 years ago
Jenkins
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ncls7615
33f2976c84
Update and add some translate
7 years ago
ncls7615
0d900416f7
Add more en and ja
7 years ago
ncls7615
43b9a78f1d
Add en and ja
7 years ago
ThibG
7eb2f42976
Reduce the number of synchronous resolves when posting toots ( #6075 )
7 years ago
ThibG
87ee458079
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.
7 years ago
beatrix
9ba54d457a
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
7 years ago
ncls7615
4c682228ce
Fix account header avatar
7 years ago
David Yip
d93f6b4720
Add data-status-by back to DetailedStatus component. Fixes #273 .
7 years ago
cwm
f923aeec08
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
7 years ago
beatrix
f42aa942b4
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 )
7 years ago
David Yip
c94a497ef6
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
7 years ago
cwm
ca77c18c24
add keyboard shortcuts to getting started ( fixes #275 )
7 years ago
David Yip
ea1c58f6d8
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
7 years ago
Jenkins
034617cac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki
73b5392cb2
Rename settingKey in setting_toggle to settingPath ( #6046 )
7 years ago
Neetshin
163da9770c
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
7 years ago
Jeong Arm
7df9864429
Update Korean translation ( #6050 )
...
* Update Korean translation
* Translate Korean for javascript
* Add missing translations on simple_form
7 years ago
ncls7615
58e3bd4d71
Add en and ja
7 years ago
cwm
5b185a0a0f
missed a semicolon
7 years ago
cwm
1dd4e3791f
use makeMapStateToProps
7 years ago
cwm
d6ca0e29a7
use list-ul icon in list header and web/lists
7 years ago
Jenkins
9dd76b5b41
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter
c9c63c2232
Add Slovak translation ( #6052 )
...
* Add Slovak translation
* Slovak translation: i18n-normalize
7 years ago
beatrix
978e5e5606
Merge pull request #253 from glitch-soc/prevent-local-only-federation
...
prevent federation of local-only statuses
7 years ago
ncls7615
82bff179f4
fix admin/action_logs page
7 years ago
kibigo!
e59d124be5
Fixes #244 to make search results scrollable
7 years ago
David Yip
d53f727653
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
7 years ago
NCLS
cbc2f1ea5d
Update ja.js
7 years ago
NCLS
b9d1543f7e
Update ja.js
7 years ago
Jenkins
601f0fe4a3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
99a208cd8f
Do not hide statuses from silenced accounts from other silenced accounts ( #6030 )
7 years ago
Naoki Kosaka
7da34ff0a3
Fix oEmbed image_modal src. ( #6027 )
7 years ago
Eugen Rochko
ef8fc3542b
Fix #6022 - Prevent nested migrated accounts, or migrations to self ( #6026 )
7 years ago
SerCom_KC
19a2ed9a04
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
7 years ago
Jeroen
0cadfd35a5
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
7 years ago
David Yip
b8e6074c53
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
7 years ago
Jenkins
e3d8c010b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura
d0a8463db0
Fix focused background color of notifications of direct toots ( #6021 )
7 years ago
Lynx Kotoura
891b03536f
Fix overflowing emojis on some devices ( #6016 )
...
* Fix overflowing emojis on some devices
* Quit visible and add padding
7 years ago
Olivier Humbert
4621fd6461
1 fix + 1 translation ( #6019 )
7 years ago
Jenkins
ac183e024b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
1010831783
Fix regression from #6014 ( #6018 )
7 years ago
Jenkins
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31
10c0745c8f
l10n OC and FR updates ( #6017 )
...
* Adjust empty list timeline message (#5997 )
* Adjust empty list timeline message (#5997 )
* Add filters to admin UI for custom emojis (#6003 ) + #6004
* Update fr.yml
7 years ago
Eugen Rochko
772456072e
Fix layout for RTL ( #6014 )
7 years ago
Lynx Kotoura
cbf6bd4e0c
Excahnge the order of spoiler-input and unlocked warning ( #6015 )
...
* Excahnge the order of spoiler-input and unlocked warning
* Fix trailing whitespace
7 years ago
Lynx Kotoura
d7bd1906d4
Redesign tootbox ( #5919 )
...
* Redesign tootbox
* Move counter into compose-form__buttons-wrapper
Change font and remove shadow
Refactor sass codes of compose-form
7 years ago
Eugen Rochko
d4d0befb4b
Weblate translations ( #6011 )
...
* Translated using Weblate (Dutch)
Currently translated at 100.0% (522 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (French)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Arabic)
Currently translated at 40.0% (209 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Polish)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.0% (517 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 22.6% (17 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 66.0% (37 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 48.8% (21 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 73.2% (41 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/
* i18n-tasks normalize && yarn manage:translations
* Restore wrongfully deleted files
7 years ago
SerCom_KC
9bef4eb4c0
Update Chinese (Simplified) translations ( #6005 )
...
* i18n: (zh-CN) Remove spaces in time distances
* i18n: (zh-CN) Update translations for #5997
* i18n: (zh-CN) Add translation for #6004
also change translation of `staff` from `管理员` to `工作人员`
* i18n: (zh-CN) Add translations for #6003
* i18n: (zh-CN) Normalization
7 years ago
Eugen Rochko
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
7 years ago
Yamagishi Kazutoshi
7a5e2ffebe
Set direction style to reply indicator ( #6006 )
7 years ago
Eugen Rochko
8c04f9417f
Fix redundant HTTP request in FetchLinkCardService ( #6002 )
7 years ago
Eugen Rochko
aea3d0814b
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
7 years ago
Eugen Rochko
88aef653ee
Fix GIF avatars not autoplaying when GIF autoplay is enabled ( #6000 )
7 years ago