Commit Graph
303 Commits
Author SHA1 Message Date
Yagami 048ec8020b * Code for bug #13766. 2021-07-22 14:57:15 +08:00
Yagami 7d2733396d * Fix bug #13766. 2021-07-22 13:53:24 +08:00
guanxiying bc3bd8316c * Fix bug #12828. 2021-07-05 14:47:15 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
leiyong d74f255057 * Fix bug#12078. 2021-04-16 05:38:49 +00:00
holan20180123 caec97f1b8 * Fix bug #11382., 2021-04-02 11:08:31 +08:00
wangyidong 94045515a0 * fix bug #11064. 2021-04-01 10:26:52 +08:00
wangyidong 361af39093 * adjust code for todo module. 2021-03-05 09:25:26 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
holan20180123 319b97430e * Adjust the style. 2021-01-20 14:32:24 +08:00
leiyong 347cc63d74 * Adjust style. 2021-01-08 16:13:42 +08:00
leiyong eee118f742 * Fix bug. 2021-01-08 15:49:21 +08:00
leiyong 19717ee532 * Fix bug. 2021-01-08 15:27:06 +08:00
leiyong 0c4afee4ee * Finish task#8865. 2021-01-01 11:34:11 +08:00
tianshujie98 408a720605 * When editing products, add sorting uniqueness judgment. 2020-12-30 11:28:06 +08:00
holan20180123 0c477305fa * Finish task #8774. 2020-12-22 16:10:58 +08:00
Yagami 312c39129a * Finish task #8806. 2020-12-22 14:40:39 +08:00
tianshujie98 d661c3d5b0 * Finish task #8775. 2020-12-22 09:37:43 +08:00
holan20180123 44c7bcbd59 * Finish task #8678. 2020-12-16 14:46:05 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
wangyidong 8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
holan20180123 64dace9b10 * Fix bug 3729. 2020-12-04 14:53:03 +08:00
holan20180123 baec73a930 * Fix bug #3718. 2020-12-04 10:16:37 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
qiyu-xie 861b5e5d95 * Finish task#8421. 2020-11-18 16:51:13 +08:00
qiyu-xie 50561f9777 * Finish task#8421. 2020-11-18 16:30:58 +08:00
qiyu-xie 0c1c00c160 * View todo start-end times display in one line. 2020-11-16 10:12:38 +08:00
qiyu-xie 1f741b8d01 * Finish task#8198. Add comments. 2020-11-15 14:34:23 +08:00
qiyu-xie eca30c5d4a * Finish task#8198. Modify edit. 2020-11-12 16:30:58 +08:00
qiyu-xie 4ea3dc9f67 * Finish task#8198. 2020-11-12 10:35:07 +08:00
qiyu-xie 3af63928aa * Finish task#7966. 2020-09-21 14:29:44 +08:00
qiyu-xie 52da0d9602 * Finish task#7966. 2020-09-21 14:25:37 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z 8852e9fe67 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-27 10:11:14 +08:00
z f57247344e * fix for create todo. 2020-07-27 10:08:05 +08:00
tianshujie98 94f98fa13a * Finish task #7536,7557,7558. 2020-07-27 10:05:11 +08:00
tianshujie98 1f0aeacf8b * Finish task #7348. 2020-07-22 10:06:48 +08:00
sgm0422 cd6b5caa61 * Finish task #1160. 2020-07-21 14:35:48 +08:00
tianshujie98 eeea421cf9 * Finish task #7487,7488. 2020-07-20 13:13:41 +08:00
leiyong cde7386405 * Adjust style. 2020-07-14 18:55:52 -07:00
leiyong bda11a547a * Finish task#7369. 2020-07-14 18:28:02 -07:00
chenfei 6f80a12fd8 * Fix bug #3262. 2020-07-09 13:17:31 +08:00
chenfei 2eb7efb314 * Fix bug #3261. 2020-07-08 16:38:14 +08:00
chenfei 18e976b3e4 * Fix bug #3272. 2020-07-07 16:35:51 +08:00
wangyidong fd0da30d09 * fix bug. 2020-05-26 09:14:31 +08:00
wangyidong 62cb503271 * finish task #6885. 2020-02-11 17:19:08 +08:00
Catouse 13aa690b33 * fix form setting in todo/batchcreate view not work. 2020-01-09 09:52:17 +08:00
Yagami e408817726 * Finish task #6420. 2019-10-14 15:07:41 +08:00
Yagami 6256fd35ab * Finish task #6308. 2019-09-02 10:28:05 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00