Commit Graph

743 Commits (2e24312f67352d71ec30cea32ecc7ff9d14bceb2)

Author SHA1 Message Date
Marcos Sigueros Fernández c3122a9807
Update es-ES.js (#430)
3 years ago
Ponkhy f6498caa9a Merge branch 'main' of https://github.com/Ponkhy/uptime-kuma into main
3 years ago
Ponkhy 3a0bc80016 Added regex to hostname input
3 years ago
zsxeee 2fb3c40307
Variable name and key binding
3 years ago
zsxeee 66e40d9fcb
Edit comment and remove unused variable
3 years ago
Ioma Taani cbbc503f8e
Merge branch 'louislam:master' into master
3 years ago
zsxeee de8b61ef2b
Remove unused imports
3 years ago
zsxeee 534ac4b720
Move Apprise check to child component
3 years ago
zsxeee e9735d239b
Convert notification form to separate component
3 years ago
Louis a6fdd272a6 [status page] minor
3 years ago
Adam Stachowicz 250c2bdd6d Missing this
3 years ago
Adam Stachowicz 8e49d84050 Fix polish translation and translate new keys
3 years ago
LouisLam 579e07ded4 Merge branch 'master' into public-dashboard
3 years ago
kry008 a04878fa84
Finishing the translation of PL (#422)
3 years ago
LouisLam 2955abb5d9 [status page] create incident
3 years ago
LouisLam 392f8275b3 Merge branch 'master' into public-dashboard
3 years ago
Ioma Taani 783ec97004 updated translations
3 years ago
LouisLam 611d214a32 [status page] checkpoint
3 years ago
Adam Stachowicz 217637aa1f Add de-DE translation
3 years ago
Adam Stachowicz ab22961538 More info about `update-language-files` command
3 years ago
Adam Stachowicz 8ba8de07ae Missing this
3 years ago
Adam Stachowicz 79920b5f2c Fix languages after 80322cbfe7
3 years ago
Louis Lam 72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
3 years ago
LouisLam 80322cbfe7 Merge branch 'import-export'
3 years ago
LouisLam 512ff09cca set entry page
3 years ago
LouisLam e8f4fabcd0 [status page] crop and resize logo
3 years ago
Ponkhy f679c1cbaf Export button align left
3 years ago
LouisLam 2ab06f87b8 Merge branch 'master' into public-dashboard
3 years ago
Louis Lam 76db55b657
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
3 years ago
LouisLam db05b506f3 [status page] checkpoint
3 years ago
Ioma Taani 0752f810f1 updated
3 years ago
samet.kum 7274913686 Turkish Language added
3 years ago
No0Vad 1300448bed Adjustments to the retry interval
3 years ago
Ponkhy fff5fd8e9e Added search key
3 years ago
LouisLam 1d6670ed9a Merge branch 'master' into public-dashboard
3 years ago
LouisLam afe91078c4 [status page] checkpoint
3 years ago
Ponkhy c14b71a4a7 Added german translation for tags manager
3 years ago
LouisLam fc9b4617ca link interval and retryInterval
3 years ago
Jelle Posthuma 40d301457a Update new / updated translations to nl_NL
3 years ago
LouisLam 9902c181bc Merge branch 'master' into public-dashboard
3 years ago
Louis Lam 069c811af8
Merge pull request #278 from chakflying/tags
3 years ago
LouisLam f9311e4e7f [status page]
3 years ago
LouisLam 34abff4724 manual merge master
3 years ago
LouisLam d7a230ac15 Merge branch 'master' into public-dashboard
3 years ago
LouisLam 9da2a01a74 [status page] checkpoint
3 years ago
Nelson Chan 74da02da2c Fix: Prevent enter in modal from submitting form
3 years ago
NeuralMiner 47092258f8
Allow SMTP that doesnt require authentication.
3 years ago
LouisLam f351b423c5 link to the english version of microsoft link
3 years ago
LouisLam 0e16e88fa8 Merge remote-tracking branch 'origin/master'
3 years ago
LouisLam c746923018 merge italian language file
3 years ago
LouisLam df8754827d Merge branch 'italian-language-update'
3 years ago
Louis Lam 2c02dad1f9
Merge pull request #393 from Revyn112/master
3 years ago
LouisLam 600ec6d171 Merge branch 'master' into i18n_router_own_files
3 years ago
LouisLam 59ff9fa293 update missing timezone console msg
3 years ago
LouisLam a654e409df Merge branch 'master' into feature/timezones-package
3 years ago
LouisLam 76f1f34a0a fix #397, incorrect encode function for export file
3 years ago
LouisLam 35aca46b68 [status page] checkpoint
3 years ago
Paride Barison 6a925c7ed4 sistemato l'ordine
3 years ago
Paride Barison 8b9b86b478 updated
3 years ago
Nelson Chan 7c4b5f189b Fix: Fix hiding form when reusing draft tags
3 years ago
Nelson Chan a6f9762c4d Feat: Split add tag to modal
3 years ago
Nelson Chan a0e4e96160 Fix: Fix tag removal, reuse and validation
3 years ago
Nelson Chan fcbeed55bf Fix: Allow removing and re-adding the same tag
3 years ago
Nelson Chan 9b5abf9bb1 Fix: reset editMonitor after save
3 years ago
Nelson Chan 73f4b8e177 Fix: Improve various tags validation logic
3 years ago
Nelson Chan e6669fbb9e Fix: Improve searchbar padding on mobile
3 years ago
Nelson Chan e66a2d362d Feat: Add monitorList search box
3 years ago
Nelson Chan c2148fc0f1 Fix: Slightly reduce tag opacity on light theme
3 years ago
Nelson Chan 6e3a904aaa WIP: Add tags functionality
3 years ago
No0Vad 91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
3 years ago
Ponkhy 4711aeb355
Merge branch 'master' into import-export
3 years ago
Adam Stachowicz 7199bb5ead Remove unused i18n key
3 years ago
Ponkhy bb87972543 Hide 2FA section if disabled auth
3 years ago
Adam Stachowicz ea723c7595 Separate import and export. Fix ESLint
3 years ago
LouisLam e205adfd7b [status page] developing
3 years ago
Willian Rodrigues Barbosa 063d64eec8 feat: add microsoft teams notification provider
3 years ago
Adam Stachowicz 54ffef8b7a Own files for i18n and router + fix some of markdown warnings
3 years ago
Revyn112 44aa837a9d
Update NotificationDialog.vue
3 years ago
LouisLam f47f7758f9 Merge branch 'master' into public-dashboard
3 years ago
Bert Verhelst ddcd3c2a19 Merge remote-tracking branch 'origin/master' into feature/timezones-package
3 years ago
LouisLam 7df9698e5d eslint: comma-dangle for language files
3 years ago
Bert Verhelst 471333ad03 fix(util-frontend): revert typescript conversion
3 years ago
Ponkhy d313966d80
Merge branch 'master' into import-export
3 years ago
LouisLam 8205f90f3d update language files
3 years ago
Denis Freund 8352d9abbe add posibility to have a prefixMessage before the embed
3 years ago
Louis Lam 2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings
3 years ago
Louis Lam c52b9b63d5
Merge pull request #389 from Ponkhy/default-notification
3 years ago
Louis Lam e55193270d
Merge pull request #377 from Lrss/master
3 years ago
Louis Lam 9d39071a91
Merge pull request #363 from Ponkhy/2fa
3 years ago
Bert Verhelst a170694a83
fix(util-frontend): improve formatting timezoneList
3 years ago
Bert Verhelst 5969e913b5
fix(util-frontend): improve formatting
3 years ago
Louis Lam 0d280f5edb
Merge pull request #376 from chakflying/patch-7
3 years ago
Bert Verhelst 660b969178 fix(settings): switch custom styles to bootstrap class for bottom margin
3 years ago
Bert Verhelst c26622aa39 fix(settings): add some button bottom margin for narrow screens
3 years ago
Bert Verhelst a7674755ba Move timezones to npm package and convert util-frontend.js to typescript
3 years ago
Ponkhy db14768229 Wording correction for notification modal
3 years ago
No0Vad 3d27561e5a Update en.js
3 years ago
jtagcat b80c88d9a0 i10n: update Estonian
3 years ago
Ponkhy 862672731f Minor typo fix
3 years ago
Ponkhy 7fee4a7ea7 Added import options
3 years ago
No0Vad f8f9f59464 Added support for a retry interval to monitors
3 years ago
LouisLam 934685637a [Status Page] WIP: Checkpoint
3 years ago
Ponkhy 8cd5bad44c
Merge branch 'master' into 2fa
3 years ago
Ponkhy d003abcd60
Update src/languages/en.js
3 years ago
Lars Sørensen 66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title.
3 years ago
LouisLam 3e25f0e9d9 [Status Page] WIP: Checkpoint
3 years ago
Lars Sørensen 39c7b5e748
Added new Strings to Danish translation
3 years ago
Lars Sørensen b709857e19
Better wording for Danish language
3 years ago
Nelson Chan 9e10f7d35f
Fix: Fix events table width on mobile
3 years ago
Adam Stachowicz c387fb264e Format JSON file before download
3 years ago
LouisLam 4b0a8087a2 do not connect to socket io for status page
3 years ago
LouisLam 2da77d8448 fix ipv6 connection problem
3 years ago
Paride Barison 951ece8a65 updated
3 years ago
Louis Lam 97df200d6c
Merge pull request #365 from Ponkhy/master
3 years ago
新逸Cary 2f0d994c83 update Simplified Chinese language(更新简体中文语言)
3 years ago
Ponkhy c3c576bd13 Added "Show URI" translation
3 years ago
Ponkhy c62732fa9c Minor translation fixes
3 years ago
Ponkhy d823493fad Added maxlengh to token verify input
3 years ago
Ponkhy 463c385cf1 Only show modal footer if uri was generated
3 years ago
Ponkhy 403202d4d4 Added simple TOTP Two Factor Authentication
3 years ago
LouisLam ca479673e7 avoid Chrome duplicate id warning
3 years ago
LouisLam 573c7faddd switch on the notification, if it is added in EditMonitor.vue
3 years ago
LouisLam 7a4432de1e better switch button color in dark mode
3 years ago
LouisLam 94a6c1a344 update language files
3 years ago
Paride Barison 44eba70b78 altri errorini sistemati
3 years ago
Paride Barison c6dab944d1 altra correzione
3 years ago
Ioma Taani 0f4bc5850b
Merge branch 'louislam:master' into italian-translation-update
3 years ago
Louis Lam 331ae5ec20
Merge pull request #306 from Ponkhy/import-export
3 years ago
Ioma Taani b54bbc302d migliorata la traduzione
3 years ago
LouisLam dd283423ab improve smtp with cc, bbc and ignore tls
3 years ago
LouisLam 5a0fcebd6e update link style
3 years ago
Louis Lam 325ce72a71
Merge pull request #352 from iomataani/italian-language
3 years ago
Adam Stachowicz f6a168282e Route to monitor on `DashboardHome`
3 years ago
Ponkhy acf6f1883b Fixed missing spaces in backup file
3 years ago
Paride Barison f44f951e40 Tradotte le ultime cose come richiesto
3 years ago
Ioma Taani dea9b05d49
Merge branch 'louislam:master' into italian-language
3 years ago
Louis Lam d761d54d0e
Merge pull request #340 from Ponkhy/default-notification
3 years ago
LouisLam e37621853e Merge branch 'estonian'
3 years ago
LouisLam f2cec60481 minor
3 years ago
LouisLam 2212cf9c08 fix confirmDisableAuth no msg if not tranlated
3 years ago
LouisLam f7562e00c1 improve notification component, no double template
3 years ago
Ponkhy 678e248966 Added indicator while changing database records
3 years ago
Ponkhy c1aebef005 Fixed SQL error due notification setup
3 years ago
Ponkhy 69a7c4dab4 Improved importBackup handling
3 years ago
jtagcat 2c3880a326 Added Estonian.
3 years ago
Ponkhy f4e885982d Added export/import description for de-DE
3 years ago
Ioma Taani dcf6dd8b32
Ultimi aggiustamenti
3 years ago
Ioma Taani 093cfec8dd
Typo.
3 years ago
Ioma Taani f13dcb3c5b
Update it-IT.js
3 years ago
LouisLam 1a5ffd4755 add description for export/import
3 years ago
Ioma Taani a2f9e9e9c4
Creata lingua italiana
3 years ago
LouisLam 62712f5cc4 Merge branch 'master' into import-export
3 years ago
LouisLam f0f1847ad8 update language files
3 years ago
LouisLam 0aeaf87f5b Merge branch 'master' into default-notification
3 years ago
LouisLam 5ca0dd628d remove debug msg
3 years ago
LouisLam 4a106431f3 convert Telegram into a vue components
3 years ago
LouisLam d164b6ccce prevent Chrome ask for saving password for notification settings (change to one-time-code to solve it)
3 years ago
Louis Lam 850563442a
Merge pull request #349 from Ponkhy/redirect-after-setup
3 years ago
Ponkhy 242e494cb5
Merge branch 'master' into import-export
3 years ago
Ponkhy 4faa409027
Merge branch 'master' into default-notification
3 years ago
LouisLam fe35d95441 merge language files
3 years ago
LouisLam da131a5156 Merge branch 'master' into clear-monitor-data
3 years ago
LouisLam 0e288ea92d disable chrome save password dialog for autocompelete = off only
3 years ago
LouisLam 8a4a87716f disable chrome save password dialog
3 years ago
Ponkhy d01fa9bcfc Auto login after setup
3 years ago
Ponkhy 848296b77a Changed input for sensitive data to HiddenInput
3 years ago
Ponkhy edfaacbb5f Added component HiddenInput.vue
3 years ago
Ponkhy bb8385d690 Merge branch 'default-notification' of https://github.com/Ponkhy/uptime-kuma into default-notification
3 years ago
Ponkhy b95404b6e0 Fixed suggestions
3 years ago
Louis Lam cc351b2883
Merge pull request #339 from Minvinea/master
3 years ago
Minvinea 31648dc5e8
Update #2
3 years ago
Minvinea 1197cfa11e
Update file name
3 years ago
Ponkhy fd8c95d64e
Merge branch 'master' into default-notification
3 years ago
Ponkhy 58240aceef Added the option for default notifications
3 years ago
Adam Stachowicz e8b814733d Fix typo
3 years ago
Minvinea dcc7799108
Update few words and name of file
3 years ago
Adam Stachowicz 424f20f8e1 Better `upsideDownModeDescription`
3 years ago
Adam Stachowicz d4ff5d8b32 [LANG] `pl` fixes
3 years ago
LouisLam 899b33b3a9 add language missing keys
3 years ago
Ponkhy 1b8b33c4c3 Added set language to the Setup.vue
3 years ago
Misly 9952463350 Add Polish Locale
3 years ago
LouisLam 5837c353b7 change the default theme to auto from light
3 years ago
LouisLam d5b32ffbb8 add language missing keys
3 years ago
LouisLam 61936ae5eb Merge remote-tracking branch 'Ponkhy/clear-monitor-data' into clear-monitor-data
3 years ago
LouisLam 299506ce45 reset the heartbeat list instead of reload the page after cleared events or heartbeats
3 years ago
LouisLam ca8d4ab61b Merge branch 'master' into clear-monitor-data
3 years ago
LouisLam ffbdf97478 improve heartbeat bar rendering in different dpi
3 years ago
LouisLam cc25787878 improve heartbeat bar rendering in different dpi
3 years ago
Levi f1a151b4a1
Update & Improve Swedish Translation
3 years ago
Levi d35b205fcc
Update & Improve Swedish Translation
3 years ago
Levi 2a34e41d8c
Improved Swedish translation
3 years ago
Ponkhy 0b9e410ea5 Added i18n key to en.js
3 years ago
Ponkhy 904ed326ca
Merge branch 'louislam:master' into clear-monitor-data
3 years ago
LouisLam 7fd12f5485 rename nl_NL.js to nl-NL.js
3 years ago
Ponkhy 8f9a973ede
Merge branch 'master' into import-export
3 years ago
Ponkhy b98ec0c3d4 Added i18n keys if necessary for some languages
3 years ago
Louis Lam 2082c3f68a
Merge pull request #313 from xoniq/lang-nl
3 years ago
Louis Lam ea9f434553
Merge pull request #328 from Ponkhy/german-language
3 years ago
dhfhfk 6d8aa20fc6
Add missing string for Korean
3 years ago
Ponkhy 5430da955a Small german language adjustments
3 years ago
J Posthuma e6e2b0ebf8
Update nl_NL.js
3 years ago
J Posthuma 445dc486be
Merge branch 'master' into lang-nl
3 years ago
Louis Lam d2151737c1
Update README.md
3 years ago
LouisLam ebf362754c Merge branch 'master' into clear-monitor-data
3 years ago
Louis Lam f84135ca67
Merge pull request #322 from chakflying/patch-6
3 years ago
LouisLam 80eca886ce Merge branch 'add-serbian-latin'
3 years ago
Louis Lam 274a9050c0
Merge pull request #321 from dusansimic/add-serbian-cyrillic
3 years ago
Louis Lam 1f4ad938b1
Merge pull request #323 from xinac721/master
3 years ago
新逸Cary 312aedf391 Update Chinese Translation(更新简体中文语言翻译)
3 years ago
Nelson Chan 18616ee590
Fix: Fix Notification "Test" btn styling
3 years ago
Dušan Simić 19a4d570ec Fix word capitalization
3 years ago
Dušan Simić 79fda8f442 Add Serbian Latin locale
3 years ago
Dušan Simić 53a14cf4f5 Add Serbian Cyrilic locale
3 years ago
cecile 2241d8817f change translation FR
3 years ago
Victor M. Vicente Cuevas 23f1a73fc8 Add language to src/main and update README
3 years ago
Victor M. Vicente Cuevas d2bf2a551d Add spanish language and update Readme
3 years ago
Ponkhy 7d70c4d8cd Code optimizations
3 years ago
新逸Cary 941788db49 Chinese Translation (from zh-CN.js)
3 years ago
Jelle Posthuma 99725aabe7 Add Dutch/Nederlands language (nl_NL)
3 years ago
Ponkhy 2dd392e609 Added uptime kuma version to backup file
3 years ago
新逸Cary a0f372e946 Chinese Translation (from zh-CN.js)
3 years ago
LouisLam 9116654a33 update language files and run eslint on these
3 years ago
Louis Lam a29b65e801
Merge pull request #308 from DX37/translation-ru
3 years ago
Adam Stachowicz 7a109689d9 Make `Resp. Time (ms)` and `N/A` i18n
3 years ago
DX37 a2cf7f394e
Add Russian translation
3 years ago
LouisLam eeb00a5511 fix data type
3 years ago
LouisLam 8e1e4b9204 override file-selector-button hover color
3 years ago
LouisLam 66f9ad5754 Merge branch 'master' into import-export
3 years ago
Louis Lam 268d2e2353
Merge branch 'master' into master
3 years ago
Louis Lam 7d2cf0ee57
Merge pull request #304 from LeviSnoot/master
3 years ago
오로라 2d408732db
Update main.js
3 years ago
dhfhfk 0cc5053f14
Update ko-KR.js
3 years ago
dhfhfk 1c4e5b79be
Create ko-KR.js
3 years ago
dhfhfk 4aae402b36
Update main.js
3 years ago
Ponkhy b604910bbb
Merge branch 'master' into clear-monitor-data
3 years ago
Ponkhy 2f6c5963c5 Added import and export function
3 years ago
Levi dce2ba8f9f
Update sv-SE.js
3 years ago
Levi ed5c75282c
Update main.js
3 years ago
Levi 00ac560bd6
Create sv-SE.js
3 years ago
Adam Stachowicz 3006d13aee
Update translation docs
3 years ago
LouisLam c7e6cb9f37 update language files
3 years ago
LouisLam 9b82bb248e Merge branch 'master' into kometchtech_patch-1
3 years ago
Louis Lam f24002838c
Merge branch 'master' into master
3 years ago
Louis Lam b4fd4f7d90
Merge pull request #301 from Lrss/master
3 years ago
kometchtech 3a3f1762ac
Update ja.js
3 years ago
Lars Sørensen 6376d4eb92
Translated to Danish
3 years ago
LouisLam e37cf9b1a7 add missing and add Japanese to the list
3 years ago
LouisLam 3b0191210b Merge branch 'master' into kometchtech_patch-1
3 years ago
LouisLam ad38e61c26 add language file preparation script
3 years ago
LouisLam 22095c09b1 add translation guide
3 years ago
kometchtech 25db162721
Create ja.js
3 years ago
Ponkhy 7b92166d18 Added clear all db statistics function
3 years ago
Ponkhy 1341d220ed
Merge branch 'louislam:master' into clear-monitor-data
3 years ago
LouisLam ec731d174d Merge branch 'MichelBaie_master'
3 years ago
LouisLam 8c5d1945be add fr to the list
3 years ago
Tristan bb799163e8
French Translation (from zh-HK.js)
3 years ago
LouisLam 96ff70faaa reduce shifting when click the monitor list item (still shift in some cases, but acceptable)
3 years ago
henrygd 2776f942ab fix monitor list jumping to top on route change
3 years ago
Ponkhy 14b9afb400 Added translation to Setup.vue
3 years ago
LouisLam 3ad736692f improve monitor list
3 years ago
Ponkhy 1952e34110 Added the possibility to clear monitor data
3 years ago
LouisLam e644a1e36f Merge branch 'master' into scroll-into-view
3 years ago
Ponkhy dd877cfc70 Added translation to pause monitor confirmation
3 years ago
Ponkhy 93edb8817d More uniform look
3 years ago
Ponkhy 303adbf9b1 Show latest dns result in Details.vue
3 years ago
LouisLam 59e9315647 show dns type and hostname in Details.vue
3 years ago
LouisLam 91e82bd12c set default value for dns resolve type and code refactor
3 years ago
LouisLam d4dd650bfe translate for zh-hk
3 years ago
henrygd 2901a38628 add position: sticky to monitor details
3 years ago
Ponkhy 6464207f4b Added German language for DNS Monitor
3 years ago
Louis Lam 7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
3 years ago
Tristan b46b214175
Traduction pour le language France (FR Translation)
3 years ago
Louis Lam d2f0a15076
Merge pull request #264 from antiseptikk/master
3 years ago
LouisLam 2d50d24276 more translation for zh-HK
3 years ago
Ponkhy 34ca5c5c15 Merge branch 'master' of https://github.com/louislam/uptime-kuma
3 years ago
Ponkhy 2b8c5e2e65 Added German Language
3 years ago
Thomas Ferney 44d9967cfb
feat: add rocket.chat notification
3 years ago
LouisLam 8318c2e8ff add a simple dns server for testing, and disable ipRegex for dev only (need to input port)
3 years ago
LouisLam 46ac753c46 Merge branch 'master' into dns-monitor
3 years ago
Louis Lam a7cd70f7de
Merge pull request #253 from chakflying/chart-fix
3 years ago
Louis Lam 26db0471da
Merge pull request #254 from RasHas/master
3 years ago
LouisLam 4c1f2f85f8 manual fix stylelint
3 years ago
Rashad 23851ef539 added mattermost notification support
3 years ago
Nelson Chan 2d20634738 Chore: Add comments, improve performance & styling
3 years ago
Nelson Chan 9442c3fa05 Fix: Fix chart bars to be full width
3 years ago
LouisLam 302d2665d2 run stylelint for the project
3 years ago
LouisLam ca69d06e0d update border color
3 years ago
LouisLam d8d428907e Merge branch 'master' into clean-mobile-table
3 years ago
Ponkhy a17c14ea1c Centered title, badge and datetime
3 years ago
LouisLam 28a51d806b translate to Traditional Chinese (Hong Kong)
3 years ago
LouisLam dd4c00eed3 add vue i18n
3 years ago
Louis Lam 054186370e
add source of ipRegex
3 years ago
Ponkhy 5dc834794c Row spacing reduced and badge centered
3 years ago
LouisLam 36ace3e56c naming convention and wrap all styles inside .table-shadow-box to avoid unexpected style in the future
3 years ago
LouisLam 3f12afce28 Merge branch 'master' into clean-mobile-table
3 years ago
Ponkhy b2041cb36b Fixed ESLint Errors
3 years ago
LouisLam a02edf1b4f fix detail page empty if the monitor list is not yet ready
3 years ago
Nelson Chan ee3bf2961c Fix: fix typescript errors
3 years ago
Ponkhy ce79f8bfc7 CSS optimizations
3 years ago
Ponkhy c79be19ec3 Added DNS Monitor Type
3 years ago