186 Commits

Author SHA1 Message Date
韦荣超
807f885f92 build: 15ecd8d592b4abf7d85a10ac98bbdee59e4a1a17 2022-03-11 19:06:27 +08:00
韦荣超
4304158088 build: c1fb67f143491969aaced86065d452d69cd19568 2022-03-11 17:48:32 +08:00
mmppkka
7d0e6ac50b build:c6ea52482133f98312f6e82bbc624088e3096e03 2022-03-11 17:36:33 +08:00
韦荣超
7c82769448 build: a4b69c3911335cb554919072023f9307e0dc15c8 2022-03-11 12:08:12 +08:00
韦荣超
e301abe9e3 build: d38ccba6187332aa63d5f2a9e901aa4320edd1b7 2022-03-11 10:00:49 +08:00
韦荣超
849ac56296 build: 67bb821a0e371a37d11bd83b608de72856217448 2022-03-10 18:59:48 +08:00
kuaifan
43c51d48d9 合并优化 2022-03-10 17:45:17 +08:00
韦荣超
00e666e423 build: 6b29b686c73cb3106a614fa1deeb2a2387d4a0b2 2022-03-09 18:05:47 +08:00
韦荣超
6fb1c474d2 build: f1c7c35e48a6bd582683e08e5364a7daca707190 2022-03-09 12:07:04 +08:00
韦荣超
0c23fa7c9d build: fe91765ab02057e7100dc7fa756a71c2f8368bbd 2022-03-09 09:53:34 +08:00
韦荣超
b610dc4969 build: bc6fa7fd27d0cd5eb3e123fc6e80bde4a58caf01 2022-03-08 09:08:40 +08:00
韦荣超
e5901f28e3 build: 2d3f0dd95a9dce0550ecd9ab10eafaa46ad9a2d4 2022-03-07 17:04:47 +08:00
韦荣超
2839e595cc build: a9f28dfb47760f0217140dc4207103e4e847d1ba 2022-03-07 14:40:23 +08:00
韦荣超
c1bdd079cf build: 467d05a35885d5caf3ebbf6a50dd9ac149186ee4 2022-03-07 11:56:37 +08:00
韦荣超
05c8a6e664 build: 59b2ecebda8b4cc7b1606aca1c5afd6d282a9063 2022-03-07 11:51:21 +08:00
韦荣超
8a0e813734 build: 2975d550eb786a1d9e10bbb2ce1ba2b92cd5d905 2022-03-04 14:01:55 +08:00
韦荣超
29da4d209d build: 35a369a953e553630e88f01041b722251a27d401 2022-03-04 09:43:41 +08:00
kuaifan
4785cae8f0 Merge branch 'master' into develop
# Conflicts:
#	electron/package.json
#	package.json
#	public/js/app.js
#	public/js/build/221.js
#	public/js/build/501.js
#	public/js/build/747.js
#	public/js/build/862.js
#	public/js/build/984.js
2022-03-04 08:59:28 +08:00
kuaifan
9eaa575d1a build 2022-03-04 08:53:42 +08:00
kuaifan
0a9f9eea90 build 2022-03-04 00:00:26 +08:00
kuaifan
60086ead7c Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
#	electron/package.json
#	package.json
#	public/css/app.css
#	public/js/app.js
#	public/js/build/153.js
#	public/js/build/189.js
#	public/js/build/189.js.LICENSE.txt
#	public/js/build/206.js
#	public/js/build/486.js
#	public/js/build/501.js
#	public/js/build/528.js
#	public/js/build/544.js
#	public/js/build/601.js
#	public/js/build/747.js
#	public/js/build/756.js.LICENSE.txt
#	public/js/build/762.js
#	public/js/build/836.js
#	public/js/build/889.js
#	public/js/build/954.js
#	public/js/build/956.js.LICENSE.txt
2022-03-03 16:32:39 +08:00
kuaifan
3bbcbca926 build 2022-03-03 16:21:08 +08:00
韦荣超
df129f0d20 build: a76da167ebab9f504e690e6f5d332ba799bbc62b 2022-03-03 10:49:23 +08:00
韦荣超
1547b3f53b build: 68f5b30f7d62ed51a518360a8f4370240f36781d 2022-03-02 18:13:29 +08:00
韦荣超
6ba4170f08 build: 827bc97e8e18d7ce9ef796e893a371a936660d5f 2022-03-02 15:21:36 +08:00
kuaifan
6c086fab6f no message 2022-03-02 08:32:38 +08:00
kuaifan
54d215b8d1 Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask 2022-03-02 08:30:33 +08:00
韦荣超
420245c630 build: 20cf83907ddde666cb2cbdc29c9b7fe994a5216e 2022-03-01 15:54:39 +08:00
韦荣超
bc05781edd build: ce9d91e990004000c37a488af38e3edc0352c368 2022-03-01 15:08:02 +08:00
韦荣超
973d13b705 build: 51e4427108efe858388ba7e456e580680c9f9cb2 2022-03-01 14:21:47 +08:00
韦荣超
d09ab541ab build: a9e1dc3cd5429393e395b6f7c5c94ae8174e7d00 2022-03-01 11:04:20 +08:00
韦荣超
1551e6c640 build: 03a1bdfc7ffbb389c0f1034fb13dfa90d7e0c8d8 2022-03-01 09:39:12 +08:00
韦荣超
c11426419c build: cf7e7c1a0604ed11b613397c24cf2a1f7d5c8c46 2022-02-28 18:17:01 +08:00
kuaifan
ab388f1ef5 Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/js/build/248.js
#	public/js/build/248.js.LICENSE.txt
#	public/js/build/501.js
#	public/js/build/510.js.LICENSE.txt
#	public/js/build/581.js.LICENSE.txt
#	public/js/build/601.js
#	public/js/build/712.js
#	public/js/build/747.js
#	resources/assets/js/pages/manage/file.vue
#	resources/assets/sass/pages/page-manage.scss
2022-02-28 10:26:12 +08:00
kuaifan
101d5c7eb0 build 2022-02-28 00:23:20 +08:00
kuaifan
31d1b0c994 nomsg 2022-02-27 15:03:39 +08:00
kuaifan
356d40e640 feat: 文件支持拖动到列表上传 2022-02-25 22:49:56 +08:00
韦荣超
ff59f31e84 build: 011fc8cc9e7e81e345c7ad83ffee69aff5322834 2022-02-25 15:58:28 +08:00
韦荣超
7428022b2f build: 3815eb19833890d1d3c5b7cf9c74b436b07471c4 2022-02-25 15:41:32 +08:00
韦荣超
00a4b867ea build: 3a1024e848d07ff0c56cf8f5db74111fa8a6fc05 2022-02-25 15:18:58 +08:00
kuaifan
ea8e1e9c57 优化样式 2022-02-25 15:14:20 +08:00
韦荣超
b0998d5f95 build: a074cb9664cfccac4df536375f91c43ce6fc88b0 2022-02-25 10:56:20 +08:00
kuaifan
b5ccba552f build 2022-02-25 09:12:28 +08:00
kuaifan
14006068c8 优化样式 2022-02-25 00:13:15 +08:00
韦荣超
e0c0cc8613 build: fbeb3dd81e58f16775e67c44f934a3d675ec1c60 2022-02-24 11:50:34 +08:00
kuaifan
9d89af37be build 2022-02-24 09:04:03 +08:00
kuaifan
fc89d96635 优化drawio不显示添加模板 2022-02-24 00:45:53 +08:00
kuaifan
c115e2f985 build 2022-02-23 22:57:33 +08:00
kuaifan
953e924aa2 build 2022-02-23 00:26:44 +08:00
kuaifan
b0b39429ed build 2022-02-22 12:46:38 +08:00