github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 10:33:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
25,158 Commits 214 Branches 500 Tags 960 MiB
9ebb1412d3
Commit Graph

5244 Commits

Author SHA1 Message Date
Robin Ward
b2ffaf93a3 Use icon helpers for notification dropdown 2017-09-14 11:20:36 -04:00
Neil Lalonde
346442134e Update translations 2017-09-14 11:02:39 -04:00
Jeff Atwood
9dc5bf1d97 minor copyedits 2017-09-13 17:39:15 -07:00
Vinoth Kannan
6e9671c2c3 UX: Placeholder images color changed & tootip added 2017-09-13 15:16:38 +05:30
Neil Lalonde
beea5cac48 FIX: send the queued posts reminder as a message to moderators instead of an email to the contact_email 2017-09-12 18:00:51 -04:00
David Taylor
7d350d0d75 Revert plugin js changes (#5139) 
* Revert "Add disabled_plugins to preloadstore for login_required anonymous users (#5134)"

This reverts commit b840170f8d.

* Revert "Do not load javascripts for disabled plugins (#5103)"

This reverts commit a14ab48829.
 2017-09-07 15:15:29 +02:00
Jeff Atwood
5aba30ede6 description wasn't checked in. ???? 2017-09-06 18:46:40 -07:00
Jeff Atwood
27e4baf357 minor copyedits on visit days badges 2017-09-06 15:01:04 -07:00
Régis Hanol
8a935a4b5f FEATURE: new badges when visiting the forum for 10, 100 and 365 consecutive days 2017-09-06 22:35:08 +02:00
David Taylor
a14ab48829 Do not load javascripts for disabled plugins (#5103) 
* Do not load javascript for disabled plugins

* Appease rubocop
 2017-09-06 10:06:47 +02:00
Joshua Rosenfeld
532b698c2f Merge pull request #5132 from tophee/master 
Update "email in" help text
 2017-09-04 15:19:43 -04:00
Robin Ward
153eca23e3 Switch Development Database via ENV var 
This is useful if you use multiple development databases locally
and don't want to constantly `db:drop db:create` into
`discourse_development`.

Simply add `DISCOURSE_DEV_DB=whatever_db` as an ENV variable and
Discourse will use it in development mode.
 2017-09-04 12:14:34 -04:00
tophee
bb098af38e Update "email in" help text 
https://meta.discourse.org/t/straightforward-direct-delivery-incoming-mail/49487/98?u=tophee
 2017-09-04 15:32:04 +02:00
minusfive
a329f37b44 Match capitalization of Groups to other stats on user > about box 2017-09-01 09:31:51 -07:00
Sam Saffron
e283e6aea0 FEATURE: allowed_iframes site setting for allowing iframes 
This allows you to whitelist custom iframes if needed in posts
 2017-09-01 10:15:44 -04:00
Robin Ward
e41a828774 Update translations 2017-08-31 14:50:40 -04:00
Bianca Nenciu
6bc74ceb50 Split alias levels in mentionable and messageable levels. (#5065) 
* Split alias levels in mentionable and messageable levels.

* Fixed some tests.

* Set messageable level to everyone by default.

* By defaults, groups are not mentionable or messageable.

* Made staff groups messageable by the system.
 2017-08-28 12:32:08 -04:00
Bianca Nenciu
bb3a5910d7 Support for sending PMs to email addresses (#4988) 
* Added support for sending PMs to email addresses.

* Made changes after review.

* Added settings validator.

* Fixed tests.
 2017-08-28 12:07:30 -04:00
Joffrey JAFFEUX
b83c0747d9 FIX: select-box improvments 
- more tests for category-select-box
- allows to clear selection
- fix positioning on safari
- focus on click
- do not display uncategorized if not allowed in settings
- fix component state impacting other specs
- better texts
- higher category-select-box on mobile
 2017-08-28 14:34:04 +02:00
Neil Lalonde
398604ac71 FEATURE: set purge_unactivated_users_grace_period_days to 0 to disable purging unactivated users 2017-08-25 15:20:06 -04:00
Neil Lalonde
ea969d1ed0 FEATURE: add Thai language 2017-08-25 12:33:09 -04:00
minusfive
c01dc26ea6 Add no-content message for user/activity/replies, fix no-content display 2017-08-24 09:51:39 -07:00
Jeff Atwood
ab017c90c8 improved email bad destination error copy 2017-08-23 20:04:31 -07:00
john muhl
76e134c700 fix misuse of TLD 2017-08-22 16:45:29 -05:00
Sam
d7a2584c6e FEATURE: image uploads now have short urls 
Shorten all image uploads to use short urls, this is the client
side implementation.
 2017-08-22 16:40:08 -04:00
Sam
2f0c6c99e0 FIX: ip lookup not working 
Also add a powered by line so it is clear this makes an external service call
 2017-08-21 14:18:49 -04:00
Robin Ward
954d753d5d FIX: Sidekiq wouldn't start up in development mode 2017-08-18 10:04:52 -04:00
Sam
889b99552a FEATURE: allow ctrl+shift+s to open search 2017-08-17 12:57:08 -04:00
Jeff Atwood
8f795b35bb missed a spot on email invite h4 to bold conversion 2017-08-16 16:43:14 -07:00
Neil Lalonde
3b7657e4b3 Update translations 2017-08-16 11:38:45 -04:00
Robin Ward
39cfffce2d Reload lib in development mode only 2017-08-16 11:14:49 -04:00
Guo Xiang Tan
996ce8c443 Merge pull request #5024 from fantasticfears/site-setting 
FIX: fails loud if default setting is not set
 2017-08-16 09:36:38 +09:00
Joffrey JAFFEUX
cad6107624 refactors select-box 
Note: this commit also now uses select-box for mobile topics controls
 2017-08-16 00:41:56 +02:00
Jeff Atwood
e50cad3338 minor 404 page copyedits 2017-08-15 15:29:59 -07:00
Neil Lalonde
d506e577a5 FEATURE: if full search returns no results, show google search form 2017-08-15 16:46:41 -04:00
Neil Lalonde
130ae2cd4b FEATURE: add Latvian language 2017-08-15 11:40:00 -04:00
Erick Guan
1646bc0031 FIX: fails loud if default setting is not set 
Noted:
- `push_api_secret_key` is set in initializer. Shimed with ''
- `default_theme_key` is set in seeding. Shimed with ''
 2017-08-15 12:07:25 +02:00
Erick Guan
77d00ea7f9 Remove hidden settings' translation (#5043) 2017-08-14 12:12:40 +02:00
Robin Ward
f200d52324 Revert "Autoload lib folder to pick up more changes in development mode" 
This reverts commit 156347ea7a.
 2017-08-13 14:31:13 -04:00
Robin Ward
156347ea7a Autoload lib folder to pick up more changes in development mode 2017-08-13 14:17:53 -04:00
Joffrey JAFFEUX
482924b161 FEATURE: initial implementation of an ember native select 2017-08-13 14:34:50 +02:00
Régis Hanol
6b13d74868 FIX: ensure we always reload TopicView and TopicList in dev 2017-08-12 04:22:22 +02:00
Jeff Atwood
b900f1b9d5 minor improvements to setup wizard copy 2017-08-10 16:32:56 -07:00
Jeff Atwood
112133736b soften the auto-hiding PM message a bit 2017-08-10 15:34:32 -07:00
Neil Lalonde
3c538270e4 UX: placeholder text in watched word input field 2017-08-10 11:25:17 -04:00
Neil Lalonde
197944edaa UX: when staff change their email address, show a message saying an email has been sent to their current address, not their new one 2017-08-09 13:43:01 -04:00
Arpit Jalan
bf2c35aa99 FEATURE: add RSS feed for badge pages 2017-08-09 13:43:49 +05:30
Guo Xiang Tan
a9613163b5 FEATURE: Force user to enter reason when requesting for group membership. 2017-08-09 15:45:28 +09:00
Guo Xiang Tan
2c39743d5d Introduce multisite tests for better coverage. 2017-08-08 12:58:22 +09:00
Robin Ward
6ecb7cdff4 UX: Support for none style of category badge 2017-08-07 12:49:19 -04:00
Guo Xiang Tan
3f24ed2b3e Can't revert due to incompatibility of new site setting types. 
Revert "Revert "FEATURE: Site settings defaults per locale""

This reverts commit 439fe8ba24.
 2017-08-07 10:43:09 +09:00
Guo Xiang Tan
439fe8ba24 Revert "FEATURE: Site settings defaults per locale" 
This reverts commit 468a8fcd20.
 2017-08-07 10:31:50 +09:00
Leo McArdle
a7b7fe335f FIX: allow an admin to click on blank errors (#5027) 
* FIX: allow an admin to click on blank errors

* i18nlize strings

* what would a rails master do?
 2017-08-04 20:04:26 +02:00
Robin Ward
a3ef814245 UX: Show proper HTML for category preview in site settings 2017-08-04 13:56:27 -04:00
Neil Lalonde
d1576298ef add shadowed_by_global to allow_restore 2017-08-03 15:10:11 -04:00
Guo Xiang Tan
a47e297508 Merge pull request #5019 from tgxworld/more_resiliency_to_readonly_redis 
Fix Redis command errors when trying to start app with a readonly Redis.
 2017-08-03 06:34:36 +09:00
Sam
902be91a5a FEATURE: CTRL+/ to trigger search even from composer 2017-08-02 16:26:03 -04:00
Sam
f6bc572fb8 FEATURE: option to enable inline oneboxes for all domains 
Also, change to prefer title over open graph which is often way too sparse
 2017-08-02 14:27:31 -04:00
Erick Guan
468a8fcd20 FEATURE: Site settings defaults per locale 
This change-set allows setting different defaults for different locales. 

It also:

- Adds extensive testing around site setting validation

- raises deprecation error if site setting has the default property based on env

- relocated site settings for dev and tests in the initializer

- deprecated client_setting in the site setting's loading process

- ensure it raises when a enum site setting being set

- default_locale is promoted to `required` category.

- fixes incorrect default setting and validation

- fixes ensure type check for site settings

- creates a benchmark for site setting

- sets reasonable defaults for Chinese
 2017-08-02 12:24:19 -04:00
Guo Xiang Tan
9bc3038728 Fix Redis command errors when trying to start app with a readonly Redis. 2017-08-02 21:33:56 +09:00
Jeff Atwood
13bb69baca switch from h4 to bold for invite headers 2017-08-01 16:39:59 -07:00
Robin Ward
173aa69905 Enable compression for SVG files 2017-08-01 17:25:25 -04:00
Neil Lalonde
2feec43bd7 Update translations 2017-08-01 13:11:52 -04:00
Neil Lalonde
fa3c240e8b Merge pull request #4981 from dmacjam/fix_limited_search_results 
FIX: limited search results
 2017-07-31 20:23:57 -04:00
Régis Hanol
88ba052446 secure default for the 'find_related_post_with_key' site setting 2017-08-01 00:03:04 +02:00
Neil Lalonde
ec85b41078 UX: Move watched words to the Logs section of admin 2017-07-31 17:06:50 -04:00
Neil Lalonde
7c1d7fb423 Merge branch 'master' into fix_limited_search_results 2017-07-31 15:55:31 -04:00
Neil Lalonde
4a5907b116 Merge branch 'master' into search_posts_with_images 2017-07-31 10:44:41 -04:00
Neil Lalonde
d336d9a515 Remove mention of unhandled flags in description of the contact_email setting 2017-07-31 10:08:54 -04:00
Guo Xiang Tan
4620dfe92d FEATURE: Add group settngs to allow users to leave a group freely. 
https://meta.discourse.org/t/split-join-leave-freely-setting-on-groups/65565
 2017-07-28 15:00:25 +09:00
Guo Xiang Tan
5012d46cbd Add rubocop to our build. (#5004) 2017-07-28 10:20:09 +09:00
Robin Ward
ad04d188ae FIX: Precompile errors for wizard tests 2017-07-27 12:08:10 -04:00
Robin Ward
6a8f5d497e Revert "FIX: We need to precompile the wizard test helper" 
This reverts commit 39e394de15.
 2017-07-27 11:51:04 -04:00
Robin Ward
39e394de15 FIX: We need to precompile the wizard test helper 2017-07-27 11:42:11 -04:00
Guo Xiang Tan
75374c76b3 UX: Display button to message group on group page. 
https://meta.discourse.org/t/make-it-easier-to-send-a-message-to-groups/65065
 2017-07-27 17:51:25 +09:00
Neil Lalonde
24cb950432 FEATURE: Watched Words: when posts contain words, do one of flag, require approval, censor, or block 2017-07-26 11:01:09 -04:00
Neil Lalonde
ea0e90b2b0 Merge branch 'master' into search_posts_with_images 2017-07-26 10:15:55 -04:00
Guo Xiang Tan
b59dfb86f4 UX: Include group name in email when group is invited to a PM. 
https://meta.discourse.org/t/xyz-invited-you-to-a-message-but-really-invited-a-group-im-in/65996
 2017-07-26 15:51:44 +09:00
Guo Xiang Tan
96267f0845 Merge pull request #4960 from discourse/category-description-error 
FIX: Explicit error when category description post is bad
 2017-07-26 08:54:22 +09:00
Leo McArdle
e4fa6a4c92 add link to /about page in email rejection messages 2017-07-25 11:26:29 +01:00
Régis Hanol
c7c93e7159 FEATURE: new 'strip image metadata' site setting 2017-07-25 11:48:39 +02:00
Guo Xiang Tan
1b0750d7ef Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups 
Group owners can invite users to groups
 2017-07-24 16:21:19 +09:00
Jeff Atwood
9e0381396f adjust markdown for account required message 2017-07-23 12:49:39 -07:00
Joffrey JAFFEUX
e2e0221dd7 FIX: make sure there are meaningful titles on the picker 2017-07-22 17:32:12 +02:00
Robin Ward
2f8f2aa1dd FEATURE: Whitelists for inline oneboxing 2017-07-21 15:41:47 -04:00
Jeff Atwood
4c7b725e19 remove quote marks from search term result page 2017-07-21 12:35:30 -07:00
Rafael dos Santos Silva
89ef5d36a9 FIX: Explicit error when category description post is bad 2017-07-21 16:07:29 -03:00
Leo McArdle
407a23663d FEATURE: send rejection email for unrecognized errors 2017-07-21 18:26:52 +01:00
Guo Xiang Tan
2a17f1ccd7 FIX: Group owners should be able to invite users to their groups. 
https://meta.discourse.org/t/group-owner-cannot-send-an-invite-to-a-group/60617/12
 2017-07-21 23:48:25 +09:00
Joffrey JAFFEUX
c7f2b0fe58 tweaks to copy and styles 2017-07-21 14:19:04 +02:00
Jakub Macina
44bd8f3837 Add info about more results to full-page search frontend. 2017-07-21 09:35:04 +02:00
Sam
e9e97f5bcf simplify emoji cache rule 2017-07-20 18:22:59 -04:00
Sam
89f34eb62b attempt to cache all emojis 2017-07-20 17:47:16 -04:00
Robin Ward
3882722195 FEATURE: Inline (Mini) Oneboxing 
see:
https://meta.discourse.org/t/mini-inline-onebox-support-rfc/66400?source_topic_id=66066
 2017-07-20 15:38:04 -04:00
Arpit Jalan
d666b73893 Update translations. 2017-07-20 14:57:02 +05:30
Joffrey JAFFEUX
6de258d4cf FEATURE: Introduces new emoji-picker 2017-07-19 16:48:23 +02:00
Robin Ward
cdb3706025 Track clicks on topics in search results 2017-07-17 15:42:32 -04:00
Sam Saffron
d0c5205a52 Feature: Change markdown engine to markdown it 
This commit removes the old evilstreak markdownjs engine.

- Adds specs to WhiteLister and changes it to stop using globals
    (Fixes large memory leak)
- Fixes edge cases around bbcode handling
- Removes mdtest which is no longer valid (to be replaced with
    CommonMark)
- Updates MiniRacer to correct minor unmanaged memory leak
- Fixes plugin specs
 2017-07-17 11:41:34 -04:00
Robin Ward
6b6ad9391b Clean up job for search logs 2017-07-14 14:30:58 -04:00
Robin Ward
97e211f837 FEATURE: Log Search Queries 2017-07-14 14:30:58 -04:00
Neil Lalonde
3ebd8838af FEATURE: cross-domain tracking for Google universal analytics 2017-07-13 15:21:44 -04:00
Robin Ward
7fb62bdab4 Enable logging behind ENV var for test mode 2017-07-13 11:38:17 -04:00
Robin Ward
95b9ea1222 Makes tests run slightly faster. 
see:
https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
 2017-07-13 11:35:24 -04:00
Sam
79a084dd58 Revert "remove old markdown engine work-in-progress" 
This reverts commit ee470b5317.
 2017-07-12 18:10:51 -04:00
Sam Saffron
ee470b5317 remove old markdown engine work-in-progress 2017-07-12 17:44:40 -04:00
Arpit Jalan
76981605fa FIX: don't raise error when inviting existing user to private topic via email 
https://meta.discourse.org/t/inviting-existing-user-to-a-private-topic-message-via-email-shows-error-message/65994
 2017-07-12 21:51:21 +05:30
Jeff Atwood
5be9bee230 safe to default to read only off during backups 2017-07-12 04:52:17 -07:00
Jeff Atwood
f585f2cca5 switch to H4 for invite body title copy 2017-07-11 15:05:07 -07:00
Jeff Atwood
9e91d137e3 switch to h4 for invite body title copy 2017-07-11 15:04:04 -07:00
Guo Xiang Tan
f529cb1674 Remove validation for invalid interpolation keys. 
* Our codebase currently supports custom interpolations keys that are
  not present in the original translation. The proper fix should
  be to make `TranslateOverride` aware of such keys.
 2017-07-11 11:12:11 +09:00
Sam
d29a0eeedf allow global shadow for new markdown engine 2017-07-10 12:22:15 -04:00
Régis Hanol
c66b9dcdbd add 'us-east-2' S3 region 2017-07-10 15:36:38 +02:00
Guo Xiang Tan
2255724637 UX: Add validator for SiteSetting#sso_overrides_email. 2017-07-10 10:08:55 +09:00
Robin Ward
f1a6449e4b SECURITY: Remove disposable invite feature 2017-07-07 20:24:39 -04:00
Arpit Jalan
5b67cd1937 Merge pull request #4956 from techAPJ/pm-recipients 
FEATURE: new site setting to limit message recipients
 2017-07-06 22:57:33 +05:30
Arpit Jalan
7cffbc8ba8 FEATURE: new site setting to limit message recipients 
New site setting `max_allowed_message_recipients` to limit message
recipients

https://meta.discourse.org/t/one-of-my-users-just-group-messaged-100-other-user-with-a-spam-offer/65612/7?u=techapj
 2017-07-06 22:52:49 +05:30
Robin Ward
4f66083121 Allow version_checks to be shadowed by global 2017-07-06 10:41:53 -04:00
Joffrey JAFFEUX
6fd44b1efd FIX: s/google_blob/google_classic 2017-07-06 09:05:15 +02:00
Arpit Jalan
25d70ec900 Update Translations 2017-07-05 11:35:35 +05:30
Joffrey JAFFEUX
a71c75367e FEATURE: emoji generation now use emoji-db 
- unicode 10
- emoji 5.0
- support for google_blob and facebook_messenger sets
 2017-07-04 14:08:47 +02:00
Sam
845170bd6b FEATURE: add support for group visibility level 
There are 4 visibility levels

- public (default)
- members only
- staff
- owners

Note, admins and group owners ALWAYS have visibility to groups

Migration treated old "non public" as "members only"
 2017-07-03 15:26:57 -04:00
Robin Ward
0ba39109a0 FIX: Make omit_default_port the global default 2017-06-30 12:43:26 -04:00
Matt Palmer
c3ca281ea7 Merge pull request #4943 from mpalmer/log-http-host 
Include HTTP Host header in nginx logs
 2017-06-30 15:16:53 +10:00
Arpit Jalan
e7b9b1312e FEATURE: remove all invites 
https://meta.discourse.org/t/remove-all-invitations-button-for-the-admin-panel/65207
 2017-06-29 22:30:10 +05:30
Sam
fbb5600c8e expose enable_experimental_markdown_it 
expose the site setting that enables the CommonMark engine
 2017-06-28 16:51:49 -04:00
Rafael dos Santos Silva
97b6d8664b FIX: Move Referrer Policy header to right location 2017-06-28 14:39:54 -03:00
Rafael dos Santos Silva
095a131163 FEATURE: Add default Referrer Policy header 2017-06-28 02:25:41 -03:00
Matt Palmer
90d654c46c Include HTTP Host header in nginx logs 
This is crucial in multisite installations, because otherwise the nginx logs
are fairly useless, however it can also be quite handy to know what
hostnames are being sent to your site.  The variable is quoted, because it
is untrusted input (it is taken directly from the HTTP request), but nginx
helpfully escapes the quoting character automagically, so we don't have to
worry about that.

For now, the log analysis plugin *recognises* the new log format
(and continues to recognise the previous format, for backwards
compatibility), but doesn't do anything with the new log entry field.  This
means your multisite performance plugin data is still broken, but it's no
worse than it was before.
 2017-06-28 14:41:02 +10:00
Sam
4c5109ff5b FEATURE: site setting for Markdown typographer 
It ships anyway with markdown.it so we might as well expose it
 2017-06-27 16:50:13 -04:00
Sam
e2f57a154b FIX: blockquote button implementation 
Previously clicking on blockquote in the middle of sentence
would result in incorrect formatting
 2017-06-27 13:32:20 -04:00
Guo Xiang Tan
117d5f1b6a FIX: /u.json should return 404 instead of 500. 2017-06-27 10:11:48 +09:00
Sam
e6cc07fc43 FEATURE: twitter is the new default emoji set 2017-06-26 16:51:55 -04:00
Neil Lalonde
febfe27669 Update translations 2017-06-26 14:56:22 -04:00
Robin Ward
4f27259e27 UX: Make the edit wiki button more prominent 2017-06-26 14:34:59 -04:00
Neil Lalonde
eee00b5bb5 UX: include a link to change email preferences at the bottom of summary emails as an alternative to unsubscribing 2017-06-26 12:27:22 -04:00
Sam
234694b50f Feature: CommonMark support 
This adds the markdown.it engine to Discourse.
https://github.com/markdown-it/markdown-it

As the migration is going to take a while the new engine is default
disabled. To enable it you must change the hidden site setting:
enable_experimental_markdown_it.

This commit is a squash of many other commits, it also includes some
improvements to autospec (ability to run plugins), and a dev dependency
on the og gem for html normalization.
 2017-06-23 12:01:33 -04:00
Régis Hanol
66920cfafd Merge pull request #4938 from LeoMcA/ses-fix 
FEATURE: setting to only use the key when finding the related post of…
 2017-06-22 16:15:57 +02:00
Régis Hanol
94a0d43f31 add 'ico' and 'webp' to image extensions list in order to bypass rails 2017-06-22 12:55:27 +02:00
Guo Xiang Tan
47ca0f7f09 FIX: Foward requests to /u/new to our Ember router. 2017-06-21 13:06:28 +09:00
Sam
492eed70ab correct with brackets 2017-06-20 15:53:14 -04:00
Sam
9f8388c2eb FIX: start filesystem watcher when running under rails s 2017-06-20 15:44:01 -04:00
Leo McArdle
5e0efb3410 FEATURE: setting to only use the key when finding the related post of an email reply 
this fixes email-in threading problems when using a SMTP server which modifies the message_id
header, like Amazon SES
 2017-06-19 12:22:44 +01:00
Arpit Jalan
ee1f3a4b25 UX: make font size consistent on password reset modal 2017-06-19 16:09:29 +05:30
Arpit Jalan
e6b7458b54 remove trailing dot in help text 2017-06-19 15:49:51 +05:30
Jeff Atwood
1c688c9eae copyedit on login help text 2017-06-19 03:08:20 -07:00
Arpit Jalan
74e6717b40 FEATURE: offer help on forgot password modal 2017-06-19 14:05:45 +05:30
Guo Xiang Tan
7ea288140d Allow multiple host when restricting Sidekiq queues. 2017-06-19 14:45:51 +09:00
Guo Xiang Tan
a23ce56682 Update translations. 2017-06-19 12:39:30 +09:00
Arpit Jalan
77e886ec90 UX: move optional to the description text for the password field 2017-06-16 15:32:15 +05:30
Guo Xiang Tan
b5ec241716 FIX: Validate interpolation keys used in translation overrides. 
https://meta.discourse.org/t/discobot-translation-missing-error/64429/6?u=tgxworld
 2017-06-16 08:54:48 +09:00