 kuaifan
|
30c149be31
|
Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/189.js.LICENSE.txt
# public/js/build/206.js
# public/js/build/400.js.LICENSE.txt
# public/js/build/486.js
# public/js/build/496.js.LICENSE.txt
# public/js/build/528.js
# public/js/build/535.js
# public/js/build/535.js.LICENSE.txt
# public/js/build/578.js
# public/js/build/78.js.LICENSE.txt
# public/js/build/817.js
# public/js/build/856.js
# public/js/build/862.js
# public/js/build/889.js
# public/js/build/91.js.LICENSE.txt
# public/js/build/954.js
# public/js/build/956.js
# resources/assets/js/pages/manage/components/TaskDetail.vue
# resources/assets/js/pages/manage/dashboard.vue
# resources/assets/sass/pages/common.scss
# resources/assets/sass/pages/page-dashboard.scss
|
2022-03-10 11:27:00 +08:00 |
|
|
kuaifan
|
42d9271ea0
|
build
|
2022-03-09 21:26:05 +08:00 |
|
 韦荣超
|
00e666e423
|
build: 6b29b686c7
|
2022-03-09 18:05:47 +08:00 |
|
|
韦荣超
|
6fb1c474d2
|
build: f1c7c35e48
|
2022-03-09 12:07:04 +08:00 |
|
|
韦荣超
|
0c23fa7c9d
|
build: fe91765ab0
|
2022-03-09 09:53:34 +08:00 |
|
|
韦荣超
|
b610dc4969
|
build: bc6fa7fd27
|
2022-03-08 09:08:40 +08:00 |
|
|
kuaifan
|
92569f5b3a
|
no message
|
2022-03-08 00:37:17 +08:00 |
|
|
韦荣超
|
e5901f28e3
|
build: 2d3f0dd95a
|
2022-03-07 17:04:47 +08:00 |
|
|
韦荣超
|
2839e595cc
|
build: a9f28dfb47
|
2022-03-07 14:40:23 +08:00 |
|
|
韦荣超
|
c1bdd079cf
|
build: 467d05a358
|
2022-03-07 11:56:37 +08:00 |
|
|
韦荣超
|
05c8a6e664
|
build: 59b2ecebda
|
2022-03-07 11:51:21 +08:00 |
|
|
kuaifan
|
e754ceace8
|
build
|
2022-03-07 01:42:30 +08:00 |
|
|
kuaifan
|
8e0a684a9a
|
build
|
2022-03-04 19:45:10 +08:00 |
|
|
韦荣超
|
1e28be9671
|
build: 2975d550eb
|
2022-03-04 14:02:04 +08:00 |
|
|
韦荣超
|
8a0e813734
|
build: 2975d550eb
|
2022-03-04 14:01:55 +08:00 |
|
|
韦荣超
|
248a9c4070
|
perf: 补全系统设置中的未翻译地方
|
2022-03-04 10:25:06 +08:00 |
|
|
韦荣超
|
29da4d209d
|
build: 35a369a953
|
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: a76da167eb
|
2022-03-03 10:49:23 +08:00 |
|
|
韦荣超
|
1547b3f53b
|
build: 68f5b30f7d
|
2022-03-02 18:13:29 +08:00 |
|
|
韦荣超
|
d9b9c0f42c
|
build: aa0597c27e
|
2022-03-02 15:46:23 +08:00 |
|
|
韦荣超
|
6ba4170f08
|
build: 827bc97e8e
|
2022-03-02 15:21:36 +08:00 |
|
|
kuaifan
|
7107409b1b
|
no message
|
2022-03-02 08:46:29 +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: 20cf83907d
|
2022-03-01 15:54:39 +08:00 |
|
|
韦荣超
|
bc05781edd
|
build: ce9d91e990
|
2022-03-01 15:08:02 +08:00 |
|
|
韦荣超
|
973d13b705
|
build: 51e4427108
|
2022-03-01 14:21:47 +08:00 |
|
|
韦荣超
|
d09ab541ab
|
build: a9e1dc3cd5
|
2022-03-01 11:04:20 +08:00 |
|
|
韦荣超
|
1551e6c640
|
build: 03a1bdfc7f
|
2022-03-01 09:39:12 +08:00 |
|
|
韦荣超
|
03a1bdfc7f
|
perf: 置顶样式优化
|
2022-03-01 09:37:25 +08:00 |
|
|
韦荣超
|
24545aa9cb
|
build: cf7e7c1a06
|
2022-02-28 18:17:10 +08:00 |
|
|
韦荣超
|
c11426419c
|
build: cf7e7c1a06
|
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: 011fc8cc9e
|
2022-02-25 15:58:28 +08:00 |
|
|
韦荣超
|
7428022b2f
|
build: 3815eb1983
|
2022-02-25 15:41:32 +08:00 |
|
|
韦荣超
|
3778f10edb
|
perf: 添加首页文字翻译
|
2022-02-25 15:31:26 +08:00 |
|
|
韦荣超
|
00a4b867ea
|
build: 3a1024e848
|
2022-02-25 15:18:58 +08:00 |
|
|
kuaifan
|
ea8e1e9c57
|
优化样式
|
2022-02-25 15:14:20 +08:00 |
|
|
韦荣超
|
b0998d5f95
|
build: a074cb9664
|
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 |
|
|
韦荣超
|
1117b57101
|
Merge remote-tracking branch 'origin/dev' into develop
# Conflicts:
# app/Http/Controllers/Api/SystemController.php
# public/js/language.all.js
# resources/assets/js/pages/login.vue
# resources/assets/js/pages/manage.vue
# resources/assets/js/pages/manage/calendar.vue
# resources/assets/js/pages/manage/components/Calendar.vue
# resources/assets/js/pages/manage/setting/system/setting.vue
# resources/assets/js/store/state.js
# resources/assets/statics/public/js/language.all.js
|
2022-02-24 17:18:33 +08:00 |
|