Commit Graph

396 Commits

Author SHA1 Message Date
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
xieqiyu
65aa1aebdf * Fix bug#17791. 2021-12-24 11:11:15 +08:00
zhujinyong
8efde58482 Merge branch 'sprint/178_songchenxuan_17682' 2021-12-23 17:01:30 +08:00
songchenxuan
2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08:00
songchenxuan
47d7d7a92d *Fix bug #17682. 2021-12-23 15:24:23 +08:00
孙广明
9622540b60 Merge branch 'sprint/178_songchenxuan_46099_fixbug' into 'master'
*Fix task #46099 bug.

See merge request easycorp/zentaopms!1102
2021-12-23 06:03:01 +00:00
songchenxuan
2769417a6d *Fix task #46099 bug. 2021-12-23 13:23:47 +08:00
mayue
ce6d095ec8 * Fix a bug #17854. 2021-12-23 10:52:27 +08:00
孙广明
197a1bceea * Finish task #46165. 2021-12-22 09:41:39 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
孙广明
87c12c800a * Fix code details. 2021-12-17 15:43:19 +08:00
朱金勇
67ecc5f8c8 Merge branch 'sprint/178_songchenxuan_46099' into 'master'
*Finish task #46099.

See merge request easycorp/zentaopms!974
2021-12-17 07:40:10 +00:00
孙广明
9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
Hao Sun
fd3a645a30 * Optimize style for cards in client. 2021-12-17 14:11:50 +08:00
songchenxuan
59bbd18c55 *Finish task #46099. 2021-12-17 13:58:31 +08:00
songchenxuan
fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
Hao Sun
2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
songchenxuan
8a0881aef4 *Finish task #45543. 2021-12-13 10:14:50 +08:00
tianshujie
7c3a8dc753 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
tianshujie
8e7432ad08 * Fix bug #17173,17173. 2021-12-09 10:34:47 +08:00
tanghucheng
7458b8ef92 * Fix bug #17225. 2021-12-09 10:34:47 +08:00
hufangzhou
32601cd5ff * Fix bug #17185. 2021-12-09 10:34:47 +08:00
tianshujie
545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
孙广明
834684ca51 Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173,17173.

See merge request easycorp/zentaopms!812
2021-12-07 09:24:13 +00:00
tianshujie
4fdb7107dc * Fix bug #17173,17173. 2021-12-07 17:22:14 +08:00
tanghucheng
6f6dc4741a * Fix bug #17225. 2021-12-07 17:13:23 +08:00
hufangzhou
9359d427f5 * Fix bug #17185. 2021-12-07 15:25:31 +08:00
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
tanghucheng
c6b731717a * Fix project execution privilege. 2021-12-06 09:24:06 +08:00
孙广明
5a8e51a9c6 Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.

See merge request easycorp/zentaopms!760
2021-12-06 00:33:10 +00:00
tanghucheng
30d1e22dca * Merge programplan into stage. 2021-12-03 13:57:08 +08:00
tanghucheng
499605d81e * Merge programplan into stage. 2021-12-03 11:09:28 +08:00
liyuchun
c919c8105d * Adjust code style. 2021-12-03 10:56:55 +08:00
chaideqing
06cf26ea9a * add project name in execution card title 2021-12-03 09:58:26 +08:00
Hao Sun
42a1cdc0b4 * Bug 16878, fix layout when open execution/task in iframe modal. 2021-12-03 09:56:11 +08:00
tanghucheng
d4bfcd15cc * Merge programplan into stage. 2021-12-03 09:35:14 +08:00
tanghucheng
613d171dde * Merge programplan into stage. 2021-12-03 09:20:08 +08:00
tanghucheng
1acd92b85d * Merge programplan into stage. 2021-12-03 09:13:57 +08:00
tanghucheng
686c40396b * Merge programplan into stage. 2021-12-03 09:11:43 +08:00
tanghucheng
fa808b990b * Merge programplan into stage. 2021-12-03 08:19:14 +08:00
tanghucheng
19420bef7b * Code for stage. 2021-12-03 00:55:54 +08:00
Wenrui LI
24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
孙广明
1faf545954 * Remove unused code. 2021-12-02 13:10:55 +08:00
王怡栋
bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
王怡栋
f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
李玉春
4c29226156 Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Fix bug #16987.

See merge request easycorp/zentaopms!723
2021-12-02 01:48:29 +00:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
tianshujie
92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +08:00