Commit Graph

1547 Commits

Author SHA1 Message Date
Johann150
adcc3c9286 remove unnecessary joins
These joins are no longer necessary as of commit
c35372a20d22cddb75e93a0b407f2b652cd7faf0. It seems they are bad enough
for performance to break installs.
2022-07-25 13:28:57 -07:00
Johann150
0ea514c89f refactor pages/auth.form.vue to composition API 2022-07-25 13:27:35 -07:00
ThatOneCalculator
f556ec82b2 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-25 10:23:27 -07:00
syuilo
f26882f864 chore(client): tweak style 2022-07-25 21:24:37 +09:00
syuilo
465f3aae49 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-25 21:16:52 +09:00
syuilo
8c88abb126 add missing dependency 2022-07-25 21:16:46 +09:00
hayabusa
811f29cd90 一部のアプリからファイルを投稿フォームへドロップできない場合がある問題を修正 (#9035)
* dropEffectとeffectAllowedの関連付けを修正

* Update Changelog

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-07-25 21:16:11 +09:00
syuilo
a462544027 update deps 2022-07-25 21:10:06 +09:00
ThatOneCalculator
a0d98555df More #31748f 2022-07-24 18:36:55 -07:00
ThatOneCalculator
6ece6fb041 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-24 18:07:18 -07:00
syuilo
887290c8b1 chore(client): tweak ui 2022-07-24 18:44:50 +09:00
syuilo
3a8b93ac26 tweak rate limit 2022-07-24 17:56:48 +09:00
syuilo
1acf723f2c fix html 2022-07-24 17:09:46 +09:00
ThatOneCalculator
861b12cf9a Even more spacing 2022-07-24 00:00:24 -07:00
ThatOneCalculator
8a6d36f9c5 More padding 2022-07-23 23:54:54 -07:00
ThatOneCalculator
7b3f5d0300 Rose Pine sparkles 2022-07-23 23:48:00 -07:00
ThatOneCalculator
e758f4c0a2 Rose Pine danger color 2022-07-23 23:46:13 -07:00
syuilo
b6f1cf488b refactor(client): refactor components 2022-07-24 15:45:16 +09:00
syuilo
21b9fef5a5 chore(client): tweak style 2022-07-24 15:41:06 +09:00
ThatOneCalculator
3108ff4cec Item Spacing 2022-07-23 23:39:55 -07:00
ThatOneCalculator
c9657cd472 margin bottom for icon only 2022-07-23 23:30:25 -07:00
ThatOneCalculator
2907f82553 Clear up Ai mode 2022-07-23 23:29:01 -07:00
ThatOneCalculator
49b3109f2c ACTUALLY align, .b4 2022-07-23 23:17:44 -07:00
ThatOneCalculator
e330870e79 align instance icon on mobile 2022-07-23 23:13:18 -07:00
ThatOneCalculator
07f2261c70 New navbar for mobile 2022-07-23 23:05:20 -07:00
ThatOneCalculator
6fa6bc1915 🎨 2022-07-23 22:10:07 -07:00
ThatOneCalculator
3ff02c15b0 pf bg 2022-07-23 22:01:41 -07:00
ThatOneCalculator
e0cead53d7 start better headerbar 2022-07-23 21:57:13 -07:00
ThatOneCalculator
c894adc13c 🎨 2022-07-23 21:39:48 -07:00
ThatOneCalculator
7d91257317 Less cluttered notifications 2022-07-23 21:30:42 -07:00
ThatOneCalculator
8532c7eea5 more rpine stuff 2022-07-23 21:23:04 -07:00
ThatOneCalculator
266d79c122 More rpine stuff 2022-07-23 21:23:03 -07:00
ThatOneCalculator
3b80d3f348 More RPine 2022-07-23 21:16:35 -07:00
ThatOneCalculator
d8afd6e234 fix note button 2022-07-23 21:10:34 -07:00
ThatOneCalculator
d34c615105 fixxxx 2022-07-23 20:21:19 -07:00
ThatOneCalculator
86f7bd3b72 fix 2022-07-23 20:10:17 -07:00
ThatOneCalculator
9ce7413abe spacing in navbar 2022-07-23 20:06:26 -07:00
ThatOneCalculator
cc8accf5d5 showGap true 2022-07-23 20:04:13 -07:00
ThatOneCalculator
4ee8834993 fix style 2022-07-23 20:01:24 -07:00
ThatOneCalculator
27212f1433 finish up new navbar 2022-07-23 19:54:13 -07:00
ThatOneCalculator
36358ead1c More Rose Pine shtuff 2022-07-23 19:49:00 -07:00
ThatOneCalculator
47dac7ac1b MkLoading instead of "Loading..." 2022-07-23 19:45:27 -07:00
ThatOneCalculator
00bfafbb6e fix 2022-07-23 19:36:50 -07:00
ThatOneCalculator
44206e908e :imstuff: 2022-07-23 19:28:57 -07:00
ThatOneCalculator
c377d39380 Navbar test 2022-07-23 19:18:44 -07:00
ThatOneCalculator
d3752aad4a Mark as read from notifications widget 2022-07-23 19:10:05 -07:00
ThatOneCalculator
53e6fbfb89 Merge remote-tracking branch 'johann150/mk/bearer-authentication' into develop 2022-07-23 19:05:35 -07:00
ThatOneCalculator
2808f1b552 🥴 2022-07-23 18:58:35 -07:00
ThatOneCalculator
c54990b0e6 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-23 18:57:23 -07:00
dependabot[bot]
ed5ee682ba chore(deps): bump undici from 5.5.1 to 5.8.0 in /packages/backend (#9028)
Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.8.0.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:41:01 +09:00
dependabot[bot]
c07d014275 chore(deps): bump file-type from 17.1.2 to 17.1.3 in /packages/backend (#9030)
Bumps [file-type](https://github.com/sindresorhus/file-type) from 17.1.2 to 17.1.3.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3)

---
updated-dependencies:
- dependency-name: file-type
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:40:54 +09:00
syuilo
8a80246d24 lint fix 2022-07-23 14:31:54 +09:00
syuilo
0549e62e3a update tfjs 2022-07-23 14:31:15 +09:00
Kainoa Kanter
088fef7c39 fix: broken chats (#8983)
* Fix broken chats

Co-authored-by: @ltlapy

* 🎨
2022-07-23 00:46:52 +09:00
ThatOneCalculator
80ae73f543 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-21 23:43:30 -07:00
xianon
fed327b437 リモートユーザーを正しくブロックできるように修正する (#9027) 2022-07-22 15:41:31 +09:00
ThatOneCalculator
e7eee6a9d8 b3 2022-07-21 12:48:23 -07:00
syuilo
3478b4392e enhance(client): add some themes 2022-07-22 00:25:56 +09:00
syuilo
815f962ff4 fix(client): MiAuth page is broken
Fix #9026
2022-07-22 00:17:52 +09:00
syuilo
b374c4dcf6 chore: improve error message of boot 2022-07-21 22:30:36 +09:00
syuilo
33c1d2f57d fix(client): fix drawer menu style regression 2022-07-21 22:22:13 +09:00
ThatOneCalculator
2e00d82d29 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-20 22:04:12 -07:00
Johann150
8c641f0fbd fix: not logged in clients send correct header 2022-07-20 18:41:07 +02:00
syuilo
2d28c2bedd fix(client): some fixes 2022-07-21 00:32:41 +09:00
syuilo
d0b5ab669b fix(client): fix some routings 2022-07-20 23:21:42 +09:00
syuilo
d41f1f7fee chore(client): tweak theme select ui 2022-07-20 23:02:14 +09:00
syuilo
ae853e8830 fix(client): support v-if of select component 2022-07-20 23:01:40 +09:00
syuilo
ae766b0708 refactor(client): 2022-07-20 22:24:26 +09:00
syuilo
c5bfac04ae fix(client): タイミングによっては tag-cloud でエラーが発生するのを修正 2022-07-20 20:00:35 +09:00
syuilo
c5710094c0 chore(client): tweak radio component 2022-07-20 19:59:50 +09:00
syuilo
711322cd9a enhance(client): ネストしたルーティングに対応 2022-07-20 19:59:27 +09:00
ThatOneCalculator
e4139b7ac1 fix search 2022-07-19 21:53:08 -07:00
ThatOneCalculator
51533f35d7 Option to fully disable connection lost 2022-07-19 20:15:08 -07:00
ThatOneCalculator
ce490420e3 0.1 for small 2022-07-19 19:56:37 -07:00
ThatOneCalculator
a0e74cf501 mob nav 2022-07-19 16:56:23 -07:00
ThatOneCalculator
54a011530f revert change pos 2022-07-19 16:51:37 -07:00
ThatOneCalculator
31da3c16c3 Properly apply star is like patch 2022-07-19 15:23:26 -07:00
ThatOneCalculator
3556dfccb0 Renewed navbar 2022-07-19 15:14:37 -07:00
ThatOneCalculator
5f38fc1891 Calckey in about 2022-07-19 12:31:24 -07:00
ThatOneCalculator
292663b032 indentation 2022-07-19 12:01:45 -07:00
ThatOneCalculator
6800a8ccaa Better ASCII art 2022-07-19 11:18:44 -07:00
ThatOneCalculator
80ea452b9b Calckey as software name, finally! 2022-07-19 10:49:43 -07:00
ThatOneCalculator
e4246d8586 Calckey in launch strings 2022-07-19 10:18:05 -07:00
ThatOneCalculator
8687b46e18 More Calckey strings 2022-07-19 10:13:17 -07:00
ThatOneCalculator
4034446666 calckey in abt 2022-07-19 09:33:26 -07:00
ThatOneCalculator
c6eaf11033 Branding 2022-07-19 09:21:45 -07:00
ThatOneCalculator
0693367f96 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-19 09:04:29 -07:00
syuilo
a23b24e9cc Merge branch 'develop' into pr/9021 2022-07-19 23:53:08 +09:00
syuilo
5edecc1914 enhance(client): suspense
Fix #8817
2022-07-19 21:36:33 +09:00
syuilo
566d42e065 fix(client): 「インスタンスからのお知らせを受け取る」の設定を変更できない問題を修正
Fix #8474
2022-07-19 17:21:03 +09:00
syuilo
b1282e4f33 fix(client): tweak mfm-cheat-sheet 2022-07-19 17:13:24 +09:00
Acid Chicken (硫酸鶏)
bfce689abc fix(server): make sure getFileInfo doesn't fail if detectSensitivity ever fails (#9020) 2022-07-19 17:09:21 +09:00
Johann150
c36d96316e client: use bearer token authorization 2022-07-19 09:33:00 +02:00
Johann150
5217f18ca4 handle authentication errors in stream API 2022-07-19 09:32:46 +02:00
Johann150
ad2f017af8 update openapi spec generator
Properly document GET API endpoints.
Added Bearer token authentication.
2022-07-19 09:32:01 +02:00
Johann150
69059b2b1f improve authentication errors 2022-07-19 09:29:04 +02:00
Johann150
8b6381a6a8 add OAuth 2.0 Bearer Token authentication 2022-07-19 09:29:04 +02:00
ThatOneCalculator
bab942856e tabs 2022-07-18 23:21:08 -07:00
ThatOneCalculator
ae5fd85436 calckey ascii art 2022-07-18 23:07:18 -07:00
ThatOneCalculator
ba023066ee Revert "Merge remote-tracking branch 'thatonecalculator/vlite' into develop"
This reverts commit d1462806778434205f1576f32b1a833822ad39e1, reversing
changes made to 9fc5062018a98283ba232bdf5ab48c6ef36d010d.
2022-07-18 22:56:28 -07:00
ThatOneCalculator
926199b1db learnMore points to codeberg 2022-07-18 22:39:07 -07:00
ThatOneCalculator
3cf9c23562 #Calckey 2022-07-18 22:32:20 -07:00
ThatOneCalculator
ee82e63509 fix reply limit 2022-07-18 22:30:15 -07:00
ThatOneCalculator
e8b6b9a3a2 old clip path for now 2022-07-18 22:26:25 -07:00
ThatOneCalculator
4ee44087b9 oauth 2022-07-18 22:22:24 -07:00
ThatOneCalculator
525bfec17b build warnings 2022-07-18 22:20:29 -07:00
ThatOneCalculator
71f3634be2 vite 3.0.2 2022-07-18 22:16:23 -07:00
ThatOneCalculator
b76a689c2d self host 2022-07-18 22:14:40 -07:00
ThatOneCalculator
168e99fe53 fix 2022-07-18 22:14:03 -07:00
ThatOneCalculator
e60310ba64 yarn lol 2022-07-18 22:05:38 -07:00
ThatOneCalculator
3938786fed yarn lol 2022-07-18 22:04:21 -07:00
ThatOneCalculator
6f2f49dd69 new logo 2022-07-18 22:00:13 -07:00
ThatOneCalculator
7da37a3500 MOTD 2022-07-18 21:47:32 -07:00
ThatOneCalculator
02ee80a607 Rose Pine 2022-07-18 21:37:10 -07:00
ThatOneCalculator
002f7b5481 The annoying orange 2022-07-18 21:32:02 -07:00
ThatOneCalculator
862a26dceb svggg 2022-07-18 21:26:05 -07:00
syuilo
64d108cb86 update vite 2022-07-19 13:25:23 +09:00
ThatOneCalculator
8dab49f574 calckey logo 2022-07-18 21:19:26 -07:00
ThatOneCalculator
bbb7555dae Waves~ 2022-07-18 21:11:19 -07:00
ThatOneCalculator
b4afac21e1 emojos 2022-07-18 21:06:54 -07:00
ThatOneCalculator
ab07240b11 migration 2022-07-18 21:04:55 -07:00
ThatOneCalculator
f1ec391d6a Merge remote-tracking branch 'johann150/rotate-x-y' into develop 2022-07-18 20:58:10 -07:00
ThatOneCalculator
db7fbce3b1 Merge remote-tracking branch 'nullobsi/secure-fetch' into develop 2022-07-18 20:50:15 -07:00
ThatOneCalculator
3fd1e2fc6b Merge remote-tracking branch 'futchitwo/logout-timeline' into develop 2022-07-18 20:49:10 -07:00
ThatOneCalculator
70f8c0602b enter 2022-07-18 20:46:19 -07:00
ThatOneCalculator
d5c635edd6 Merge remote-tracking branch 'pixeldesu/fix/acrylic-firefox' into develop 2022-07-18 20:45:43 -07:00
ThatOneCalculator
86aaa303a7 sidebar 2022-07-18 20:42:31 -07:00
ThatOneCalculator
b7476a89d3 Eng 2022-07-18 20:36:36 -07:00
ThatOneCalculator
b5fe871668 Merge remote-tracking branch 'thatonecalculator/chat-swap-enter-ctrlenter' into develop 2022-07-18 20:35:17 -07:00
ThatOneCalculator
9ab67038ad Merge remote-tracking branch 'thatonecalculator/autocomplete-chat' into develop 2022-07-18 20:35:11 -07:00
ThatOneCalculator
f7007f2863 Merge remote-tracking branch 'thatonecalculator/fix-chat-continuation' into develop 2022-07-18 20:34:53 -07:00
ThatOneCalculator
67460a4e7b Merge remote-tracking branch 'thatonecalculator/self-host-images' into develop 2022-07-18 20:34:37 -07:00
ThatOneCalculator
2520468447 Merge remote-tracking branch 'thatonecalculator/repair-style' into develop 2022-07-18 20:34:06 -07:00
ThatOneCalculator
134040410f Merge remote-tracking branch 'thatonecalculator/toggle-ads' into develop 2022-07-18 20:31:46 -07:00
ThatOneCalculator
7507899d51 Updated store 2022-07-18 20:31:30 -07:00
ThatOneCalculator
0ed4e48dbb Merge remote-tracking branch 'thatonecalculator/vlite' into develop 2022-07-18 20:31:27 -07:00
ThatOneCalculator
005d557502 Calckey 2022-07-18 19:00:45 -07:00
ThatOneCalculator
346da2e1d4 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-18 17:41:13 -07:00
Kainoa Kanter
68d2bcf192 Update 'packages/client/assets/misskey.svg' 2022-07-19 02:15:20 +02:00
Kainoa Kanter
7b16caf574 Update 'packages/client/assets/misskey.svg' 2022-07-19 02:12:23 +02:00
Kainoa Kanter
53b805be89 Update 'packages/client/assets/misskey.svg' 2022-07-19 02:11:42 +02:00
Kainoa Kanter
b81d90db85 Update 'packages/client/assets/misskey.svg' 2022-07-19 02:10:23 +02:00
Kainoa Kanter
be9c1230d4 Update 'packages/client/assets/misskey.svg' 2022-07-19 02:09:06 +02:00
syuilo
9879944abf Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-19 01:20:38 +09:00
syuilo
3632994024 fix(client): fix window default prop 2022-07-19 01:20:36 +09:00
xianon
1848655262 ユーザー情報の取得の再試行を修正する (#9017) 2022-07-18 21:43:31 +09:00
syuilo
a04e735d5d chore(client): tweak style 2022-07-18 18:41:17 +09:00
syuilo
d0a1018b48 update vite 2022-07-18 18:41:07 +09:00
nullobsi
1df427a085 Hide private data in pug when private mode is enabled 2022-07-17 15:25:40 -07:00
nullobsi
4e52c8d8fd Add secure mode settings to Security tab 2022-07-17 15:25:40 -07:00
nullobsi
7131ca8897 In private mode, block access to many public APIs 2022-07-17 15:25:40 -07:00
nullobsi
8f6605eb63 Add Secure Mode and Private Mode
- Add instance actor
- Add private mode, which uses an allowlist
- Add Secure Mode, restricts access to blocked instances
2022-07-17 15:25:39 -07:00
nullobsi
03185aae2e Add migration for allowedHosts, secureMode, privateMode 2022-07-17 14:02:40 -07:00
syuilo
321b6f3977 lint fix 2022-07-18 05:08:13 +09:00
syuilo
b76d76b8f9 enhance(client): tweak ui 2022-07-18 05:03:39 +09:00
syuilo
d4e0d16014 chore(client): tweak style 2022-07-18 01:29:29 +09:00
Ryu jongheon
6a5f4349af fix(client): use icon for local if available (#9012) 2022-07-18 00:33:12 +09:00
syuilo
e48579070c enhance(client): ウィンドウを最大化できるように 2022-07-18 00:31:55 +09:00
syuilo
3f25cb01fe 🎨 2022-07-18 00:18:56 +09:00
syuilo
6437723414 enhance(client): tweak ui 2022-07-17 23:18:05 +09:00
syuilo
8c3974b97b enhance(client): tweak ui 2022-07-17 21:06:33 +09:00
syuilo
fbfac17342 chore(client): tweak deck ui 2022-07-17 05:33:21 +09:00
syuilo
18462c1ec7 chore(client): tweak style 2022-07-17 05:13:07 +09:00
syuilo
c56f14473f Update 1651224615271-foreign-key.js
#8852
2022-07-17 05:12:59 +09:00
syuilo
e783621f0e fix(client): fix deck style 2022-07-17 05:12:43 +09:00
syuilo
d771dd598b fix(client): デッキUI時に ページで表示 ボタンが機能しない問題を修正
Fix #9010
2022-07-17 05:12:22 +09:00
futchitwo
8903a4691f loginRequired プロパティを使わないように 2022-07-17 00:42:02 +09:00
syuilo
958260795f Update 1651224615271-foreign-key.js
#8852
2022-07-16 23:51:32 +09:00
syuilo
da75b53f52 feat(client): registry editor 2022-07-16 23:11:05 +09:00
syuilo
e725ad54cc chore(client): tweak style 2022-07-16 22:16:01 +09:00
syuilo
caa96e500f chore(client): tweak style 2022-07-16 20:53:53 +09:00
syuilo
14463b7cbf fix(server): fix bind of method
Fix #9006
2022-07-16 19:03:41 +09:00
Kainoa Kanter
e2075744f2 chore: improve ad style (#8995)
* Improve ad style

* 🎨

* `ad` -> `info`
2022-07-16 17:50:12 +09:00
syuilo
1c670a3074 chore(client): tweak user-info routing 2022-07-16 16:52:12 +09:00
syuilo
41cdaba2b1 chore(client): tweak style 2022-07-16 15:19:52 +09:00
syuilo
f4aad83644 chore(client): tweak deck ui 2022-07-16 15:19:44 +09:00
syuilo
ad298da308 chore(client): tweak ui 2022-07-16 13:49:23 +09:00
syuilo
adc138fb4a refactor(client): use setup syntax 2022-07-16 13:14:16 +09:00
syuilo
a091fe736c chore(client): tweak style 2022-07-16 13:13:58 +09:00
Kainoa Kanter
787047094c Apply suggestions from code review
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-07-15 07:23:23 -07:00
syuilo
7593b41db8 chore(client): tweak ui 2022-07-15 22:09:05 +09:00
syuilo
ce012b14e3 chore(client): tweak style 2022-07-15 19:31:04 +09:00
syuilo
dbb2f64621 chore(client): tweak style 2022-07-15 19:15:23 +09:00
syuilo
3848f0069a Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-15 17:14:29 +09:00
Johann150
cb687fa9bf refactor: signup component as composition api (#8957) 2022-07-15 17:14:05 +09:00
syuilo
c6d8346b7f enhance(client): RSSティッカーで表示順序をシャッフルできるように 2022-07-15 17:12:08 +09:00
syuilo
2cb5e792fd chore(client): tweak ui 2022-07-15 17:01:13 +09:00
Kainoa Kanter
e15be5ce08 Merge branch 'develop' into toggle-ads 2022-07-14 17:48:59 -07:00
Kainoa Kanter
8eca8e8f50 Delete 1657759324648-show-ads.js 2022-07-14 17:41:10 -07:00
syuilo
a38d9e4330 move rollup to devDeps 2022-07-14 23:54:52 +09:00
syuilo
52a3dd2f25 chore(client): improve usability 2022-07-14 23:50:07 +09:00
tamaina
0a8d24702f refactor(client): remove useCssModule (#8999)
* refactor(client): remove useCssModule()

* use MkStickyContainer

* Revert "use MkStickyContainer"

This reverts commit 639746786bb7e3342db9cbd3452854fc29aacf88.
2022-07-14 23:32:00 +09:00
tamaina
2759fa5891 use MkStickyContainer (#9000) 2022-07-14 23:31:01 +09:00
syuilo
2284142e58 tweak boot.js 2022-07-14 22:25:57 +09:00
syuilo
5f2a3917e6 Revert "fix(client): revert es2017"
This reverts commit 0ddabdbf68767566fd8f4fdeab1de82535dc44cb.
2022-07-14 22:14:42 +09:00
syuilo
94dece7946 Revert "debug"
This reverts commit fa5140310f05c00d641e794329073eb7d44f6825.
2022-07-14 22:13:04 +09:00
syuilo
8678e4d2c8 Revert "debug"
This reverts commit 800bbc4328e27944e785d2ad50da0293df0ee114.
2022-07-14 22:13:00 +09:00
syuilo
e00b4724ac tweak boot.js 2022-07-14 22:04:16 +09:00
syuilo
8c9530fb41 tweak boot.js 2022-07-14 21:52:58 +09:00
syuilo
6184f34c91 debug 2022-07-14 21:40:30 +09:00