Skip to content

Commit

Permalink
Merge pull request #29 from antoor/v1.1-dev
Browse files Browse the repository at this point in the history
Fix some details
  • Loading branch information
antoor committed Mar 30, 2016
2 parents 1e1c7e6 + 0d3c8bb commit 9283b75
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
## 2016/03

### /30
1. 修正更新菜单栏判断条件(win禁止按钮

### /29
1. 完成在线更新功能(目前不支持windows以及开发版本

### /26
1. 文件管理双击:size < 100kb ? 编辑 : 下载
2. 调整 Custom 方式数据库部分代码 // 2-4:感谢[@Medicean](https://github.com/Medicean)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
**任何人不得将其用于非法用途以及盈利等目的,也禁止未经允许私自修改打包进行发布,否则后果自行承担并将追究其相关责任!**

[![node](https://img.shields.io/badge/node-v4.0+-green.svg?style=flat-square)](https://nodejs.org/en/download/)
[![release](https://img.shields.io/badge/release-v1.1.0-blue.svg?style=flat-square)](https://github.com/antoor/antSword/releases/tag/1.1.0)
[![release](https://img.shields.io/badge/release-v1.1.1-blue.svg?style=flat-square)](https://github.com/antoor/antSword/releases/tag/1.1.1)

## 设计思想
> 中国蚁剑采用了[Electron](http://electron.atom.io/)作为外壳,`ES6`作为前端代码编写语言,搭配`Babel`&&`Webpack`进行组件化构建编译,外加`iconv-lite`编码解码模块以及`superagent`数据发送处理模块还有`nedb`数据存储模块,组成了这个年轻而又充满活力的新一代大杀器。
Expand Down
2 changes: 1 addition & 1 deletion source/modules/settings/update.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Update {
id: 'check',
type: 'button',
// 调试或者windows平台不支持更新
disabled: antSword['package']['debug'] || process.platform === 'win',
disabled: antSword['package']['debug'] || process.platform === 'win32',
text: LANG['toolbar']['check'], icon: 'check-square-o'
}, { type: 'separator' }
]);
Expand Down

0 comments on commit 9283b75

Please sign in to comment.