Commit Graph

1058 Commits

Author SHA1 Message Date
tianshujie
85773e58cd * Fix bug #18280. 2022-01-07 11:01:47 +08:00
孙广明
15a142af8a Merge branch 'sprint/180_songchenxuan_realname' into 'master'
Sprint/180 songchenxuan realname

See merge request easycorp/zentaopms!1300
2022-01-06 09:26:55 +00:00
liumengyi
b6ea0afcb4 * Finish task #47090 #47098. 2022-01-06 16:56:27 +08:00
liumengyi
42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
songchenxuan
9cae04c917 *Code review realname. 2022-01-06 14:59:14 +08:00
mayue
a2765b7427 * Optimize code. 2022-01-06 13:50:43 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
songchenxuan
9c41c46624 *Fix bug #18132. 2021-12-31 17:10:12 +08:00
朱金勇
24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
李玉春
b205ad5ba5 Merge branch 'sprint/180_mayue_46527' into 'sprint/180'
* Finish task #46527.

See merge request easycorp/zentaopms!1208
2021-12-30 09:05:11 +00:00
mayue
64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
songchenxuan
47c271d9f6 *Fix Closed name bug. 2021-12-30 16:40:53 +08:00
songchenxuan
b32009a0ce *Fix execution kanban bug. 2021-12-30 15:34:44 +08:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
songchenxuan
ff16370bc6 *Finish task 46529. 2021-12-30 09:05:05 +08:00
songchenxuan
769f7cd58e *Finish task #46529. 2021-12-30 09:01:33 +08:00
songchenxuan
0d90eba4e5 *Finish task #46529. 2021-12-29 08:32:11 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
songchenxuan
6f10323a82 *Finish task #46529. 2021-12-27 16:14:05 +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
李玉春
3e1b811de9 Merge branch 'sgm_kanbanstyle' into 'master'
* Adjust kanban style.

See merge request easycorp/zentaopms!1106
2021-12-23 06:05:45 +00: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
孙广明
007dd4f43c * Adjust kanban style. 2021-12-23 14:01:37 +08: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
朱金勇
8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
孙广明
eaf86c493d * Fix js error. 2021-12-17 15:55:34 +08:00
孙广明
302a576ed1 * Fix kanban js. 2021-12-17 15:54:00 +08:00
朱金勇
4cddc5effd Merge branch 'sprint/176_xieqiyu_46097' into 'master'
* Finish task#46097.

See merge request easycorp/zentaopms!989
2021-12-17 07:44:07 +00: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
朱金勇
d8852453dc Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Optimize style for cards in client.

See merge request easycorp/zentaopms!985
2021-12-17 07:39:30 +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
朱金勇
3381dd3ab0 Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Adjust url card style in client.

See merge request easycorp/zentaopms!981
2021-12-17 06:10:26 +00:00
songchenxuan
59bbd18c55 *Finish task #46099. 2021-12-17 13:58:31 +08:00
Hao Sun
44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
songchenxuan
fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
xieqiyu
6227d52547 * Finish task#46097. 2021-12-15 17:24:46 +08:00
mayue
4adf6e0a52 * Fix bug #17015. 2021-12-15 17:17:57 +08:00
朱金勇
b3b60dd4e4 Merge branch 'sprint/176_songchenxuan_45545' into 'master'
*Fix task #45545 bug.

See merge request easycorp/zentaopms!941
2021-12-15 00:39:56 +00:00
songchenxuan
731c7fb45c *Fix task #45545 bug. 2021-12-14 17:33:01 +08:00