朱金勇
|
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
|
c33000b578
|
* Code for task#45536.
|
2021-12-10 13:11:37 +08:00 |
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +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 |
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
hufangzhou
|
d876550d96
|
* Add the traditional Chinese language item.
|
2021-12-07 09:22:58 +08:00 |
|
王怡栋
|
7091037194
|
Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade
See merge request easycorp/zentaopms!786
|
2021-12-06 07:14:51 +00:00 |
|
孙广明
|
f3bd7149f9
|
Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Improve kanban UI, bug #17063.
See merge request easycorp/zentaopms!787
|
2021-12-06 05:11:11 +00:00 |
|
Hao Sun
|
18c0ef3210
|
* Custom dnd rules for project kanban.
|
2021-12-06 11:30:11 +08:00 |
|
Hao Sun
|
50ad00b1c4
|
* Fix dnd not work in project kanban.
|
2021-12-06 11:19:05 +08:00 |
|
Hao Sun
|
8d08be2f57
|
* Fix cards count incorrect on some kanbans.
|
2021-12-06 11:18:49 +08:00 |
|
孙广明
|
69304124b5
|
* Change for upgrade.
|
2021-12-06 10:58:52 +08:00 |
|
孙广明
|
ad1cc7c04f
|
Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.
See merge request easycorp/zentaopms!774
|
2021-12-06 02:33:35 +00:00 |
|
hufangzhou
|
145fc2a461
|
* Fix bug #17074.
|
2021-12-06 10:27:51 +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
|
613d171dde
|
* Merge programplan into stage.
|
2021-12-03 09:20:08 +08:00 |
|
tanghucheng
|
686c40396b
|
* Merge programplan into stage.
|
2021-12-03 09:11:43 +08:00 |
|
tanghucheng
|
19420bef7b
|
* Code for stage.
|
2021-12-03 00:55:54 +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 |
|
孙广明
|
128af31eda
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Finish task #fixbug.
See merge request easycorp/zentaopms!718
|
2021-12-02 00:21:59 +00:00 |
|
zhengrunyu
|
f274c52e33
|
*Finish task #fixbug.
|
2021-12-02 08:14:09 +08:00 |
|
李玉春
|
0b0aa04db1
|
Merge branch 'sprint/174_tianshujie_issue' into 'master'
* Modify the problem of function demonstration.
See merge request easycorp/zentaopms!714
|
2021-12-01 09:29:36 +00:00 |
|
tianshujie
|
41da1fdb7e
|
* Fix the problem of graying out the maintenance product.
|
2021-12-01 17:05:45 +08:00 |
|
tianshujie
|
64cac6374b
|
* The plan is blank when switching branches.
|
2021-12-01 16:39:10 +08:00 |
|
tianshujie
|
86ccece2ca
|
* Modify the problem of function demonstration.
|
2021-12-01 16:32:10 +08:00 |
|
李玉春
|
4b37f6b83b
|
Merge branch 'sprint/174_songchenxuan_45040' into 'master'
* Finish task #45040.
See merge request easycorp/zentaopms!684
|
2021-12-01 05:24:23 +00:00 |
|
songchenxuan
|
631a62e2dd
|
* Finish task #45040.
|
2021-12-01 13:16:42 +08:00 |
|
孙广明
|
3803a94c4c
|
Merge branch 'sprint/175_zhengrunyu_45150' into 'master'
*Finish task #45150.
See merge request easycorp/zentaopms!698
|
2021-12-01 05:16:22 +00:00 |
|
zhengrunyu
|
ae3c0eb522
|
*Finish task #45150.
|
2021-12-01 13:04:31 +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 |
|
songchenxuan
|
85cf0ab20c
|
* Finish task #45040.
|
2021-12-01 11:15:19 +08:00 |
|
孙广明
|
1a9a2cb624
|
Merge branch 'spirnt/175_liyuchun_bug' into 'master'
* Finish task #45152.
See merge request easycorp/zentaopms!686
|
2021-12-01 02:56:55 +00:00 |
|
zhengrunyu
|
e42d3ebed7
|
*Finish task #45150.
|
2021-12-01 10:30:41 +08:00 |
|
liumengyi
|
86674338d9
|
* Fix bug #16882.
|
2021-12-01 10:24:45 +08:00 |
|
zhengrunyu
|
3e4fa30030
|
*Finish task #45150.
|
2021-12-01 10:14:15 +08:00 |
|
liyuchun
|
e6ece3beab
|
* Finish task #45152.
|
2021-12-01 10:01:20 +08:00 |
|
songchenxuan
|
cb00625795
|
* Finish task #45040.
|
2021-12-01 08:45:25 +08:00 |
|
Hao Sun
|
9d7449acae
|
* refactor.
|
2021-12-01 08:29:07 +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 |
|