Commit Graph

18546 Commits

Author SHA1 Message Date
Yagami
de2b16d64e Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:51:40 +08:00
Yagami
a245bb6954 * Fix welcome block. 2020-08-21 13:51:09 +08:00
holan20180123
af7e3883a5 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:26:21 +08:00
holan20180123
1b615eab97 * Edit search risk. 2020-08-21 13:25:54 +08:00
Yagami
a2dc263d7d Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:15:18 +08:00
Yagami
3b9a6dbe09 * Add block module list. 2020-08-21 13:14:51 +08:00
holan20180123
7ac97c9e56 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:06:30 +08:00
holan20180123
5769bf7c0f * Add contribute block. 2020-08-21 13:05:43 +08:00
Yagami
88141954a6 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 11:25:58 +08:00
Yagami
647b060875 * Fix block get list method. 2020-08-21 11:25:39 +08:00
z
648f5e84f8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 11:05:30 +08:00
z
463a7c24a8 * code for task #7644. 2020-08-21 11:04:41 +08:00
Yagami
c09e27a568 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 10:57:30 +08:00
Yagami
9c24b069d6 * Add new block. 2020-08-21 10:56:19 +08:00
z
20d3cab272 * code for task #7646. 2020-08-21 10:31:07 +08:00
z
ea00a09d72 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 09:48:43 +08:00
z
9c649028b5 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 09:48:23 +08:00
z
cd364590d5 * add lang item. 2020-08-21 09:47:49 +08:00
Yagami
91f3a21133 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 09:47:47 +08:00
Yagami
57afbd202f * Add new block. 2020-08-21 09:47:16 +08:00
hufangzhou
c6eeec553a * Add Scrum dynamic. 2020-08-21 09:29:33 +08:00
Yagami
539283311c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 17:28:25 +08:00
Yagami
0f91511fe4 * Fix design details. 2020-08-20 17:28:02 +08:00
holan20180123
f035ecd861 * Code for block issue list. 2020-08-20 17:20:05 +08:00
holan20180123
671781aecb Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 16:27:55 +08:00
holan20180123
f5319cee4e * Code for block riskList. 2020-08-20 16:27:26 +08:00
Yagami
80e5e35540 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 16:26:36 +08:00
Yagami
b9c8d645f5 * Add milestone module. 2020-08-20 16:26:17 +08:00
tianshujie98
dd4896a0f2 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-20 16:25:00 +08:00
tianshujie98
e4b7c55620 * Finish task #7628. 2020-08-20 16:24:17 +08:00
z
d5c8ab35c5 * fix bug #3380. 2020-08-20 16:15:14 +08:00
z
90b6f05859 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-20 15:56:55 +08:00
z
09cfff0dbc * finish task #7644,7642. 2020-08-20 15:52:07 +08:00
leiyong
c82fc3ff60 * Add scrum block module. 2020-08-20 15:49:26 +08:00
Yagami
1cced1537d Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 15:06:27 +08:00
Yagami
9c1ff185a2 * Add issue block. 2020-08-20 15:06:08 +08:00
holan20180123
f665df409b Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 14:56:53 +08:00
holan20180123
1ed91ca918 * Add risk module. 2020-08-20 14:56:37 +08:00
leiyong
d4950444ad * Adjust sql. 2020-08-20 13:36:25 +08:00
leiyong
ad0f2a65a9 * Merger code. 2020-08-20 11:15:31 +08:00
leiyong
a39e00876e * Merger code. 2020-08-20 11:13:07 +08:00
Yagami
de3c53ec94 * Add blocks. 2020-08-20 11:09:23 +08:00
holan20180123
fc664a5bb0 * Code for risk. 2020-08-20 10:52:11 +08:00
holan20180123
a3fa8d0371 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 10:50:31 +08:00
holan20180123
ed98c8e848 * Code for risk. 2020-08-20 10:50:14 +08:00
tianshujie98
2c09d22979 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-20 10:25:48 +08:00
tianshujie98
236880c4b6 * Finish task #7628. 2020-08-20 10:24:58 +08:00
tianshujie98
acb8d93ec4 *Finish task #7628. 2020-08-20 10:22:00 +08:00
tianshujie98
c23c6e721c * Finish task #7628. 2020-08-20 10:15:58 +08:00
leiyong
b5f221814a * Finish task#7626. 2020-08-20 09:33:01 +08:00