From c708ab86f4ded9ca5d31396c3943818a6dca548b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Thu, 10 Mar 2022 09:57:28 +0800 Subject: [PATCH 1/8] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 321df45..57cf4ca 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ support macos (Intel, Apple Silicon) platform, will support ipad os in the futu - [x] ssh login - [ ] delete batch - [ ] ipad os support +- [ ] ssh key +- [ ] favorite delete confirm ## Version @@ -45,7 +47,6 @@ support macos (Intel, Apple Silicon) platform, will support ipad os in the futu * swift-log swift log framework, need puppy implementation * Puppy log framework, support console, file * SwiftyJSON json convert -* PromiseKit async framework， simplify the callback code From 98ee561827a70f47f18c9d5457f3763f107c2db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Thu, 10 Mar 2022 09:58:29 +0800 Subject: [PATCH 2/8] Update README.zh_CN.md --- README.zh_CN.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.zh_CN.md b/README.zh_CN.md index 662218a..037ce98 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -35,6 +35,9 @@ - [x] ssh login - [ ] delete batch - [ ] ipad os support +- [ ] ssh key support +- [ ] favorite delete confirm + ## 版本要求 @@ -46,7 +49,6 @@ * swift-log swift 日志框架, 是上层框架， 需要具体的实现 * Puppy 日志实现, 滚动写入到日志文件 * SwiftyJSON json 转换 -* PromiseKit 异步化操作使用， 简化callback代码 From 87ff09d2f88e4b716d82328d379bee0b1b2ee816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Fri, 25 Mar 2022 18:19:35 +0800 Subject: [PATCH 3/8] Delete LICENSE --- LICENSE | 201 -------------------------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From 8cae291a4c4340f4fbf466dc4708765d325a7678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Fri, 25 Mar 2022 18:19:58 +0800 Subject: [PATCH 4/8] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 57cf4ca..de76463 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ English | [简体中文](./README.zh_CN.md) ![Swift5.0+](https://img.shields.io/badge/Swift-5.0%2B-orange.svg?style=flat) [![release](https://img.shields.io/github/v/release/cmushroom/redis-pro?include_prereleases)](https://github.com/cmushroom/redis-pro/releases) -[![license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/cmushroom/redis-pro/blob/main/LICENSE) ![platforms](https://img.shields.io/badge/Platforms-macOS%20-orange.svg?style=flat) [![Gitter](https://badges.gitter.im/redis-pro/community.svg)](https://gitter.im/redis-pro/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) From b2f3531d3ac7c59353d21cda71047d6a1ab3f78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Fri, 25 Mar 2022 18:20:26 +0800 Subject: [PATCH 5/8] Update README.zh_CN.md --- README.zh_CN.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.zh_CN.md b/README.zh_CN.md index 037ce98..9924e71 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -5,7 +5,6 @@ ![Swift5.0+](https://img.shields.io/badge/Swift-5.0%2B-orange.svg?style=flat) [![release](https://img.shields.io/github/v/release/cmushroom/redis-pro?include_prereleases)](https://github.com/cmushroom/redis-pro/releases) -[![license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/cmushroom/redis-pro/blob/main/LICENSE) ![platforms](https://img.shields.io/badge/Platforms-macOS%20-orange.svg?style=flat) [![Gitter](https://badges.gitter.im/redis-pro/community.svg)](https://gitter.im/redis-pro/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) From 14cbda4b53fce2cde0ad6a9be45baa1fdcbc2361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Sun, 27 Mar 2022 21:15:47 +0800 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de76463..7bca6e3 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ support macos (Intel, Apple Silicon) platform, will support ipad os in the futu - [x] slow log - [x] redis config update - [x] ssh login +- [x] favorite delete confirm - [ ] delete batch - [ ] ipad os support - [ ] ssh key -- [ ] favorite delete confirm ## Version From 3f9cdc3b576f28c70fda0b993a3931eb4d7b34af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Sun, 27 Mar 2022 21:16:35 +0800 Subject: [PATCH 7/8] Update README.zh_CN.md --- README.zh_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh_CN.md b/README.zh_CN.md index 9924e71..ce95b93 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -32,10 +32,10 @@ - [x] slow log - [x] redis config update - [x] ssh login +- [x] favorite delete confirm - [ ] delete batch - [ ] ipad os support - [ ] ssh key support -- [ ] favorite delete confirm From fccf1359275e1cac6c3e2332946d48ecabb6eb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=BA=E6=97=BA?= Date: Sun, 27 Mar 2022 21:18:55 +0800 Subject: [PATCH 8/8] Update .version --- .version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index c04bd1d..f573bd6 100644 --- a/.version +++ b/.version @@ -1,6 +1,6 @@ { - "latestVersionNum": 11, - "latestVersion": "1.4.4", + "latestVersionNum": 12, + "latestVersion": "1.4.5", "updateType": "hint", - "releaseNotes": "1. 修复key过期时间没有刷新问题 \n2. 添加关于页面" + "releaseNotes": "1. 删除favorite 列表时增加删除确认 #35 \n2. ssh连接 不支持 redis 没有密码的bug修复 #34 \n3. 左侧列表刷新，没有清空选中项，导致无法刷新 value 的 bug #33 \n4. key 重命名弹框样式问题修复 \n5. key删除增加 delete 快捷键 \n6. 过期时间超过Int64导致闪退bug" }