syuilo
5bf947eb0b
Update cropper-dialog.vue
2022-06-11 18:47:58 +09:00
syuilo
f03d4ae585
fix(client): オブジェクトストレージを使用していると画像のクロップができない
2022-06-11 16:46:21 +09:00
syuilo
c1282b4fd6
feat: image cropping ( #8808 )
...
* wip
* wip
* wip
2022-06-11 15:45:44 +09:00
syuilo
01011ef9c5
update deps
2022-06-10 15:06:42 +09:00
Johann150
c8374e8ace
chore: fix some lints automatically ( #8788 )
...
* chore: fix some lints automatically
Fixed lints that were automatically fixable with `eslint --fix`.
* fix type
* workaround for empty interface lint
2022-06-10 14:36:55 +09:00
Johann150
c8db27a71a
refactor: follow button ( #8789 )
...
* fix: display cancelling follow request
* remove unnecessary branch
The executed code is the same as in the else branch so this special
condition is unnecessary.
* remove code duplication
Use the same callback as later for updating these variables.
* use $ref sugar
* remove unused import
Co-authored-by: blackskye-sx <saul.newman@gmail.com>
2022-06-10 14:29:46 +09:00
Andreas Nedbal
cfc6370dbc
fix(client): render quote renote CWs as MFM ( #8792 )
...
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-09 23:45:16 +09:00
Johann150
ca99288baf
fix: use autocomplete=new-password ( #8797 )
2022-06-09 23:42:00 +09:00
Johann150
bb8e8d7daf
properly display alt text for videos ( #8802 )
...
The alt text is already properly federated and given by the API,
it is just not displayed properly by the client.
2022-06-09 23:35:58 +09:00
Johann150
3f88351ca0
fix: try to prevent autocomplete for emoji search ( #8798 )
2022-06-08 20:20:37 +09:00
syuilo
3e465b488d
chore: lint fixes
2022-06-05 12:26:36 +09:00
syuilo
6123d60f9e
chore(client): fix menu item style
2022-06-05 12:23:57 +09:00
syuilo
b262e19742
Revert "feat: option to collapse long notes ( #8561 )"
...
This reverts commit e675ffcf38b07f5c70d00b49c171c7ab3460e810.
2022-06-04 15:23:53 +09:00
Balazs Nadasdi
170ea0f6c2
feat: option to collapse long notes ( #8561 )
...
* feat: option to collapse long notes
Closes #8559
* do not collapse if cw exists
* use '閉じる' to close / show less.
* make it sticky
* Change style of the Show less button
2022-06-04 13:57:09 +09:00
PikaDude
186cac05a2
User moderation details ( #8762 )
...
* add more user details for admins to see
* fix some issues
* small style fix
as suggested by Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* fix
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-06-03 23:14:50 +09:00
sn0w
42e436459c
fix(client): correctly handle MiAuth URLs with query string ( #8772 )
2022-06-03 21:22:03 +09:00
Johann150
58752fab0b
fix: server metrics widget
2022-06-01 08:51:00 +02:00
Johann150
d3e65bc8b7
fix(lint): indentation
2022-05-31 16:22:00 +02:00
tamaina
d1a90695a2
chore: fix import tinycolor
2022-05-30 12:09:22 +00:00
Andreas Nedbal
3b0e1037f5
fix(client): import shared ESLint config in client package ( #8761 )
2022-05-30 11:37:34 +09:00
futchitwo
eb3a114027
fix(client): fix popout url ( #8494 )
2022-05-29 12:21:36 +02:00
Johann150
ec47b46423
refactor: improve code quality ( #8751 )
...
* remove unnecessary if
`Array.prototype.some` already returns a boolean so an if to return
true or false is completely unnecessary in this case.
* perf: use count instead of find
When using `count` instead of `findOneBy`, the data is not
unnecessarily loaded.
* remove duplicate null check
The variable is checked for null in the lines above and the function
returns if so. Therefore, it can not be null at this point.
* simplify `getJsonSchema`
Because the assigned value is `null` and the used keys are only
shallow, use of `nestedProperty.set` seems inappropriate. Because the
value is not read, the initial for loop can be replaced by a `for..in`
loop.
Since all keys will be assigned `null`, the condition of the ternary
expression in the nested function will always be true. Therefore the
recursion case will never happen. With this the nested function can be
eliminated.
* remove duplicate condition
The code above already checks `dragging` and returns if it is truthy.
Checking it again later is therefore unnecessary.
To make this more obvious the `return` is removed in favour of using
an if...else construct.
* remove impossible "unknown" time
The `ago` variable will always be a number and all non-negative numbers
are already covered by other cases, the negative case is handled with
`future` so there is no case when `unkown` could be achieved.
2022-05-29 15:15:52 +09:00
tamaina
82331575cf
refactor: use css module at components/global/loading.vue ( #8750 )
...
* refactor: use css module at components/global/loading.vue
* rename class name to "root"
2022-05-29 00:15:32 +09:00
tamaina
6e4cb0d639
Fix theme import ( #8749 )
2022-05-28 21:59:23 +09:00
Andreas Nedbal
06ea19ed3a
feat(tests): add e2e tests for widgets ( #8735 )
...
* test(e2e): add baseline for widget tests
* chore(repo): enable test running in branch
* fix(e2e): set viewport for widget tests
* fix(client): add widget identifier classes to widgets
* test(e2e): add memo widget test
* fix(tests): force select value
* fix(tests): force button press for widget addition
* fix(tests): invoke select value differently
* fix(tests): adjust widget submit
* fix(tests): don't explicitly navigate for widget test
* fix(tests): click label to hide select popup
* fix(tests): just click modal background
* fix(tests): adjust modal background selector
* fix(tests): click all modal backgrounds
* feat(e2e): add test for adding timeline widget
* fix(client): add more widget identifier classes
* feat(tests): add method abstraction for test cases
* fix(tests): force-click overlays
* fix(tests): force widget button press
* fix(tests): remove timeout from final widget check
* feat(tests): add widget removal test case
* fix(client): use mk instead of msky as class prefix
* fix(tests): check widgets for existence rather than visibility
* chore(meta): don't run tests for specific feature branch
2022-05-28 14:28:12 +09:00
Johann150
0738a65a78
enhance: replace signin CAPTCHA with rate limit ( #8740 )
...
* enhance: rate limit works without signed in user
* fix: make limit key required for limiter
As before the fallback limiter key will be set from the endpoint name.
* enhance: use limiter for signin
* Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした"
This reverts commit 02a43a310f6ad0cc9e9beccc26e51ab5b339e15f.
* Revert "feat: make captcha required when signin to improve security"
This reverts commit b21b0580058c14532ff3f4033e2a9147643bfca6.
* fix undefined reference
* fix: better error message
* enhance: only handle prefix of IPv6
2022-05-28 12:06:47 +09:00
Johann150
d2ca085a17
fix lints ( #8737 )
...
* fix: emits use ev instead of e
* fix: errors use err instead of e
* fix: replace use of data where possible
* fix: events use evt instead of e
* fix: use strict equals
* fix: use emoji instead of e
* fix: vue lints
2022-05-26 22:53:09 +09:00
syuilo
cb330fef64
update deps
2022-05-25 23:28:56 +09:00
Johann150
fc25935360
fix: activity widget used wrong variable name
2022-05-25 10:44:04 +02:00
Johann150
0f307475d3
fix: server metrics widget
2022-05-25 10:13:46 +02:00
Andreas Nedbal
7717535b63
Refactor widgets and fix lint issues ( #8719 )
...
* fix(client): refactor widgets and fix lint issues
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-25 16:43:12 +09:00
Andreas Nedbal
37c4d38bd1
refactor(client): refactor admin/other-settings to use Composition API ( #8667 )
2022-05-25 16:38:18 +09:00
Andreas Nedbal
1a2447d38c
Refactor admin/overview to use Composition API ( #8674 )
...
* refactor(client): refactor admin/overview to use Composition API
* fix(client): apply review suggestions
2022-05-25 16:37:35 +09:00
Andreas Nedbal
4633b7547e
Refactor my-antennas/edit to use Composition API ( #8680 )
...
* refactor(client): refactor my-antennas/edit to use Composition API
* fix(client): apply review suggestions
2022-05-25 16:37:15 +09:00
MeiMei
ca95e15345
Supports Unicode Emoji 14.0 ( #8699 )
...
* Unicode 14.0 Emoji
* mfm-js@0.22.0
* CHANGELOG
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-25 16:35:30 +09:00
Johann150
76e226e226
fix(client): wrong scoping breaks 2FA
2022-05-23 22:43:13 +02:00
Andreas Nedbal
ce4a5fe35b
fix(client): fix undefined data value on 2FA settings ( #8725 )
2022-05-23 21:55:06 +02:00
Andreas Nedbal
3b72ca9ebc
chore(meta): add pixeldesu to patron list ( #8714 )
2022-05-21 09:48:40 +09:00
syuilo
2967841888
fix(client): make emoji stand out more on reaction button
...
Fix #8520
Close #8521
Co-Authored-By: Johann150 <20990607+Johann150@users.noreply.github.com>
2022-05-19 23:23:12 +09:00
Johann150
fac2e57a0e
enhance: page image component with alt text ( #8634 )
...
* refactor to composition API
* use existing image component
This improves user experience because alt text is displayed correctly.
* fix: correct image src
* fix: defineProps
* fix
2022-05-19 20:41:47 +09:00
Johann150
aa1eab985a
enhance(MFM): limit large MFM ( #8540 )
...
* add CSS classes for zoom MFM
* limit nesting of x2, x3, x4 MFM
* simplify CSS calculation
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-05-19 20:38:14 +09:00
xianon
277ac851b6
fix: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する ( #8607 )
...
* ノート詳細で新しいノートの表示が正しくないのを修正する
* ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
2022-05-19 20:32:55 +09:00
Andreas Nedbal
0d90a7ed1d
refactor(client): refactor admin/settings to use Composition API ( #8678 )
2022-05-19 20:30:23 +09:00
Andreas Nedbal
7757d3e400
Refactor pleaseLogin to show a sign-in dialog ( #8630 )
...
* refactor(client): refactor pleaseLogin to show a sign-in dialog
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-19 20:28:08 +09:00
Andreas Nedbal
818345aa72
fix(client): fix lint issues in Deck UI components ( #8681 )
2022-05-19 17:35:43 +09:00
dependabot[bot]
18b726cb02
chore(deps): bump async from 3.2.1 to 3.2.3 in /packages/client ( #8707 )
...
Bumps [async](https://github.com/caolan/async ) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/caolan/async/releases )
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md )
- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3 )
---
updated-dependencies:
- dependency-name: async
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-19 17:35:11 +09:00
syuilo
30927bf26c
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
2022-05-19 17:21:11 +09:00
syuilo
3999558d47
chore(client): tweak loading spinner design
2022-05-19 17:21:08 +09:00
xianon
a72c2b30a7
fix: ノートのインスタンス情報の文字に縁を付けて見やすくする ( #8697 )
...
* ノートのインスタンス情報の背景色が反映されないことがあるのを修正する
* ノートのインスタンス情報の文字に縁を付けて見やすくする
* Revert "ノートのインスタンス情報の背景色が反映されないことがあるのを修正する"
This reverts commit de920dfc537d1f2c68804d0d6930520f2b3cbce7.
* ノートのインスタンス情報の文字の影の数を増やしてさらに見やすくする
2022-05-19 16:17:00 +09:00
syuilo
ea5dd3b1e7
chore(client): tweak loading spinner design
2022-05-19 15:24:35 +09:00
MeiMei
3616557dd5
enhance: Perform port diagnosis at startup only when Listen fails ( #8698 )
...
* Change port check
* Comment: disableClustering
* CHANGELOG
* Smart message
2022-05-19 11:49:07 +09:00
あずき⪥™
dd4be252ca
remove unneeded attrs ( #8673 )
2022-05-18 01:34:30 +09:00
Andreas Nedbal
4eeb4034fd
Refactor file-dialog to use Composition API ( #8661 )
...
* refactor(client): refactor file-dialog to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-18 01:33:21 +09:00
Andreas Nedbal
91de7050e4
Refactor admin/index to use Composition API ( #8662 )
...
* refactor(client): refactor admin/index to use Composition API
* fix(client): fix navigation to initial admin pages
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* fix(client): re-add abuses page to admin/index
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-18 01:32:21 +09:00
Andreas Nedbal
24aaad4b26
refactor(client): refactor admin/instance-block to use Composition API ( #8663 )
2022-05-18 01:31:59 +09:00
Andreas Nedbal
2317105922
Refactor admin/integrations to use Composition API ( #8664 )
...
* refactor(client): refactor admin/integrations to use Composition API
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-18 01:31:48 +09:00
Andreas Nedbal
b51154f037
refactor(client): refactor admin/object-storage to use Composition API ( #8666 )
2022-05-18 01:31:32 +09:00
Andreas Nedbal
9ccc492ea2
refactor(client): refactor admin/proxy-account to use Composition API ( #8675 )
2022-05-18 01:31:16 +09:00
Andreas Nedbal
c07d179878
Refactor admin/queue to use Composition API ( #8676 )
...
* refactor(client): refactor admin/queue to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-18 01:31:04 +09:00
Andreas Nedbal
27f5a4f01a
Refactor admin/relays to use Composition API ( #8677 )
...
* refactor(client): refactor admin/relays to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-18 01:30:49 +09:00
Andreas Nedbal
7ddd8feadb
refactor(client): refactor my-antennas/index to use Composition API ( #8679 )
2022-05-18 01:30:35 +09:00
Andreas Nedbal
5b8c6cc93e
Refactor emoji-edit-dialog to use Composition API ( #8657 )
...
* refactor(client): refactor emoji-edit-dialog to use Composition API
* fix(client): fix editing emoji not updating emoji list
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* fix(client): use cached category info instead of making a request
* fix(client): use updateItem in emoji pagination when editing
* fix(client): reimplement removeItem in MkPagination
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-15 22:20:01 +09:00
syuilo
abd375d3d4
ビルド関係の依存関係をdevDependenciesに入れるのをやめた
...
本番環境でビルドできないため
2022-05-15 17:26:14 +09:00
syuilo
7bd873cc56
CAPTCHA求めるのは2fa認証が無効になっているときだけにした
...
2faのトークンは期限付きだから、CAPTCHA解いてる間に期限切れになる
2022-05-15 16:47:14 +09:00
syuilo
b688744128
feat: make captcha required when signin to improve security
2022-05-15 12:18:46 +09:00
Andreas Nedbal
7b114d5383
fix(client): remove unexpected token ( #8672 )
2022-05-14 23:24:45 +09:00
Andreas Nedbal
1d4069a955
Refactor admin/email-settings to use Composition API ( #8656 )
...
* refactor(client): refactor admin/email-settings to use Composition API
* Update packages/client/src/pages/admin/email-settings.vue
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 21:36:12 +09:00
Andreas Nedbal
2f58decb1c
Refactor admin/database to use Composition API ( #8654 )
...
* refactor(client): refactor admin/database to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 21:35:08 +09:00
Andreas Nedbal
57507cdf32
Refactor admin/security to use Composition API ( #8652 )
...
* refactor(client): refactor admin/security to use Composition API
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 21:34:50 +09:00
Andreas Nedbal
9043e86b49
refactor(client): refactor admin/announcements to use Composition API ( #8650 )
2022-05-14 21:34:07 +09:00
Andreas Nedbal
00b9211465
refactor(client): refactor admin/ads to use Composition API ( #8649 )
2022-05-14 21:33:41 +09:00
Andreas Nedbal
d2149ab081
Refactor Chart component ( #8622 )
...
* refactor(client): refactor Chart component
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* fix(client): don't expose values from Chart
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 21:20:41 +09:00
syuilo
36db202263
enhance: Display TOTP Register URL
...
Close #7261
Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2022-05-14 15:00:15 +09:00
syuilo
493dc6836a
update deps
2022-05-14 14:57:51 +09:00
Andreas Nedbal
326949115e
fix(client): add setup attribute to notification page ( #8648 )
2022-05-12 19:31:26 +02:00
Andreas Nedbal
4c89a565d5
Fix lint issues in post form component ( #8619 )
...
* fix(client): fix lint issues in post form
* Apply review suggestions from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-07 17:01:01 +09:00
Andreas Nedbal
6997ba0b3d
Fix lint issues in emoji picker components ( #8620 )
...
* fix(client): fix lint issues in emoji picker components
* fix(client): switch argument naming for emoji picker section event
2022-05-07 17:00:05 +09:00
Andreas Nedbal
9b3f31df3e
fix(client): fix lint issues in scripts ( #8621 )
2022-05-07 14:19:15 +09:00
Andreas Nedbal
c039207e2a
refactor(client): refactor settings/theme/manage to use Composition API ( #8596 )
2022-05-05 22:53:08 +09:00
futchitwo
37af007e13
Enhance(MFM): Allow speed changes in all animated MFMs ( #8551 )
...
* MFM: Allow speed changes in all animated MFMs
* Feature(MFM): Add speed property to cheat sheet
* Use template literal
Oops!
* Remove unnecessary template string
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-05 22:52:33 +09:00
Andreas Nedbal
9884b5f1da
refactor(client): refactor settings/word-mute to use Composition API ( #8597 )
2022-05-05 22:51:58 +09:00
Andreas Nedbal
8a71098dd5
refactor(client): refactor settings/deck to use Composition API ( #8598 )
2022-05-05 22:51:29 +09:00
Andreas Nedbal
647ba0a54e
Refactor settings/sounds to use Composition API ( #8594 )
...
* refactor(client): refactor settings/sounds to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* chore(client): remove old sound reference
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-05 22:51:05 +09:00
Andreas Nedbal
fae0fbd93c
refactor(client): refactor 2FA settings to Composition API ( #8599 )
2022-05-05 22:41:10 +09:00
tamaina
23eee1b3df
fix (client): fix mention icon height ( #8615 )
2022-05-05 20:46:46 +09:00
Andreas Nedbal
943c6a067e
Fix lint issues in Drive components ( #8613 )
...
* fix(client): Fix lint issues in Drive components
* fix(client): only use !=/== for null comparisons
* Update drive.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-05 20:45:50 +09:00
Andreas Nedbal
78c06ade0c
fix(client): fix duplicate token request dialog in plugin install ( #8612 )
2022-05-05 18:21:38 +09:00
Andreas Nedbal
be8ec800de
Refactor settings/notifications to use Composition API ( #8587 )
...
* refactor(client): refactor settings/notifications to use Composition API
* fix(client): use async/await for API methods
2022-05-04 12:25:19 +09:00
Andreas Nedbal
1f37f2e463
Refactor account-info to use Composition API ( #8568 )
...
* refactor(client): refactor account-info to use Composition API
* fix(client): use mounted hook for initial data
* fix(client): switch to non-null assertion for account check
2022-05-04 10:16:14 +09:00
Andreas Nedbal
8b7f24bef2
refactor(client): refactor settings/api to use Composition API ( #8569 )
2022-05-04 10:15:43 +09:00
Andreas Nedbal
2ed32a38d9
refactor(client): refactor settings/apps to use Composition API ( #8570 )
2022-05-04 10:15:24 +09:00
Andreas Nedbal
07aba28db3
Refactor delete-account to use Composition API ( #8572 )
...
* refactor(client): refactor delete-account to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-04 10:15:06 +09:00
Andreas Nedbal
042d86b1b1
refactor(client): refactor settings/drive to use Composition API ( #8573 )
2022-05-04 10:14:48 +09:00
Andreas Nedbal
0b0b6c3f9b
Refactor settings/email to use Composition API ( #8576 )
...
* refactor(client): refactor settings/email to use Composition API
* fix(client): switch to non-null assertion for settings values
2022-05-04 10:14:26 +09:00
Andreas Nedbal
6ccac37a3d
Refactor settings/general to use Composition API ( #8578 )
...
* refactor(client): refactor settings/general to use Composition API
* fix(client): turn watcher callback asynchronous
2022-05-04 10:13:51 +09:00
Andreas Nedbal
7e68b24677
Refactor settings/menu to use Composition API ( #8586 )
...
* refactor(client): refactor settings/menu to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-04 10:12:40 +09:00
Andreas Nedbal
471bb7f3b7
Refactor settings/other to use Composition API ( #8589 )
...
* refactor(client): refactor settings/other to use Composition API
* fix(client): fix 'show featured notes' checkbox
2022-05-04 10:12:08 +09:00
Andreas Nedbal
e555686294
refactor(client): refactor settings/plugin to use Composition API ( #8590 )
2022-05-04 10:11:35 +09:00
Andreas Nedbal
3ce91d19f9
refactor(client): refactor settings/plugin/install to use Composition API ( #8591 )
2022-05-04 10:10:52 +09:00
Andreas Nedbal
1c309d3b02
refactor(client): refactor settings/security to use Composition API ( #8592 )
2022-05-04 10:10:34 +09:00
Andreas Nedbal
f0a87b6476
refactor(client): refactor settings/theme to use Composition API ( #8595 )
2022-05-03 20:34:48 +09:00
Andreas Nedbal
794c3ec520
refactor(client): refactor settings/accounts to use Composition API ( #8604 )
2022-05-03 20:33:40 +09:00
Andreas Nedbal
cb0b498670
fix(client): fix missing import of defineAsyncComponent in os.ts
2022-05-01 17:55:17 +02:00
dependabot[bot]
f5cc1484ca
chore(deps): bump postcss from 8.2.8 to 8.4.13 in /packages/client ( #8588 )
...
Bumps [postcss](https://github.com/postcss/postcss ) from 8.2.8 to 8.4.13.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.2.8...8.4.13 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-01 22:52:11 +09:00
tamaina
8ad77a28b4
refactor: use Vite to build instead of webpack ( #8575 )
...
* update stream.ts
* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
* fix lint
* clean up?
* add app
* fix
* nanka iroiro
* wip
* wip
* fix lint
* fix loginId
* fix
* refactor
* refactor
* remove follow action
* clean up
* Revert "remove follow action"
This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
* Revert "clean up"
This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
* remove fetch specification
* renoteの条件追加
* apiFetch => cli
* bypass fetch?
* fix
* refactor: use path alias
* temp: add submodule
* remove submodule
* enhane: unison-reloadに指定したパスに移動できるように
* null
* null
* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
* null
* await?
* rename
* rename
* Update read.ts
* merge
* get-note-summary
* fix
* swパッケージに
* add missing packages
* fix getNoteSummary
* add webpack-cli
* ✌️
* remove plugins
* sw-inject分離したがテストしてない
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix
* ✌️
* clean up config
* typesを戻した
* Update packages/client/src/components/notification.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* disconnect
* oops
* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた
* truncate notification
* Update packages/client/src/ui/_common_/common.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* clean up
* clean up
* キャッシュ対策
* Truncate push notification message
* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
* components/drive-file-thumbnail.vue
* components/drive-select-dialog.vue
* components/drive-window.vue
* merge
* fix
* Service Workerのビルドにesbuildを使うようにする
* return createEmptyNotification()
* fix
* i18n.ts
* update
* ✌️
* remove ts-loader
* fix
* fix
* enhance: Service Workerを常に登録するように
* pollEnded
* URLをsw.jsに戻す
* clean up
* wip
* wip
* wip
* wip
* wip
* wip
* ✌️
* use import
* fix
* install rollup
* use defineAsyncComponent.
* fix emojilist
* wip use defineAsyncComponent
* popup(import -> popup(defineAsyncComponent(() => import
* draggable?
* fix init import
* clean up
* fix router
* add comment
* ✌️
* ✌️
* ✌️
* remove webpack
* update vite
* fix boot sequence
* Revert "fix boot sequence"
This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.
* revert boot import
* never make two app div
* ;
* remove console.log
* change clientEntry sequence
* fix
* Revert "fix"
This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.
* fix
* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
* add log
* add comment
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-01 22:51:07 +09:00
Andreas Nedbal
7e0770bc9c
Refactor custom-css to use Composition API ( #8571 )
...
* refactor(client): refactor custom-css to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-01 15:50:09 +09:00
Andreas Nedbal
edf8f94fec
refactor(client): refactor import-export to use Composition API ( #8579 )
2022-05-01 11:55:15 +09:00
Andreas Nedbal
e0950fe5ea
Refactor instance-mute to use Composition API ( #8580 )
...
* refactor(client): refactor instance-mute to use Composition API
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
* Apply review suggestion from @Johann150
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-01 11:52:19 +09:00
Andreas Nedbal
c201a90db4
Refactor integration to use Composition API ( #8581 )
...
* refactor(client): refactor integration to use Composition API
* fix(client): drop superfluous enable* constants
* refactor(client): deduplicate window opening for services
2022-05-01 11:23:12 +09:00
tamaina
1df07ded68
feat: Improve Push Notification ( #7667 )
...
* clean up
* ev => data
* refactor
* clean up
* add type
* antenna
* channel
* fix
* add Packed type
* add PackedRef
* fix lint
* add emoji schema
* add reversiGame
* add reversiMatching
* remove signin schema (use Signin entity)
* add schemas refs, fix Packed type
* wip PackedHoge => Packed<'Hoge'>
* add Packed type
* note-reaction
* user
* user-group
* user-list
* note
* app, messaging-message
* notification
* drive-file
* drive-folder
* following
* muting
* blocking
* hashtag
* page
* app (with modifying schema)
* import user?
* channel
* antenna
* clip
* gallery-post
* emoji
* Packed
* reversi-matching
* update stream.ts
* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
* fix lint
* clean up?
* add app
* fix
* nanka iroiro
* wip
* wip
* fix lint
* fix loginId
* fix
* refactor
* refactor
* remove follow action
* clean up
* Revert "remove follow action"
This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
* Revert "clean up"
This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
* remove fetch specification
* renoteの条件追加
* apiFetch => cli
* bypass fetch?
* fix
* refactor: use path alias
* temp: add submodule
* remove submodule
* enhane: unison-reloadに指定したパスに移動できるように
* null
* null
* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
* null
* await?
* rename
* rename
* Update read.ts
* merge
* get-note-summary
* fix
* swパッケージに
* add missing packages
* fix getNoteSummary
* add webpack-cli
* ✌️
* remove plugins
* sw-inject分離したがテストしてない
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix
* ✌️
* clean up config
* typesを戻した
* Update packages/client/src/components/notification.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* disconnect
* oops
* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた
* truncate notification
* Update packages/client/src/ui/_common_/common.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* clean up
* clean up
* キャッシュ対策
* Truncate push notification message
* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
* components/drive-file-thumbnail.vue
* components/drive-select-dialog.vue
* components/drive-window.vue
* merge
* fix
* Service Workerのビルドにesbuildを使うようにする
* return createEmptyNotification()
* fix
* i18n.ts
* update
* ✌️
* remove ts-loader
* fix
* fix
* enhance: Service Workerを常に登録するように
* pollEnded
* URLをsw.jsに戻す
* clean up
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-04-30 21:52:07 +09:00
Andreas Nedbal
06485c7c75
refactor(client): refactor scratchpad to use Composition API ( #8565 )
2022-04-29 12:26:24 +09:00
Andreas Nedbal
53b4ee6f16
refactor(client): refactor api-console to use Composition API ( #8566 )
2022-04-29 10:21:02 +09:00
tamaina
83096440cc
enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション ( #8216 )
...
* wip
* Update packages/client/src/os.ts
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
* メニューをComposition API化、switchアイテム追加
クライアントサイド画像圧縮の準備
* メニュー型定義を分離 (TypeScriptの型支援が効かないので)
* disabled
* make keepOriginal to follow setting value
* ✌️
* fix
* fix
* ✌️
* WEBP
* aaa
* ✌️
* webp
* lazy load browser-image-resizer
* rename
* rename 2
* Fix
* clean up
* add comment
* clean up
* jpeg, pngにもどす
* fix
* fix name
* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)
* 動画サムネイルはjpegに
* エラーハンドリング
* ✌️
* v2.2.1-misskey-beta.2
* browser-image-resizer#v2.2.1-misskey.1
* ✌️
* fix alert
* update browser-image-resizer to v2.2.1-misskey.2
* lockfile
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
2022-04-28 11:14:03 +09:00
Andreas Nedbal
7899cb3f70
fix(client): fix lint issues in autocomplete ( #8548 )
2022-04-28 10:56:18 +09:00
Johann150
0bff6d06cf
refactor: use composition API ( #8541 )
2022-04-27 15:17:49 +09:00
futchitwo
4509fa10b3
Fix(client): fix profile tab link ( #8536 )
2022-04-24 14:21:46 +09:00
tamaina
c5aa46c0b9
fix: Fix settings page ( #8508 )
...
* Fix settings page
* nanka iroiro
* clean up
* clean up
* インデックスに戻ってもタイトルが残ってしまうのを修正
2022-04-23 19:17:15 +09:00
syuilo
11d9f1f58b
chore: fix lint command for windows
2022-04-23 12:50:37 +09:00
syuilo
087e068482
update deps
2022-04-23 12:29:26 +09:00
syuilo
0ebb0c3085
Revert "make emoji stand out more on reaction button"
...
This reverts commit e0c5401241a5cc3dcd3692a257a0da733c399927.
2022-04-20 09:30:29 +09:00
Johann150
92489d7885
make emoji stand out more on reaction button
...
a slight shadow makes them easier to see
2022-04-19 22:03:15 +02:00
rinsuki
e44404b0c4
refactor: move typings to devDependencies ( #8500 )
2022-04-16 01:28:59 +09:00
syuilo
cbd4640965
refactor
2022-04-11 22:50:53 +09:00
syuilo
387842b699
update deps
2022-04-11 22:48:04 +09:00
tamaina
85dba1f5f4
fix theme-color apply ( #8464 )
2022-04-03 13:56:00 +09:00
Andreas Nedbal
37500ae691
Fix: Adjust ESLint calls to properly interpret globs ( #8462 )
...
* fix(backend): rename .eslintrc.js to .eslintrc.cjs
* fix(backend): wrap lint path glob in quotation marks
* fix(client): wrap lint path glob in quotation marks
* chore(workflow): make lint workflow use Node 16
2022-04-02 22:52:26 +09:00
syuilo
8b2a0a5773
feat: Webhook ( #8457 )
...
* feat: introduce webhook
* wip
* wip
* wip
* Update CHANGELOG.md
2022-04-02 15:28:49 +09:00
tamaina
da87171ce7
enhance: タッチパッド・タッチスクリーンでのデッキの操作性を向上 ( #8450 )
...
* enhance experience of deck with touchpad
* test: 単純にdeltaYを加算してみる
* clean up
* ios bug fix?
* ✌️
* use overflow-y
* Safari does not supports clip
2022-04-02 15:12:01 +09:00
syuilo
1870d8f72b
update deps
2022-04-01 19:13:40 +09:00
dependabot[bot]
2cf00e602e
Bump ansi-regex from 5.0.0 to 5.0.1 in /packages/client ( #8422 )
...
Bumps [ansi-regex](https://github.com/chalk/ansi-regex ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases )
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1 )
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-27 16:41:52 +09:00
dependabot[bot]
dea92a9cdb
Bump nanoid from 3.1.20 to 3.3.1 in /packages/client ( #8425 )
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 3.1.20 to 3.3.1.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/3.1.20...3.3.1 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-27 16:41:39 +09:00
dependabot[bot]
7d9d7096e8
chore(deps): bump minimist from 1.2.5 to 1.2.6 in /packages/client ( #8446 )
...
Bumps [minimist](https://github.com/substack/minimist ) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases )
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-27 16:32:57 +09:00
syuilo
9e0a1de9d1
tweak client
2022-03-27 16:28:25 +09:00
syuilo
f0620c294d
fix of client
2022-03-27 16:21:09 +09:00
syuilo
923c203230
refactor
2022-03-27 02:22:31 +09:00
tamaina
56150d66ef
fix: Handle decodeURIComponent error ( #8411 )
2022-03-27 02:21:56 +09:00
syuilo
071acfb898
update deps
2022-03-25 16:32:10 +09:00
syuilo
921299b02f
perf(server): refactor and performance improvements
2022-03-25 16:27:41 +09:00
syuilo
69702bc55e
Update account.ts
2022-03-25 02:43:48 +09:00
syuilo
c32867f296
enhance(client): アカウント情報の取得に失敗したとき強制ログアウトではなく警告を表示するように
2022-03-25 01:53:20 +09:00
syuilo
61826829d3
refactor: separate meta api for admin or not
2022-03-25 01:50:28 +09:00
syuilo
a32a3bc5c9
perf(server): disable some antenna features to improve performance
2022-03-22 00:07:43 +09:00
syuilo
5e9a8ce883
perf(server): reduce db query
2022-03-21 20:43:43 +09:00
tamaina
6890e7fca0
デッキまわりをCompositon API / Setup Sugarに ( #8410 )
...
* universal.widgets.vue
* column.vue, antenna-column.vue
* direct-column.vue, list-column.vue
* main-column.vue
* wip
* ✌️
* fix
* ✌️
* ✌️
2022-03-21 03:11:14 +09:00
syuilo
497b6f03f6
fix(client): fix popup menu direction calclation
2022-03-19 22:03:53 +09:00
syuilo
5e9809407a
update deps
2022-03-19 19:22:58 +09:00
syuilo
69b044c3ab
feat: introduce bull dashboard
2022-03-19 19:08:55 +09:00
syuilo
6a35a37df1
🎨
2022-03-12 14:54:08 +09:00
syuilo
8e9dd82ae8
tweal c;iemy
2022-03-11 18:55:47 +09:00
syuilo
68fddacba2
update deps
2022-03-09 22:43:41 +09:00
nullobsi
be7385aaf3
fix scroll ( #8382 )
2022-03-09 22:33:07 +09:00
MeiMei
3447466c7b
テーマ選択から重複要素を排除するように ( #8385 )
2022-03-09 22:18:14 +09:00
syuilo
3b95fce051
fix federation chart
2022-03-08 22:56:46 +09:00
syuilo
e11337c443
update deps
2022-03-07 23:51:34 +09:00
syuilo
e3afe9fd82
delete needless instance drive columns
2022-03-07 21:20:14 +09:00
syuilo
13dfafb1dd
feat: add active to federation chart
2022-03-07 15:10:16 +09:00
syuilo
9841ee4710
tweak client
2022-03-06 23:21:25 +09:00
syuilo
a7bf9603dc
tweak client
2022-03-06 23:21:19 +09:00
syuilo
5103ece434
tweak client
2022-03-06 19:18:34 +09:00
Andreas Nedbal
46562be227
Refactor: Switch Settings index page to setup sugar ( #8374 )
...
* refactor(client): Make Settings index page use <script setup>
* chore(client): address review comments
2022-03-06 19:17:43 +09:00
syuilo
3b86bdf18c
feat: アンケート終了通知
...
Resolve #4664
2022-03-06 16:06:27 +09:00
tamaina
a004cfe950
fix: iPhone X以降(?)でページの内容が全て表示しきれないのを修正 ( #8375 )
...
* add safe-area-inset-bottom to spacer
* fix
* ✌️
* fix
2022-03-05 02:00:45 +09:00
syuilo
743a743251
fix
2022-03-05 01:23:34 +09:00
syuilo
a1441ff5b4
fix(client): register_note_view_interruptor()が動かないのを修正
...
Fix #8318
2022-03-05 01:22:57 +09:00
syuilo
b26f3713b5
chore(client): hide error report setting
...
Close #8327
2022-03-05 00:35:59 +09:00
syuilo
17f7b41240
feat: 時限ミュート
...
#7677
2022-03-04 20:23:53 +09:00
Andreas Nedbal
472a05bee4
Fix: Only allow admins to access admin views ( #8361 )
...
* fix(client): only allow admins to access /admin/*
* fix(client): Also allow moderators to access admin panel
2022-03-04 17:13:10 +09:00
syuilo
75e5954f45
tweak client
2022-03-04 16:26:21 +09:00
Kainoa Kanter
3768d72bfe
Add me as patron ( #8369 )
2022-03-03 01:19:17 +09:00
syuilo
df77edfc4e
feat(client): indicate dev build
2022-03-03 01:17:37 +09:00
syuilo
8e3a082c37
fix(client): ユーザー名オートコンプリートが正しく動作しない問題を修正
2022-03-02 18:52:49 +09:00
syuilo
4f924a8565
🎨
2022-03-01 23:58:28 +09:00
syuilo
f71aa3df32
feat: instance default theme
2022-03-01 23:58:01 +09:00
syuilo
33d40e6736
🎨
2022-03-01 21:38:56 +09:00
syuilo
d7a5f2618f
refactor
2022-03-01 21:36:20 +09:00
syuilo
7e4db6acf4
Revert "refactor"
...
This reverts commit 94d4f8271e3406ff549a8f18831fb74adcd0d1ab.
2022-03-01 03:51:31 +09:00
syuilo
d8c2d19d67
fix esm
2022-03-01 03:34:40 +09:00
syuilo
e547825ed9
refactor
2022-02-28 22:42:32 +09:00
tamaina
13cc69fe1c
Fix avatar/banner proxy ( #8346 )
...
* Fix avatar/banner proxy
Co-authored-by: mei23 <m@m544.net>
* use getAvatarUrl
* fix
* join avatar and banner to improve performance
* join
* Update hybrid-timeline.ts
* fix
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-02-27 13:59:10 +09:00
syuilo
94228778c9
refactor: Use ESM ( #8358 )
...
* wip
* wip
* fix
* clean up
* Update tsconfig.json
* Update activitypub.ts
* wip
2022-02-27 11:07:39 +09:00
syuilo
44bb08454a
fix: better language settings
...
Fix #8359
Fix #7968
2022-02-26 15:13:44 +09:00
syuilo
66115e2879
🎨
2022-02-25 20:17:36 +09:00
syuilo
b13aebab57
refactor
2022-02-25 20:03:17 +09:00
syuilo
04893c8636
refactor(client): use setup
2022-02-25 19:58:58 +09:00
syuilo
ff3809b437
🎨
2022-02-25 19:56:59 +09:00
syuilo
1ad759db78
🎨
2022-02-25 18:53:08 +09:00
syuilo
86dc3adcba
🎨
2022-02-25 18:32:37 +09:00
Kainoa Kanter
47235a3aea
keepCw > true ( #8350 )
...
Closes #8336
2022-02-25 14:41:40 +09:00
syuilo
9717fc1dbf
client: 検索構文でGoogle明示 & deprecated
2022-02-25 14:40:11 +09:00
syuilo
680e1ed3ac
enhance(client): improve launch pad usability
2022-02-23 23:40:31 +09:00
syuilo
6d41bab495
update deps
2022-02-23 21:31:48 +09:00
syuilo
2f83378acc
feat: add pub & sub item for federation chart
2022-02-23 16:17:16 +09:00
syuilo
1cde8d6d81
🎨
2022-02-20 19:01:13 +09:00
syuilo
1d2be559e9
プロフィールの追加情報を最大16まで保存できるように
...
Close #8225
Close #8234
2022-02-20 16:53:06 +09:00
syuilo
71d21c32f5
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
2022-02-20 16:07:50 +09:00
syuilo
18ea7a1142
remove max note text length setting
...
Resolve #8323
2022-02-20 16:07:43 +09:00
xianon
549e9ef84d
タッチ操作でウィジェットの編集や削除ができるようにする ( #8328 )
2022-02-20 16:07:29 +09:00
syuilo
2744fb3096
update deps
2022-02-19 00:48:04 +09:00
syuilo
117aa696ea
fix(client): リアクションピッカーの高さが低くなったまま戻らないことがあるのを修正
...
Fix #8071
2022-02-13 16:35:53 +09:00
syuilo
b6093a9d90
fix(client): nextTickの中でonUnmounted呼び出しても効かない可能性がある
2022-02-12 17:29:15 +09:00