Commit Graph

543 Commits

Author SHA1 Message Date
Andreas Nedbal c13cb9bb1b Remove legacy questionbox locales 2022-06-13 22:59:41 +02:00
Andreas Nedbal cf74d6f4c8 Add translations for questionbox 2022-06-13 22:59:41 +02:00
Karina Kwiatek 25ed1e4605 Add tests for commenting on answers while blocked 2022-06-13 11:56:34 +02:00
Karina Kwiatek 9b5fefc661 Update relationship controller tests for blocking-related actions 2022-06-13 11:56:34 +02:00
Karina Kwiatek d6e4ad35ad Add error messages for answering while blocked/blocking 2022-06-13 11:56:34 +02:00
Karina Kwiatek 14dfef6a52 Add status messages for blocking/unblocking users 2022-06-13 11:56:34 +02:00
Karina Kwiatek c173c4a17d Add the ability to block/unblock users from profile pages 2022-06-13 11:56:34 +02:00
Andreas Nedbal e19b028a4d Apply review suggestion from @raccube
Co-authored-by: Karina Kwiatek <6197148+raccube@users.noreply.github.com>
2022-04-25 19:40:23 +02:00
Andreas Nedbal 0b38ae45b5 Remove legacy inbox locales 2022-04-25 19:40:23 +02:00
Andreas Nedbal a0741a9a68 Add translations for inbox entry 2022-04-25 19:40:23 +02:00
Andreas Nedbal 14d0074cb8 Add translations for inbox sidebar 2022-04-25 19:40:23 +02:00
Andreas Nedbal 5829dc51ec Add translations for inbox show view 2022-04-25 19:40:23 +02:00
Andreas Nedbal bf0ac3c4e3 Add translations for inbox controller 2022-04-25 19:40:23 +02:00
Andreas Nedbal 6b1be53827 Add translations for linkfilter 2022-04-19 21:25:56 +02:00
Andreas Nedbal 7d8ab80c31 Remove legacy footer locales 2022-04-18 20:15:34 +02:00
Andreas Nedbal 5518014024 Add translations for footer 2022-04-18 20:15:34 +02:00
Andreas Nedbal c1cf9bab3f Remove legacy about page locales 2022-04-17 22:58:42 +02:00
Andreas Nedbal 68f6d11648 Add translations for about page 2022-04-17 22:58:42 +02:00
Andreas Nedbal ef5b367d70 Add about page text config option 2022-04-17 22:58:42 +02:00
Andreas Nedbal f43d4b8621 Remove FAQ page 2022-04-17 22:58:42 +02:00
Andreas Nedbal aa48a53cb7 Track release version in Sentry 2022-04-16 12:56:18 +02:00
Andreas Nedbal 7d7bef81ca Add version class and load it in Rails 2022-04-16 12:56:18 +02:00
Andreas Nedbal 583a3ba519 Remove `user#lists` action, view and route 2022-04-15 21:32:14 +02:00
Andreas Nedbal 833c0cb671 Configure better_errors to work in Docker environments 2022-04-14 23:23:37 +02:00
Andreas Nedbal 344a344a40 Remove legacy frontpage translations 2022-04-10 22:01:27 +02:00
Andreas Nedbal de3af3638e Add translations for frontpage 2022-04-10 22:01:27 +02:00
Andreas Nedbal 56af98294a
Merge branch 'main' into refactor/settings-tabs-locales 2022-02-20 21:36:31 +01:00
Andreas Nedbal 60b40a444c Remove legacy privacy settings locales 2022-02-20 21:20:57 +01:00
Andreas Nedbal 6541442098 Add translations for privacy settings flashes 2022-02-20 21:20:57 +01:00
Andreas Nedbal 2fc4b8f4a4 Add translations for privacy setting attributes 2022-02-20 21:20:57 +01:00
Andreas Nedbal e424d5ed38 Add translations for privacy settings title 2022-02-20 21:20:57 +01:00
Andreas Nedbal edf3d3db15 Add translation for "time ago" wording 2022-02-20 21:20:14 +01:00
Andreas Nedbal ebaa7bfa87 Add translation for none-placeholder 2022-02-20 21:20:14 +01:00
Andreas Nedbal b965cf54c4 Translate more user attributes 2022-02-20 21:20:14 +01:00
Andreas Nedbal 2d63a80761 Add translations for the data view 2022-02-20 21:20:14 +01:00
Andreas Nedbal 1778cb713a Remove legacy settings tabs locales 2022-02-19 18:09:03 +01:00
Andreas Nedbal 66d8180483 Add translations for settings tabs 2022-02-19 18:08:44 +01:00
Andreas Nedbal 0e2a657f87 Add missing newline 2022-02-18 12:50:27 +01:00
Andreas Nedbal e3b20a21e6 Apply review suggestion from @raccube
Co-authored-by: Karina Kwiatek <6197148+raccube@users.noreply.github.com>
2022-02-18 12:50:27 +01:00
Andreas Nedbal 79dbf7d1c8 Add translations for mute rule controller actions 2022-02-18 12:50:27 +01:00
Andreas Nedbal cc50219d05 Add translations for mute rules view 2022-02-18 12:50:27 +01:00
Andreas Nedbal 9899f05560 Add info flash translation for used recovery key 2022-02-13 23:41:50 +01:00
Andreas Nedbal 04d650a85a Remove legacy 2FA locales 2022-02-13 23:41:50 +01:00
Andreas Nedbal 5067275993 Add translations for security views and errors 2022-02-13 23:41:50 +01:00
Andreas Nedbal 075614c5d7 Add translations for 2FA controllers and actions 2022-02-13 23:41:50 +01:00
Andreas Nedbal 3a718a7e88
Merge branch 'main' into refactor/export-locales 2022-02-13 16:55:19 +01:00
Andreas Nedbal 555636577e Translate theme update success/error flashes 2022-02-13 16:53:42 +01:00
Andreas Nedbal ec680d6722 Translate forms and raised theme model attributes 2022-02-13 16:53:42 +01:00
Andreas Nedbal c50df2f660 Translate forms and raised theme settings sections 2022-02-13 16:53:42 +01:00
Andreas Nedbal 8159d556ab Translate general and color theme model attributes 2022-02-13 16:53:42 +01:00
Andreas Nedbal 84a72ce8cc Translate general and colors theme settings sections 2022-02-13 16:53:42 +01:00
Andreas Nedbal 78357faed5 Translate lead section of theme settings 2022-02-13 16:53:42 +01:00
Andreas Nedbal 64f794256c Translate title of theme settings page 2022-02-13 16:53:42 +01:00
Andreas Nedbal 0119437170 Add translations for user export 2022-02-13 02:26:15 +01:00
Andreas Nedbal 2dbf525d2e Move error locales to `errors.en.yml` 2022-02-09 14:01:56 +01:00
Andreas Nedbal d3f90b48fa Move general vocabulary to `voc.en.yml` 2022-02-09 14:01:56 +01:00
Andreas Nedbal f746363103 Move controller-scoped locales to `controllers.en.yml` 2022-02-09 14:01:56 +01:00
Andreas Nedbal 771ed3ddf4 Move view-related locales into `views.en.yml` 2022-02-09 14:01:56 +01:00
Andreas Nedbal 03f9543595 Remove legacy session locale 2022-02-07 21:51:32 +01:00
Andreas Nedbal e3eb4bf676 Remove legacy account settings locales 2022-02-07 21:51:32 +01:00
Andreas Nedbal 9943e6c207 Add translations for sign in 2022-02-07 21:51:32 +01:00
Andreas Nedbal 540e5acaba Add translations for account settings 2022-02-07 21:51:32 +01:00
Andreas Nedbal 7971df9ac0 Add missing newline 2022-01-30 21:20:59 +01:00
Andreas Nedbal 27d60c05be Remove legacy profile locales 2022-01-30 21:20:59 +01:00
Andreas Nedbal 3ee847258a Add translations for profile settings 2022-01-30 21:20:59 +01:00
Andreas Nedbal 800958e88f Install and configure lograge 2022-01-29 22:34:55 +01:00
Andreas Nedbal 058b171915 Install and configure bullet 2022-01-29 22:22:39 +01:00
Karina Kwiatek f4066d55a1 Use translations for feedback page titles 2022-01-29 21:06:03 +01:00
Andreas Nedbal 8838663528 Remove legacy service locales 2022-01-29 20:08:41 +01:00
Andreas Nedbal 383ef62603 Translate `ServicesController` views 2022-01-29 20:08:41 +01:00
Andreas Nedbal 592de78a4f Add translations for `ServicesController` 2022-01-29 20:08:41 +01:00
Andreas Nedbal 6565805ef5 Add missing newline 2022-01-25 22:31:25 +01:00
Andreas Nedbal 3404b337eb Add ActiveModel-scoped locales for `Announcement` model 2022-01-25 22:31:25 +01:00
Andreas Nedbal ac83995dfc Add controller-scoped locales for `AnnouncementController` 2022-01-25 22:31:25 +01:00
Andreas Nedbal a8f184a001 Remove all non-english locales 2022-01-24 20:13:09 +01:00
Karina Kwiatek 731ee4bf69 Address review comments from @nilsding 2022-01-23 16:48:53 +01:00
Karina Kwiatek 3962671135 Implement relationship logic as use case 2022-01-23 16:48:53 +01:00
Karina Kwiatek ce951453a2 Make relationships polymorphic 2022-01-23 16:48:53 +01:00
Andreas Nedbal d56dfc02f9 Move consent POST-logic to separate action 2022-01-22 22:50:32 +01:00
Andreas Nedbal 77c6dc7120 Turn `feedback_features_path` into snake_case 2022-01-22 22:50:32 +01:00
Andreas Nedbal 322048a48a Add final newline to config 2022-01-22 22:50:32 +01:00
Andreas Nedbal 0b76ceb73d WIP: Canny integration 2022-01-22 22:50:32 +01:00
Andreas Nedbal 8247c8864f Generate i18n export as TypeScript and move locale logic there 2022-01-15 00:05:17 +01:00
Karina Kwiatek 5d7039a2d2 Add test for `Exporter#collect_user_info` 2022-01-14 23:29:49 +01:00
Karina Kwiatek 45854894dc Upgrade to Rails 6.0 2022-01-13 21:42:06 +01:00
Karina Kwiatek be811ccb32 Replace mention of CoffeeScript in about 2022-01-09 18:23:50 +01:00
Andreas Nedbal 25b627a349 Remove i18n.js and prevent further exporting of it 2022-01-08 14:48:15 +01:00
Karina Kwiatek 136e2fa016
Merge pull request #272 from Retrospring/feature/social-post-tagging
Add the ability to post to services with a tag
2022-01-07 19:40:52 +01:00
Karina Kwiatek 96e48a833b
Merge pull request #194 from Retrospring/refactor/user-bans
Implement ban history
2022-01-06 14:05:33 +01:00
Karina Kwiatek 683fffd734 Add the ability to post to services with a tag 2022-01-05 19:49:59 +01:00
Georg Gadinger 3c58257d21 remove tumblr
Resolves #274
2022-01-05 19:32:52 +01:00
Karina Kwiatek 374da66cd1 Add `UserBan` to Rails Admin 2022-01-02 19:50:45 +01:00
Georg Gadinger 506984ecfb rails_admin: include the new MuteRule model 2022-01-02 16:25:57 +01:00
Karina Kwiatek 6b626765a8 Create views for managing muted words 2022-01-02 01:55:52 +01:00
Karina Kwiatek 6c0e6b1d30 Create mute rules AJAX controller 2022-01-01 00:38:38 +01:00
Andreas Nedbal f871ab45e8 Allow `rel` in sanitized links 2021-12-31 22:40:38 +01:00
Andreas Nedbal 8bbc9c72c1 Rename const/config option to `allowed_hosts_in_markdown` 2021-12-31 22:40:38 +01:00
Andreas Nedbal 3d04f54a0f Allow target for links in sanitizer 2021-12-31 22:40:38 +01:00
Andreas Nedbal 02a5e7029e Add linkfilter logic to existing renderers 2021-12-31 22:40:38 +01:00
Andreas Nedbal 09172a56ef Add linkfilter action 2021-12-31 22:40:38 +01:00
Georg Gadinger a7c942e4b8 rails_admin: include the new Profile model 2021-12-31 19:25:17 +01:00
Karina Kwiatek 4a039937d6 Reduce Sentry sample rate to 25% 2021-12-31 11:59:07 +01:00
Andreas Nedbal 66638caedf Initialize Sentry regardless of `APP_CONFIG[:sentry_dsn]` being set or not 2021-12-29 22:35:29 +01:00
Karina Kwiatek 751ba0f446 Configure traces sample rate 2021-12-28 19:49:31 +01:00
Karina Kwiatek 065e56ccf1 Replace New Relic with Sentry 2021-12-28 18:32:03 +01:00
Karina Kwiatek 0f654a4d7d
Merge pull request #226 from Retrospring/refactor/user-typescript
Port User functionality to TypeScript
2021-12-25 22:44:26 +01:00
Karina Kwiatek 053ebafbc5
Merge pull request #213 from Retrospring/refactor/profile
Move profile fields to seperate table
2021-12-25 22:44:10 +01:00
Andreas Nedbal 89127aa313 Add aliases for common module locations 2021-12-25 00:02:52 +01:00
Karina Kwiatek a38c134280 Add description of `accepted_image_formats` in app config 2021-12-22 17:17:48 +01:00
Karina Kwiatek c995ead1e0 Add accept attribute to file inputs 2021-12-22 16:38:37 +01:00
Andreas Nedbal d5170f30ad Disable browser monitoring with New Relic 2021-12-22 00:48:48 +01:00
Karina Kwiatek 8fa4feb469 Add endpoint for updating profile 2021-12-22 00:03:19 +01:00
Andreas Nedbal b05572d9af remove unused section from config 2021-10-03 20:57:12 +02:00
Dominik M. Kwiatek 7a62f7d2c9
Set session duration to 90 days (#169) 2021-02-25 17:12:30 +01:00
Andreas Nedbal 24f197a064 Move legacy javascript folder out of packs/ 2020-12-26 21:59:53 +01:00
Andreas Nedbal 51678e5e34 Add Typescript support 2020-12-26 21:59:53 +01:00
Andreas Nedbal 61f60717fc Set up i18n-js to work with Webpacker 2020-12-25 18:22:03 +01:00
Andreas Nedbal df664d2772 Configure CoffeeScript compilation with Webpacker 2020-12-25 18:22:03 +01:00
Andreas Nedbal 07134f6f94 Remove policy declaration for local webpack-dev-server 2020-12-25 18:22:03 +01:00
Andreas Nedbal 059471e5cf Initial Webpacker setup 2020-12-25 18:22:03 +01:00
Dominik Kwiatek e16896fac1 Provide the user a way to generate new codes. 2020-11-01 18:52:42 +01:00
Dominik Kwiatek 61d82bdbec Display count of remaining recovery codes 2020-11-01 18:41:37 +01:00
Dominik Kwiatek d20f527d8c Add drift period 2020-10-24 00:24:04 +02:00
Dominik Kwiatek 75c782705a Add string for views.auth.2fa.errors.invalid_code 2020-10-23 21:02:13 +02:00
Dominik Kwiatek 702156258c Remove user/sessions#two_factor_entry 2020-10-23 21:00:06 +02:00
Dominik Kwiatek 66cccbb5d6 Use the same string for 2FA failures 2020-10-23 20:58:42 +02:00
Dominik Kwiatek ea99805da1 Fix remaining lint warnings 2020-10-19 15:55:00 +02:00
Dominik Kwiatek 141ff59f63 Implement Two Factor Authentication 2020-10-18 10:39:46 +02:00
Dominik M. Kwiatek d448d293de Remove test env skip 2020-05-27 22:33:54 +01:00
Dominik M. Kwiatek 4c7ec05198 Address @nilsding's review comments 2020-05-27 22:27:54 +01:00
Dominik M. Kwiatek 5650b2eb0b Add hCaptcha to example config 2020-05-27 21:12:25 +01:00
Dominik M. Kwiatek c4fb5d1db9 Add registration tests 2020-05-27 20:07:39 +01:00
Dominik M. Kwiatek a92dd54be3 Address @nilsding's review comments 2020-05-27 20:07:39 +01:00
Dominik M. Kwiatek 7cac93ad4e Add hCaptcha 2020-05-27 20:07:39 +01:00
Georg Gadinger ea0685136e Rename Groups to Lists
haha regexp go brrr

special thanks to @seatsea for helping me out with the French locales
2020-05-25 18:04:54 +02:00
Dominik M. Kwiatek 6d37ae9498 Comment out fog config 2020-05-21 21:44:07 +01:00
Dominik M. Kwiatek d185c54f03 Add CarrierWave Backgrounder 2020-05-17 20:38:40 +01:00
Karina Kwiatek 5c0871f33c Address @nilsding's review comments
- Fix types on legacy attachment migrations
- Restore Action Mailer setup for development env
- Use `Hash#dig` in CarrierWave initializer
2020-05-17 20:38:40 +01:00
Karina Kwiatek 76161029e8 Correct out of place comment 2020-05-17 20:38:40 +01:00
Karina Kwiatek 783e47fc2b Replace paperclip with CarrierWave 2020-05-17 20:38:40 +01:00
Georg Gadinger 1dfe0418c9 Remove unused theme initialiser 2020-05-09 03:42:15 +02:00
Andreas Nedbal 5966be5bd6 Make rails_admin use the default ApplicationController 2020-05-08 23:28:56 +02:00
Andreas Nedbal d5d5c5eb19 make sprockets cache definition development-only 2020-05-06 14:31:27 +02:00
Andreas Nedbal e7c5b1a4a3 Remove theme preview route and logic 2020-05-04 17:26:38 +02:00
Andreas Nedbal 45b11bddfd Merge branch 'master' into feature/bootstrap 2020-04-29 02:49:07 +02:00
Georg Gadinger e07d069c73 Refactor Ajax::*Controllers
Also removed the unused `Ajax::QuestionController#preview` method and
route
2020-04-28 20:28:00 +02:00
Andreas Nedbal e9e0a222b0 Merge branch 'master' into feature/bootstrap 2020-04-27 02:11:54 +02:00
Georg Gadinger aeef50ad78
Merge pull request #86 from Retrospring/cleanup
Minor Cleanup
2020-04-26 20:03:46 +02:00
Karina Kwiatek f42cc6aed9 Remove all other references to removed roles 2020-04-25 21:20:02 +01:00
Andreas Nedbal 7767eeae9f Merge branch 'master' into feature/bootstrap 2020-04-25 13:14:01 +02:00
Andreas Nedbal 1aec0f95a4 Add configurable asset caching for Docker on Windows environments 2020-04-25 13:02:20 +02:00
Dominik M. Kwiatek a8c335899d
Use email field for password reset (#77)
Fixes unsubmmittable password reset form
2020-04-22 19:22:16 +01:00
Georg Gadinger 101b3b68d3 Use cursored pagination, remove WillPaginate 2020-04-20 23:13:24 +02:00
Dominik M. Kwiatek c292f51957
Set up GitHub Actions (#72)
* Add GitHub Actions config

* Add extra dependencies and use environment variable for DB config

Moved the env vars up to outside of the postgres service so this might not work

* Pass environment variables for Postgres credentials to Postgres container

* Pass service ports to application

Have a suspicion that Redis one won't work as justask.yml is probably not using ERB

* Add database.yml.postgres with port

* Cache gems; pass Redis URL as env var

* Add host to DB config

* Pass DB credentials for db:setup

* Use 127.0.0.1 instead of localhost to force TCP; Use bundler config without instead of --without

* I can't read 🗑

* 🤔

* 💻🔨 I have no idea what I'm doing…

* Testing env defined outside steps

* Move templated vars down

* Add build badge
2020-04-20 21:02:48 +01:00
Karina Kwiatek 16ade832ca Address @nilsding's review changes 2020-04-19 22:58:47 +01:00
Karina Kwiatek e731d76d52 Update admin/announcements routes to use has_role? 2020-04-19 21:54:40 +01:00
Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements
# Conflicts:
#	db/schema.rb
2020-04-19 21:52:58 +01:00
Karina Kwiatek a505e7ee71 Ensure we're logged in as an admin when using the AnnouncementController 2020-04-19 21:45:07 +01:00
Georg Gadinger 946bb3ae9d Use Rolify for admin and moderator roles 2020-04-19 22:35:58 +02:00
Karina Kwiatek 8a632a09cd Create Announcement model & controller 2020-04-19 20:12:22 +01:00
Georg Gadinger 2237287472 Remove Capistrano 2020-04-19 19:43:55 +02:00
Georg Gadinger 311c7ac6c0 Remove Rollbar 2020-04-19 17:20:07 +02:00
Georg Gadinger 5eb61eb418 Use sendmail in production 2020-04-19 15:34:45 +02:00
Georg Gadinger b7d1c80ff0 remove rollbar queue, use mailers queue for mail stuff 2020-04-19 15:00:50 +02:00
Georg Gadinger 6f6ac3cc7d Merge remote-tracking branch 'origin/master' into rails5 2020-04-19 14:32:47 +02:00
Georg Gadinger b756c35345 make capistrano work with ed25519 keys 2020-04-19 14:32:42 +02:00
Georg Gadinger 9fa8ef1501 enable 'Discover' page for mods 2020-04-19 13:55:13 +02:00
Karina Kwiatek a19402af41 Upgrade to Rails 5.2 2020-04-19 00:45:50 +01:00
Georg Gadinger 012d29cc20 update devise-async to 1.0 2020-04-19 01:39:36 +02:00
Georg Gadinger 3e7497a144 Upgrade to Rails 5 2020-04-19 00:59:22 +02:00
Georg Gadinger d47991f379 Fixes for devise 4.x 2019-03-29 22:37:10 +01:00
Georg Gadinger 309d13f497 update ruby version, change deployment target 2018-12-16 18:47:41 +01:00
Georg Gadinger 6120256bad Disable rollbar 2017-06-17 22:58:44 +02:00
Georg Gadinger 90fc9dae3a Add New Relic 2017-06-17 22:49:19 +02:00
Georg Gadinger 5b7b680b01 Ignore RecordNotFound errors 2017-04-02 09:12:34 +02:00
Georg Gadinger 4424cb64cd Fix JS translations 2017-04-02 09:04:49 +02:00
Georg Gadinger 5ef7f043ff attempt to crete 2017-04-01 01:08:51 +02:00
Georg Gadinger e2d8414644 ??? 2017-04-01 00:24:12 +02:00
Georg Gadinger b592c4a380 Revert "translations?"
This reverts commit 6497382e7c.
2017-03-31 23:58:45 +02:00
Georg Gadinger e6cb140eb9 Add unicorn.rb to linked files 2017-03-31 23:55:52 +02:00
Georg Gadinger 6497382e7c translations? 2017-03-31 23:28:06 +02:00
Georg Gadinger fc96518c92 fix deploy (again) 2017-03-31 22:59:49 +02:00
Georg Gadinger a6f250b294 Fix deploy 2017-03-31 22:53:40 +02:00
Georg Gadinger 577bf1aea1 Fix deploy, yo. 2017-03-31 22:46:21 +02:00
Georg Gadinger 71de580878 Der Wagen ist eine gute Reise. 2017-03-31 22:44:27 +02:00
Georg Gadinger ab536284f3 Add some time measurement output 2017-03-31 22:38:23 +02:00
Georg Gadinger dcca449de1 Add Capistrano task to create i18n JS files 2017-03-31 22:33:07 +02:00
Georg Gadinger 28cc6b5938 Certain features can now be enabled/disabled from config 2017-03-31 22:21:38 +02:00
Georg Gadinger 3a663eeb09 App config with indifferent hash access 2017-03-31 22:16:23 +02:00
Georg Gadinger 5c49ba79bd Add Capistrano tasks for Rollbar 2017-03-29 23:01:06 +02:00
Georg Gadinger 9724c1cc0e Update rollbar gem + config 2017-03-29 22:55:50 +02:00
Georg Gadinger 162adfb725 Re-add locales and service docs 2017-03-29 22:32:36 +02:00
Georg Gadinger 049b12f423 Add devise initializer to linked files because it contains a secret. 2017-03-29 22:13:01 +02:00
Georg Gadinger 67efae6e52 Fix Version 2017-03-29 22:10:22 +02:00
Georg Gadinger 99bcfdacd4 Add Exports to linked dirs 2017-03-29 22:06:43 +02:00
Georg Gadinger 6b054a8be2 Add Capistrano 2017-03-29 22:01:26 +02:00
Georg G 0deb4c4ccc added export view/controller/routes 2016-01-05 20:54:38 +01:00
Georg G f693ad2a2f add a new sidekiq queue 2016-01-05 18:05:36 +01:00
Georg G 6a9619a70c update gems
also remove mysql because no one uses it anyway lol
2016-01-05 17:15:57 +01:00
Yuki 64ba41d9a6 Fix reports 2015-09-18 18:02:16 +09:00