kuaifan
|
f4f351cf9d
|
Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
# public/css/app.css
# public/js/app.js
# public/js/build/208.js
# public/js/build/389.js
# public/js/build/406.js
# public/js/build/406.js.LICENSE.txt
# public/js/build/423.js
# public/js/build/459.js
# public/js/build/459.js.LICENSE.txt
# public/js/build/688.js
# public/js/build/688.js.LICENSE.txt
# public/js/build/726.js
# public/js/build/755.js
# public/js/build/93.js
# public/js/build/954.js
|
2022-02-19 09:30:13 +08:00 |
|
韦荣超
|
09b1d89718
|
build: ccb889233c31d2d180cba378faa009052c24db70
|
2022-02-18 19:20:42 +08:00 |
|
韦荣超
|
9d1a9f3134
|
build: ccb889233c31d2d180cba378faa009052c24db70
|
2022-02-18 19:20:35 +08:00 |
|
韦荣超
|
939f2cbf97
|
build: 4bd8835f239ca49a7b2cd11bd3dd4128611b14f5
|
2022-02-18 18:50:38 +08:00 |
|
韦荣超
|
580e0cb36a
|
build: 4bd8835f239ca49a7b2cd11bd3dd4128611b14f5
|
2022-02-18 18:50:29 +08:00 |
|
韦荣超
|
22f32da0c5
|
build: aa8a094383bb60ea8313b4f50f80b48df15cff3e
|
2022-02-18 18:42:49 +08:00 |
|
韦荣超
|
4a72b7f089
|
build: a33e4905cf890fe713a368c9dee97e90c727150d
|
2022-02-18 17:03:18 +08:00 |
|
韦荣超
|
40bd2f0742
|
build: 1fd73fe79e315e3fccd9f35a8ecf668c396d707a
|
2022-02-18 16:45:55 +08:00 |
|
韦荣超
|
fd7d3e06f4
|
build: 7a4d27da69e9afaad5dc4b11441a3e8726e785a2
|
2022-02-18 16:17:41 +08:00 |
|
韦荣超
|
afbadf7d81
|
build: 4f2c0e94d94e91ab58238cca0d2df0bf978f5d0d
|
2022-02-18 14:02:22 +08:00 |
|
韦荣超
|
7b65c64431
|
build: 4f2c0e94d94e91ab58238cca0d2df0bf978f5d0d
|
2022-02-18 14:02:00 +08:00 |
|
韦荣超
|
7593d7a3e9
|
build: 3400d1e8033d7da2067e1c9a9b6a8fc3a25cd7cf
|
2022-02-18 11:54:29 +08:00 |
|
韦荣超
|
4171d993d0
|
Merge remote-tracking branch 'origin/chao-flow' into develop
# Conflicts:
# public/js/app.js
|
2022-02-18 11:25:49 +08:00 |
|
韦荣超
|
d22310ea31
|
build: 1521d1e8831a60f5f737a9480d2e8726ac98c4a5
|
2022-02-18 11:23:38 +08:00 |
|
韦荣超
|
0412615f6e
|
build: 2bd666efe7b4f2dc2bd250bcaf0b9abbf23b2584
|
2022-02-18 10:11:48 +08:00 |
|
kuaifan
|
541e1f760b
|
build
|
2022-02-17 20:39:47 +08:00 |
|
韦荣超
|
503a719609
|
build: 2dcbba63cbf2f77a326dd4ab51acba1ad090ddcb
|
2022-02-17 15:22:31 +08:00 |
|
韦荣超
|
5e86bdfda7
|
build: 4f74a0440c4a3a8b214ff6b7c058dcb50ac0a99a
|
2022-02-17 14:43:21 +08:00 |
|
韦荣超
|
858709f610
|
build: 6689d48fadfc1f1c5ddfe0ecaa05f1d75b70161e
|
2022-02-17 10:44:23 +08:00 |
|
韦荣超
|
8581a7c308
|
build: 9878efb198c5efe93eaa290c588e6e033029c8c3
|
2022-02-17 09:37:08 +08:00 |
|
韦荣超
|
9855c50367
|
build: 04c59041e0a135e835530baad95e2402d7b02a37
|
2022-02-17 09:19:35 +08:00 |
|
kuaifan
|
7fb1ecc9b0
|
build
|
2022-02-15 15:44:43 +08:00 |
|
韦荣超
|
cb11a71ff5
|
build: 重新编译
|
2022-02-15 09:11:14 +08:00 |
|
韦荣超
|
54dd90fc4a
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# public/js/app.js
# public/js/build/423.js
# public/js/build/726.js
# public/js/build/93.js
|
2022-02-15 09:05:20 +08:00 |
|
韦荣超
|
5115a048a3
|
Merge remote-tracking branch 'origin/chao-flow' into develop
# Conflicts:
# public/css/app.css
# public/js/app.js
# public/js/build/423.js
# public/js/build/93.js
|
2022-02-14 18:17:09 +08:00 |
|
韦荣超
|
84116e531b
|
build: 2c1b944b7ced9b1401be1d263b38c8c546bb33cf
|
2022-02-14 13:42:45 +08:00 |
|
kuaifan
|
0e66ca148d
|
build
|
2022-02-13 14:10:06 +08:00 |
|
kuaifan
|
ce70c1ca3a
|
perf: 单条消息最长2000个字符，超过自动分割发送，总最长20000
|
2022-02-12 17:01:12 +08:00 |
|
韦荣超
|
56b91a59a2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-02-12 16:02:04 +08:00 |
|
kuaifan
|
8f1fbcb19e
|
no message
|
2022-02-12 15:10:30 +08:00 |
|
韦荣超
|
230d1a1f86
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/FileController.php
# public/js/build/208.js
# public/js/build/252.js
# public/js/build/400.js
# public/js/build/76.js
|
2022-02-11 11:01:05 +08:00 |
|
kuaifan
|
f7921bf388
|
build
|
2022-02-10 21:18:18 +08:00 |
|
kuaifan
|
17e5d15b1b
|
build
|
2022-02-09 21:50:12 +08:00 |
|
kuaifan
|
b28be29dc8
|
build
|
2022-02-09 17:29:36 +08:00 |
|
韦荣超
|
3d6df3cc09
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# app/Models/Project.php
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/146.js
# public/js/build/188.js
# public/js/build/188.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/278.js
# public/js/build/278.js.LICENSE.txt
# public/js/build/30.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/525.js
# public/js/build/644.js.LICENSE.txt
# public/js/build/660.js
# public/js/build/766.js
# public/js/build/831.js
# public/js/build/893.js
# public/js/build/919.js
# public/js/build/919.js.LICENSE.txt
# public/js/build/934.js
# public/js/build/934.js.LICENSE.txt
# resources/assets/js/pages/manage/components/DialogList.vue
# resources/assets/js/pages/manage/components/DialogWrapper.vue
# resources/assets/js/pages/manage/components/TaskAdd.vue
# resources/assets/sass/components/report.scss
|
2022-02-07 10:50:38 +08:00 |
|
kuaifan
|
32817a4275
|
build
|
2022-01-29 16:04:28 +08:00 |
|
kuaifan
|
3d04bd4444
|
build
|
2022-01-28 18:29:15 +08:00 |
|
kuaifan
|
35bd038802
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# electron/package.json
# package.json
# public/css/app.css
# public/docs/assets/main.bundle.js
# public/js/app.js
# public/js/build/146.js.LICENSE.txt
# public/js/build/161.js
# public/js/build/199.js
# public/js/build/199.js.LICENSE.txt
# public/js/build/218.js
# public/js/build/218.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/309.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/693.js
# public/js/build/717.js
# public/js/build/717.js.LICENSE.txt
# public/js/build/79.js.LICENSE.txt
# resources/assets/js/pages/manage/components/TaskAdd.vue
|
2022-01-28 14:39:43 +08:00 |
|
kuaifan
|
3c7619098a
|
build
|
2022-01-28 01:20:36 +08:00 |
|
Mr.Huan
|
09fa33236f
|
build: 4e9abd65120687e4bb6c84a037596c4c725f96fc
|
2022-01-27 16:33:25 +08:00 |
|
Mr.Huan
|
2996c0b38e
|
build: 36e366abe0f3af6b2693708a5f012b2ef7fcc57a
|
2022-01-27 15:58:26 +08:00 |
|
Mr.Huan
|
f9c6c6c127
|
build: 34772ef2bf11535c588e594ac976cd0706fc3e91
|
2022-01-27 14:35:17 +08:00 |
|
kuaifan
|
33f3c9acbf
|
build
|
2022-01-27 12:25:10 +08:00 |
|
Mr.Huan
|
d0438390cc
|
build: d22266a94725640f85bceb9978c13449dfa5c35c
|
2022-01-26 17:27:42 +08:00 |
|
Mr.Huan
|
675955b2e6
|
build: 4516bce0eecf7f6224fde7cbd0c1de74be3f05af
|
2022-01-26 17:14:58 +08:00 |
|
Mr.Huan
|
4853fbcec3
|
build: 72e5f9a83ed00e9514c3d6e9991d7ddf3193659c
|
2022-01-26 15:04:03 +08:00 |
|
Mr.Huan
|
1a1ddc34a2
|
build: 40ebfb676c044b8f02d3d43105de34b2762fab9c
|
2022-01-26 14:46:37 +08:00 |
|
kuaifan
|
f596749645
|
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/120.js
# public/js/build/120.js.LICENSE.txt
# public/js/build/146.js.LICENSE.txt
# public/js/build/161.js
# public/js/build/284.js
# public/js/build/309.js
# public/js/build/400.js
# public/js/build/644.js
# public/js/build/644.js.LICENSE.txt
# public/js/build/79.js.LICENSE.txt
# resources/assets/js/pages/manage/components/TaskAdd.vue
|
2022-01-26 09:35:16 +08:00 |
|
kuaifan
|
482813ea88
|
build
|
2022-01-26 01:33:53 +08:00 |
|
Mr.Huan
|
b5e3cc2503
|
build: 2e11fe2b5852ddaa7e14bf32f4e4e246ce539084
|
2022-01-25 16:51:32 +08:00 |
|