 Hao Sun
|
74ef8b9a10
|
* refactor: comment.
|
2021-12-06 09:36:59 +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
|
2935b5964c
|
* Merge programplan into stage.
|
2021-12-03 15:49:18 +08:00 |
|
|
tanghucheng
|
30d1e22dca
|
* Merge programplan into stage.
|
2021-12-03 13:57:08 +08:00 |
|
|
李玉春
|
f0f0325a8d
|
Merge branch 'master' into 'sprint/174_xieqiyu_45015'
# Conflicts:
# module/testcase/control.php
|
2021-12-03 05:07:19 +00: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 |
|
|
Hao Sun
|
42a1cdc0b4
|
* Bug 16878, fix layout when open execution/task in iframe modal.
|
2021-12-03 09:56:11 +08:00 |
|
|
xieqiyu
|
346b0cf9e2
|
* Finish task#45015.
|
2021-12-03 09:35:36 +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 |
|
|
朱金勇
|
789a419696
|
Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.
See merge request easycorp/zentaopms!757
|
2021-12-03 00:50:26 +00: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 |
|
|
Hao Sun
|
3230cff401
|
* fix kanban not work in ie.
|
2021-12-02 17:03:41 +08:00 |
|
|
Hao Sun
|
62efd53edb
|
* update kanban lib and refactor usage of it.
|
2021-12-02 16:54:56 +08:00 |
|
|
孙广明
|
6e2f7563df
|
* Fix bug.
|
2021-12-02 16:08:43 +08:00 |
|
|
孙广明
|
3aa9a7d37f
|
Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug
See merge request easycorp/zentaopms!742
|
2021-12-02 07:34:42 +00:00 |
|
|
liyuchun
|
da73e10709
|
* Fix bug #16856.
|
2021-12-02 15:32:27 +08:00 |
|
|
孙广明
|
1faf545954
|
* Remove unused code.
|
2021-12-02 13:10:55 +08:00 |
|
|
Hao Sun
|
012d5f7465
|
* adjust space between kanban lanes.
|
2021-12-02 13:07:52 +08:00 |
|
|
李玉春
|
38f5ab4145
|
Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
# module/execution/control.php
# module/message/config.php
|
2021-12-02 05:04:29 +00:00 |
|
|
李玉春
|
4afdccfc5e
|
Merge branch 'sprint/174_tianshujie_16897' into 'master'
* Fix bug #16897.
See merge request easycorp/zentaopms!725
|
2021-12-02 03:16:18 +00:00 |
|
|
王怡栋
|
b043ff0772
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 10:55:40 +08:00 |
|
|
王怡栋
|
bf16167b19
|
* Support for flow.
|
2021-12-02 10:55:04 +08:00 |
|
|
李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
xieqiyu
|
fa6b49493f
|
* Fix bug: The problem of execution requirement list module.
|
2021-12-02 10:06:24 +08:00 |
|
|
王怡栋
|
f25d797b54
|
* adjust for flow.
|
2021-12-02 10:06:02 +08:00 |
|
|
tianshujie
|
a5598ddf64
|
* Fix bug #16897.
|
2021-12-02 10:04: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
|
07f8a820b0
|
* Code format #16987.
|
2021-12-02 09:28:02 +08:00 |
|
|
孙广明
|
4b94092737
|
* Finish task #45162.
|
2021-12-02 09:24:01 +08:00 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +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
|
92ad301e29
|
* Fix bug #16988.
|
2021-12-01 17:16:52 +08:00 |
|
|
mayue
|
eec94fd383
|
* Fix bug #16936.
|
2021-12-01 17:14:43 +08: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 |
|
|
tianshujie
|
59dc2b1cce
|
* Fix bug #16980.
|
2021-12-01 14:39:18 +08:00 |
|
|
songchenxuan
|
839ee66e77
|
* Finish task #45039.
|
2021-12-01 13:41:01 +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 |
|
|
李玉春
|
686d773f0b
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.
See merge request easycorp/zentaopms!692
|
2021-12-01 05:23:47 +00:00 |
|
|
mayue
|
c22503af7b
|
* Finish task #44987,44988,44989.
|
2021-12-01 13:18:47 +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 |
|