Commit Graph

667 Commits

Author SHA1 Message Date
gaoshuaixing
90841af930 tray 2021-02-23 16:04:25 +08:00
gaoshuaixing
9abd44b87a 1 2021-02-20 17:24:18 +08:00
gaoshuaixing
7546632cda fix utils 2021-02-08 14:12:50 +08:00
gaoshuaixing
42a7009611 1 2021-02-04 11:26:37 +08:00
gaoshuaixing
f9e54048f2 fix load updater 1.7.1 2021-02-03 18:58:47 +08:00
gaoshuaixing
e29c4976e2 1 2021-02-03 16:30:56 +08:00
gaoshuaixing
853015660f 1.7.0 1.7.0 2021-02-03 15:45:20 +08:00
gaoshuaixing
d91a9d58ca 1.7.0 2021-02-03 15:45:12 +08:00
gaoshuaixing
61ebd381c4 前端代码优化 2021-02-03 14:53:42 +08:00
wallace5303
7647d11a1a 1.7.0 2021-02-03 14:21:25 +08:00
wallace5303
94c0be126f 优化存储代码和修改日志 2021-02-03 12:26:17 +08:00
gaoshuaixing
61c95b1ce5 1 2021-02-03 10:37:35 +08:00
gaoshuaixing
1f38a48cb9 1 2021-01-21 17:39:14 +08:00
gaoshuaixing
f4f67314fe 1 2021-01-14 18:36:12 +08:00
gaoshuaixing
0d856876c0 1 2021-01-14 18:30:49 +08:00
gaoshuaixing
15a102827f v 1.6.0 2021-01-13 10:25:58 +08:00
gaoshuaixing
1b7fcffcd6 example data operation 2021-01-08 14:35:31 +08:00
Wallace Gao
3354abe943 Merge pull request #7 from zhangzhiwei1228/master
fix
2021-01-08 11:54:30 +08:00
zw
d3775e4ec2 fix 2021-01-08 11:51:52 +08:00
Wallace Gao
837c27027f Merge pull request #6 from zhouqunan/master
get ws addr
2021-01-07 18:40:38 +08:00
zqn
6798e7b093 get ws addr 2021-01-07 18:37:22 +08:00
gaoshuaixing
da3e6aabe2 Merge branch 'mini'
# Conflicts:
#	electron/api.js
#	package.json
2021-01-07 17:46:23 +08:00
Wallace Gao
a48bd4a51c Merge pull request #5 from kevinaskin/master
io
2021-01-07 17:43:29 +08:00
kevinaskin
e25b3a7493 update 2021-01-07 17:31:12 +08:00
gaoshuaixing
d1e99f94c1 fix storage 1.5.1 2021-01-07 17:01:28 +08:00
gaoshuaixing
4b7ce90834 storage 2021-01-07 16:45:37 +08:00
gaoshuaixing
010a63b5d1 socket io 2021-01-07 14:15:54 +08:00
gaoshuaixing
958ade50b2 doc 2021-01-05 10:10:35 +08:00
Wallace Gao
4ccc79a053 Merge pull request #4 from 791533790/james
modified by james 20210104
2021-01-04 18:45:03 +08:00
james
cf35a3de26 modified by james 20210104 2021-01-04 18:41:15 +08:00
gaoshuaixing
f2407daf05 1.5.0 doc 1.5.0 2021-01-04 16:22:17 +08:00
gaoshuaixing
656d81a83c 1.5.0 2021-01-04 16:05:14 +08:00
gaoshuaixing
261462e4c0 Merge branch 'master' into autolaunch 2021-01-04 15:53:43 +08:00
gaoshuaixing
441b566845 dev mode 2021-01-04 15:23:49 +08:00
gaoshuaixing
95e2380eeb autolaunch front 2020-12-31 16:44:06 +08:00
gaoshuaixing
34c7ea7339 logo 2020-12-30 16:39:31 +08:00
gaoshuaixing
c8c0180b89 auto launch 2020-12-30 16:30:13 +08:00
gaoshuaixing
aaa2bdb391 front upload demo 2020-12-30 11:45:59 +08:00
gaoshuaixing
be06d62916 1 2020-12-30 11:39:20 +08:00
gaoshuaixing
7a6e1325bb Merge branch 'pic'
# Conflicts:
#	app/service/storage.js
2020-12-30 11:32:50 +08:00
gaoshuaixing
789a4b764d Merge branch 'master' of github.com:wallace5303/electron-egg
# Conflicts:
#	app/controller/v1/example.js
#	app/router/example.js
#	app/service/example.js
#	frontend/src/api/main.js
#	frontend/src/config/router.config.js
#	frontend/src/views/Layout.vue
#	frontend/src/views/file/OpenDir.vue
#	frontend/src/views/file/UploadFile.vue
2020-12-30 11:31:40 +08:00
gaoshuaixing
51a8669868 1 2020-12-30 11:29:16 +08:00
Wallace Gao
8c8e0f3322 Merge pull request #2 from wuwu123/master
front
2020-12-30 11:22:38 +08:00
武杰
f2fa680b4f front 2020-12-30 11:16:37 +08:00
gaoshuaixing
2061d60fd9 storage dir 2020-12-30 10:43:07 +08:00
gaoshuaixing
16e073775f file config 2020-12-30 10:42:15 +08:00
gaoshuaixing
15a92fbb7b pic 2020-12-30 10:31:21 +08:00
gaoshuaixing
331a552f73 upload pic 2020-12-29 20:19:20 +08:00
gaoshuaixing
903c53e68d file upload 2020-12-29 17:30:09 +08:00
gaoshuaixing
cea0a0a541 doc 1.4.0 2020-12-25 14:24:32 +08:00