Commit Graph

425 Commits

Author SHA1 Message Date
Yagami
fe95537914 * Fix bug #3780. 2021-01-15 16:22:27 +08:00
tianshujie98
e647640432 * Change color. 2021-01-15 15:33:49 +08:00
holan20180123
4428e6443c * Finish task #9002. 2021-01-15 10:13:27 +08:00
holan20180123
b2e53cf935 * Finish task #8986,#9002. 2021-01-15 09:49:16 +08:00
tianshujie98
01e1008f29 * Finish task #9001. 2021-01-15 09:45:19 +08:00
holan20180123
88043e53b3 * Finish task #9002. 2021-01-14 17:25:18 +08:00
holan20180123
2c95668f2e * Finish task #9002. 2021-01-14 15:46:23 +08:00
holan20180123
3356b3c088 * Finish task #9002. 2021-01-13 15:49:30 +08:00
holan20180123
c9f0612924 * Finish task #9002. 2021-01-13 15:04:11 +08:00
Yagami
b6b15b7a9d * Fix bug #3780. 2020-12-30 13:31:04 +08:00
tianshujie98
c969d44561 * Fix the bug sorting of tasks on my module. 2020-12-29 14:10:36 +08:00
holan20180123
cf23b03eb5 * Finish task #8744. 2020-12-28 14:29:09 +08:00
wangyidong
16c921432d * finish task #8682. 2020-12-16 17:41:35 +08:00
tianshujie98
c6ce008774 * Finish task #8683. 2020-12-16 15:23:51 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
wangyidong
bf6dcd8481 * adjust for check one click package. 2020-12-09 17:44:43 +08:00
wangyidong
ff9a3932cc * adjust for check one click package. 2020-12-09 10:53:04 +08:00
wangyidong
b5ad4665b4 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 09:26:47 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
tianshujie98
99359da6fd * Fix bug. 2020-12-08 08:29:08 +08:00
tianshujie98
bfce366ef1 * Fix bug. 2020-12-08 08:24:20 +08:00
tianshujie98
5be348e08e * Fix bug #3730. 2020-12-07 15:34:59 +08:00
tianshujie98
2b26da8044 * Fix bug #3730. 2020-12-07 15:20:24 +08:00
wangyidong
0352480278 * fix bug. 2020-12-01 13:31:01 +08:00
wangyidong
a1ae7b15bf * fix bug. 2020-12-01 13:24:04 +08:00
wangyidong
e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
z
f19b03ede0 * fix for check one clicke package. 2020-11-30 15:22:33 +08:00
z
ca26bfbfec * fix bug and upgrade. 2020-11-29 17:21:01 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
qiyu-xie
3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
qiyu-xie
1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
Catouse
eb01165a2e * storage template html as templateHtml property of keditor instance. 2020-10-12 20:10:01 +08:00
Catouse
2c6d7d153b * storage template html as templateHtml property of keditor instance. 2020-10-12 20:08:20 +08:00
tianshujie98
677fa52863 * Revert submission. 2020-10-09 08:31:30 +08:00
tianshujie98
48c178e9a6 * Revert submission. 2020-10-09 08:27:33 +08:00
tianshujie98
77739b6d92 * Adjust code style. 2020-09-25 16:57:59 +08:00
tianshujie98
dd3c2677b6 * Adjust code style. 2020-09-25 16:51:31 +08:00
tianshujie98
31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
tianshujie98
ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +08:00
tianshujie98
5657235d84 * Fix bug 3464. 2020-09-11 14:44:29 +08:00
tianshujie98
66c636d771 * Fix bug #3464. 2020-09-10 15:59:00 +08:00
tianshujie98
d27efffa6d * Fix bug #3464. 2020-09-09 09:10:17 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123
7cb74a6158 * Finish task #7711. 2020-08-27 14:06:35 +08:00
tianshujie98
fba9a11c58 * Fix bug #2581. 2020-08-11 09:30:12 +08:00
tianshujie98
a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
Yagami
f41ce9cdaa * Fix bug #2980. 2020-02-27 15:25:14 +08:00
wangyidong
61e0a9d4f1 * finish task #6505. 2019-11-19 17:18:35 +08:00
wangyidong
a5411a8aca * adjust for dashboard. 2019-11-07 11:30:43 +08:00
Yagami
f4375dc9f0 * Finish task #6457. 2019-10-12 13:56:51 +08:00