孙广明
|
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 |
|
songchenxuan
|
731c7fb45c
|
*Fix task #45545 bug.
|
2021-12-14 17:33:01 +08:00 |
|
朱金勇
|
efdadc07a7
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.
See merge request easycorp/zentaopms!928
|
2021-12-14 05:34:42 +00:00 |
|
mayue
|
77d36b7467
|
* Finish a task #45544.
|
2021-12-14 09:49:46 +08:00 |
|
Yurun
|
d7538814a7
|
Optimize execution module
|
2021-12-14 09:47:53 +08:00 |
|
songchenxuan
|
53e4b2d102
|
*Finish task #45535.
|
2021-12-13 13:53:03 +08:00 |
|
朱金勇
|
d148ae7cf4
|
Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Finish task #45535.
See merge request easycorp/zentaopms!872
|
2021-12-10 06:04:55 +00:00 |
|
songchenxuan
|
ac9d06cf7c
|
*Finish task #45539.
|
2021-12-10 11:05:11 +08:00 |
|
孙广明
|
12ce541d9e
|
* Code for task #45818.
|
2021-12-09 10:50:05 +08:00 |
|
tianshujie
|
7c3a8dc753
|
* Fix bug #17259.
|
2021-12-09 10:34:47 +08:00 |
|
tianshujie
|
545652e0e4
|
* Fix bug #17259.
|
2021-12-08 16:50:48 +08:00 |
|
songchenxuan
|
66c2768b6a
|
*Finish task #45535.
|
2021-12-08 11:30:02 +08:00 |
|
李玉春
|
f0f0325a8d
|
Merge branch 'master' into 'sprint/174_xieqiyu_45015'
# Conflicts:
# module/testcase/control.php
|
2021-12-03 05:07:19 +00:00 |
|
xieqiyu
|
346b0cf9e2
|
* Finish task#45015.
|
2021-12-03 09:35:36 +08:00 |
|
孙广明
|
6e2f7563df
|
* Fix bug.
|
2021-12-02 16:08:43 +08: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 |
|
王怡栋
|
bf16167b19
|
* Support for flow.
|
2021-12-02 10:55:04 +08:00 |
|
tianshujie
|
a5598ddf64
|
* Fix bug #16897.
|
2021-12-02 10:04:02 +08:00 |
|
zhengrunyu
|
f274c52e33
|
*Finish task #fixbug.
|
2021-12-02 08:14:09 +08:00 |
|
zhengrunyu
|
ae3c0eb522
|
*Finish task #45150.
|
2021-12-01 13:04:31 +08:00 |
|
zhengrunyu
|
6884b949b0
|
*Finish task #45150.
|
2021-12-01 10:36:12 +08:00 |
|
zhengrunyu
|
e42d3ebed7
|
*Finish task #45150.
|
2021-12-01 10:30:41 +08:00 |
|
zhengrunyu
|
3e4fa30030
|
*Finish task #45150.
|
2021-12-01 10:14:15 +08:00 |
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
zhengrunyu
|
46a9f157b1
|
*Finish task #45148.
|
2021-11-30 10:56:09 +08:00 |
|
zhengrunyu
|
e78c876216
|
*Finish task #45148.
|
2021-11-30 09:22:04 +08:00 |
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +08:00 |
|
tianshujie
|
3bddd21087
|
* Finish task #45083.
|
2021-11-27 17:58:52 +08:00 |
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|
zhengrunyu
|
9dac5358e3
|
*Finish task #45148.
|
2021-11-26 15:20:17 +08:00 |
|
zhengrunyu
|
2f41e85fda
|
*Finish task #sprint/168_zhengrunyu_45148.
|
2021-11-26 08:30:55 +08:00 |
|
朱金勇
|
293a375ec8
|
Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.
See merge request easycorp/zentaopms!616
|
2021-11-25 06:45:58 +00:00 |
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
王怡栋
|
385cb41a0e
|
* code for task #44938.
|
2021-11-25 11:35:46 +08:00 |
|
mayue
|
c2c13a9079
|
* Fix bug #16605.
|
2021-11-25 09:53:49 +08:00 |
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
tianshujie
|
179e766478
|
* Modify function name.
|
2021-11-24 16:45:08 +08:00 |
|
zhouxin
|
2b3df26fd8
|
Fix bug 16564.
|
2021-11-23 18:47:56 +08:00 |
|
tianshujie
|
ec5ca42e49
|
* Fix bug #16577.
|
2021-11-23 15:01:51 +08:00 |
|
hufangzhou
|
c0d4264148
|
* Fix bug #16564.
|
2021-11-23 10:10:14 +08:00 |
|
王怡栋
|
90a913ca4b
|
Merge branch 'sprint/170'
|
2021-11-22 16:59:40 +08:00 |
|
李玉春
|
8e7c536a8d
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.
See merge request easycorp/zentaopms!560
|
2021-11-22 01:00:45 +00:00 |
|
tianshujie
|
0408f2f8ce
|
* Modify the execution scope of creating and editing bugs.
|
2021-11-21 10:46:35 +08:00 |
|
xieqiyu
|
856afd0b76
|
* Fix bug#16471.
|
2021-11-21 02:23:33 +08:00 |
|
李玉春
|
36e39591be
|
Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503
See merge request easycorp/zentaopms!516
|
2021-11-18 09:19:19 +00:00 |
|
李玉春
|
15967171de
|
Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.
See merge request easycorp/zentaopms!513
|
2021-11-18 06:33:49 +00:00 |
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|