 孙广明
|
1cae18380b
|
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
|
2022-01-11 00:39:37 +00:00 |
|
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
|
孙广明
|
d5efab2baf
|
Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
# module/project/config.php
|
2022-01-07 00:46:43 +00:00 |
|
|
xieqiyu
|
af54ab16c6
|
* Fix bug#18242,18241,18240,18239.
|
2022-01-07 08:35:18 +08:00 |
|
|
mayue
|
f151953a49
|
* Optimize code.
|
2022-01-06 15:55:49 +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 |
|
|
hufangzhou
|
4d78e4b9d3
|
* Compatible with Firefox browser.
|
2022-01-05 10:54:34 +08:00 |
|
|
mayue
|
15d588491f
|
* Revert code.
|
2022-01-04 17:19:45 +08:00 |
|
|
zhujinyong
|
e944c4a428
|
Merge branch 'sprint/180_sunhao/task46524' into sprint/180
|
2021-12-31 11:21:25 +08:00 |
|
|
Hao Sun
|
1bdc313562
|
* Task #46524, refactor some pages with user-picker.
|
2021-12-30 17:35:41 +08:00 |
|
|
Hao Sun
|
dff300cf88
|
* Task #46524, refactor user selector for page "project/managemembers".
|
2021-12-30 17:02:32 +08:00 |
|
|
mayue
|
64d6d35a87
|
* Optimize code.
|
2021-12-30 17:01:13 +08:00 |
|
|
孙广明
|
355665690b
|
Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674
See merge request easycorp/zentaopms!1195
|
2021-12-30 08:15:39 +00:00 |
|
|
zhouxin
|
344682bf7b
|
Delete createguide of kanban,change cmmi to waterfall.
|
2021-12-30 06:25:22 +00:00 |
|
|
zhouxin
|
05a75e7039
|
Finish task #46674.
|
2021-12-30 05:50:50 +00:00 |
|
|
mayue
|
9d89d77c57
|
* Finish task #46527.
|
2021-12-30 13:10:17 +08:00 |
|
|
songchenxuan
|
c560dc7048
|
*Delete swp file.
|
2021-12-30 09:41:33 +08:00 |
|
|
zhouxin
|
2e79c5f869
|
Finish task #46679 and fix a bug.
|
2021-12-29 03:49:17 +00:00 |
|
|
songchenxuan
|
4b3404983f
|
*Finish task #46531.
|
2021-12-28 09:36:31 +08:00 |
|
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
|
tianshujie
|
9ad591fc93
|
* Realize the function of sub-molecules.
|
2021-12-17 09:27:50 +08:00 |
|
|
Hao Sun
|
2f862118d8
|
* Refactor progress-pie instead of rings to improve perf.
|
2021-12-14 14:31:41 +08:00 |
|
|
朱金勇
|
f1e97497a3
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!903
|
2021-12-13 00:46:27 +00:00 |
|
|
xieqiyu
|
46ed4772cf
|
* Delete unused code.
|
2021-12-11 14:39:19 +08:00 |
|
|
xieqiyu
|
5472859d6e
|
* Code for task#45536.
|
2021-12-11 14:28:45 +08:00 |
|
|
朱金勇
|
161233a64f
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!884
|
2021-12-10 06:15:15 +00:00 |
|
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +08:00 |
|
|
hufangzhou
|
1517a800e2
|
* Fix an error for lang item.
|
2021-12-09 10:34:47 +08:00 |
|
|
tianshujie
|
2030bbd11c
|
* Fix bug #17173.
|
2021-12-09 10:34:47 +08:00 |
|
|
tianshujie
|
ec5d481dc8
|
* Fix bug #17272.
|
2021-12-09 10:34:47 +08:00 |
|
|
tianshujie
|
7c3a8dc753
|
* Fix bug #17259.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
73b43980eb
|
* Fix an error for lang item.
|
2021-12-09 10:12:08 +08:00 |
|
|
tianshujie
|
9818fe17de
|
* Fix bug #17173.
|
2021-12-09 10:04:46 +08:00 |
|
|
tianshujie
|
a2355212ad
|
* Fix bug #17272.
|
2021-12-08 17:08:10 +08:00 |
|
|
tianshujie
|
545652e0e4
|
* Fix bug #17259.
|
2021-12-08 16:50:48 +08:00 |
|
|
liumengyi
|
9d7cd3b29e
|
* Fix bug #17031,#17029.
|
2021-12-02 16:08:17 +08:00 |
|
|
王怡栋
|
bf16167b19
|
* Support for flow.
|
2021-12-02 10:55:04 +08:00 |
|
|
tianshujie
|
41da1fdb7e
|
* Fix the problem of graying out the maintenance product.
|
2021-12-01 17:05:45 +08:00 |
|
|
李玉春
|
20ae1dba85
|
Merge branch 'sprint/175_liumengyi_16882' into 'master'
* Fix bug #16882.
See merge request easycorp/zentaopms!690
|
2021-12-01 05:01:11 +00:00 |
|
|
zhujinyong
|
8ee3e5ce16
|
Merge branch 'sprint/168_sunhao/task45145'
|
2021-12-01 11:32:08 +08:00 |
|
|
liumengyi
|
bba0c40dfe
|
* Fix bug #16882, #16924.
|
2021-12-01 11:25:02 +08:00 |
|
|
liumengyi
|
86674338d9
|
* Fix bug #16882.
|
2021-12-01 10:24:45 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
Hao Sun
|
39a2d7296b
|
* refactor pages with kanban lib.
|
2021-11-30 14:21:24 +08:00 |
|
|
孙广明
|
f89071b9e7
|
Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
# module/execution/view/view.html.php
|
2021-11-30 03:13:21 +00:00 |
|
|
zhengrunyu
|
e78c876216
|
*Finish task #45148.
|
2021-11-30 09:22:04 +08:00 |
|
|
tianshujie
|
7e225ce3f7
|
* Finish task #45081,45012.
|
2021-11-30 09:18:05 +08:00 |
|
|
zhengrunyu
|
b3c8ee7ccb
|
*Finish task #45148.
|
2021-11-29 09:29:44 +08:00 |
|
|
tianshujie
|
582f0e036d
|
* Finish task #45043.
|
2021-11-27 18:14:41 +08:00 |
|