Commit Graph

489 Commits

Author SHA1 Message Date
Yagami
dafb68b70c * Code for hour unit. 2021-01-18 10:49:39 +08:00
tianshujie98
e647640432 * Change color. 2021-01-15 15:33:49 +08:00
tianshujie98
01e1008f29 * Finish task #9001. 2021-01-15 09:45:19 +08:00
Yagami
c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
Yagami
95a8b485d8 * Fix details. 2021-01-08 15:16:02 +08:00
Yagami
8e2ba0762e * Fix bug. 2020-12-24 09:49:27 +08:00
hufangzhou
30e13a49c8 * Finish task#8687. 2020-12-16 14:22:32 +08:00
qiyu-xie
8a1e26837d * Delete link. 2020-12-15 09:34:58 +08:00
qiyu-xie
f25e318ed0 * Modify link. 2020-12-14 15:17:00 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
holan20180123
7af282b5f8 * Fix bug #3753. 2020-12-11 13:09:13 +08:00
holan20180123
791f1201dd * Fix bug #3756. 2020-12-11 11:42:55 +08:00
hufangzhou
01774f22a3 * Fix bug#3739. 2020-12-10 13:17:48 +08:00
holan20180123
65ba8b4e76 * Finish task #8675. 2020-12-09 14:07:49 +08:00
qiyu-xie
f11c8319f7 * Finish task#8576. 2020-12-09 13:04:49 +08:00
holan20180123
68fe0c6a78 * Finish task #8575. 2020-12-09 10:12:12 +08:00
Yagami
5c77489f08 * Fix product block. 2020-12-08 17:31:15 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
tianshujie98
5dbe3dd6d3 * Fix bug. 2020-12-07 08:50:36 +08:00
leiyong
6eec4a4a88 * Fix bug. 2020-12-07 08:16:23 +08:00
leiyong
15f7957709 * Adjust code. 2020-12-04 10:53:00 +08:00
leiyong
5b787b6c24 * Adjust code. 2020-12-03 16:49:12 +08:00
leiyong
3cc044a116 * Adjust language file. 2020-12-03 16:22:31 +08:00
leiyong
c0239adda9 * Fix block module language item. 2020-12-03 16:02:29 +08:00
tianshujie98
4dbca79efb * Adjust table column width. 2020-12-03 15:49:58 +08:00
leiyong
6def730e22 * Fix waterfallgantt block. 2020-12-03 14:07:38 +08:00
tianshujie98
977b4fa700 * Fix bug #3660. 2020-12-02 14:52:53 +08:00
tianshujie98
071e99b3a5 * Fix bug #3660. 2020-12-02 14:10:00 +08:00
leiyong
2eab398805 * Fix bug. 2020-12-02 13:14:52 +08:00
qiyu-xie
3d51aad302 * Fix bug#3712. 2020-12-02 11:47:33 +08:00
leiyong
53e0784d6a * Finish task#8546 2020-12-01 11:17:57 +08:00
Yagami
c8817eda62 * Merge code. 2020-12-01 10:59:30 +08:00
leiyong
8cde383f21 * Finish task#8491. 2020-11-30 09:42:55 +08:00
hufangzhou
7b866ec815 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-27 09:07:50 +08:00
hufangzhou
be37148d14 * Finish task#8454. 2020-11-27 09:05:06 +08:00
Yagami
cb0043a49b * Finish task #8460. 2020-11-26 15:55:41 +08:00
hufangzhou
5b0a2a341a * Finish task#8447. 2020-11-26 10:56:51 +08:00
hufangzhou
f198b6f0a6 * Finish task#8448. 2020-11-25 13:44:44 +08:00
Catouse
424193e084 * improve style of contextmenu in recentproject block. 2020-11-24 17:26:13 +08:00
Catouse
3d14cd6a52 * task #8506, change dropdown to context-dropdown and fix conflict of dropdown-menu with overflow style. 2020-11-24 17:11:06 +08:00
Catouse
a5ccc8a6e9 * improve style of recentproject block. 2020-11-24 17:11:06 +08:00
Catouse
c3c9994742 * fix drag-and-drop conflict when block content has panel-heading in dashbard page. 2020-11-24 17:11:06 +08:00
holan20180123
e9fcbe9c21 * Finish task #8507. 2020-11-24 14:11:09 +08:00
leiyong
94586714e6 * Finish task#8509. 2020-11-24 10:54:37 +08:00
holan20180123
41b1d9931a * Finish task #8450. 2020-11-24 08:56:14 +08:00
holan20180123
eabbb2fd3f * Finish task #8449. 2020-11-23 16:13:49 +08:00
leiyong
72a2b18c20 * Adjust the block module language file and model.php Logic. 2020-11-19 14:07:58 +08:00
Yagami
f2c6dba226 * Rename project function name. 2020-11-19 14:02:50 +08:00
Yagami
aae58fea38 * Adjust code details. 2020-11-19 10:41:37 +08:00
leiyong
03326e0d24 * Fix error. 2020-11-17 14:23:07 +08:00