liuhong
|
d71ca3ac54
|
* Fix bug #31538.
|
2023-01-06 04:10:54 +00:00 |
|
孙广明
|
d79fbdac1e
|
Merge branch '281_bug_30923' into 'zentaopms_281'
* Rollback version, the modification of the data source in the general version...
See merge request easycorp/zentaopms!6706
|
2023-01-06 03:14:46 +00:00 |
|
孙广明
|
2ba56996fb
|
Merge branch '281_bug_31521' into 'zentaopms_281'
* Fix bug #31521.
See merge request easycorp/zentaopms!6709
|
2023-01-06 03:14:30 +00:00 |
|
liuhong
|
1c7e9b7d14
|
* Fix bug #31521.
|
2023-01-06 01:35:10 +00:00 |
|
liuhong
|
212debf30f
|
* Rollback version, the modification of the data source in the general version has been resolved to avoid conflicts
|
2023-01-06 00:52:01 +00:00 |
|
孙广明
|
150ec1f7e3
|
Merge branch '281_bug_30923' into 'zentaopms_281'
* Fix bug for 30923 with get ProductID.
See merge request easycorp/zentaopms!6701
|
2023-01-05 08:28:08 +00:00 |
|
liuhong
|
5e26183cbb
|
* Fix bug for 30923 with get ProductID.
|
2023-01-05 07:43:34 +00:00 |
|
xieqiyu
|
97d4792fbf
|
* Fix bug of create bug.
|
2023-01-05 10:13:34 +08:00 |
|
xieqiyu
|
ee5aacbd35
|
* Fix bug#31467.
|
2023-01-05 10:05:45 +08:00 |
|
xieqiyu
|
c2fd82381d
|
* Fix bug of preview file.
|
2023-01-04 16:28:28 +08:00 |
|
孙广明
|
365ff9230c
|
Merge branch '281_bug_82220' into 'zentaopms_281'
* Fix bug #82220.
See merge request easycorp/zentaopms!6679
|
2023-01-04 06:34:06 +00:00 |
|
liuhong
|
06700413b1
|
* Adjust code.
|
2023-01-04 05:54:47 +00:00 |
|
liuhong
|
892b7d6b8a
|
* Fix bug #82220.
|
2023-01-04 03:31:00 +00:00 |
|
xieqiyu
|
e8edfb8df8
|
* Code for task#81779.
|
2023-01-04 09:33:43 +08:00 |
|
孙广明
|
df8e5a7ee0
|
Merge branch '281_liuhong_81778' into 'zentaopms_281'
281 liuhong 81778
See merge request easycorp/zentaopms!6676
|
2023-01-04 01:28:20 +00:00 |
|
liuhong
|
13d6441857
|
* Adjust code
|
2023-01-04 01:25:07 +00:00 |
|
liuhong
|
86c398672d
|
* Adjust code
|
2023-01-04 01:23:31 +00:00 |
|
xieqiyu
|
bf0ee11b80
|
* Code for task#81779.
|
2023-01-04 09:11:27 +08:00 |
|
liuhong
|
e91bc365a4
|
* Adjust code for task #81778.
|
2023-01-04 01:06:36 +00:00 |
|
孙广明
|
55a21bc600
|
Merge branch '281_xieqiyu_81779' into 'zentaopms_281'
281 xieqiyu 81779
See merge request easycorp/zentaopms!6677
|
2023-01-04 00:31:54 +00:00 |
|
xieqiyu
|
43db2ac853
|
* Adjust code style.
|
2023-01-04 08:28:55 +08:00 |
|
xieqiyu
|
bc620ef34d
|
* Code for task#81779.
|
2023-01-03 17:36:33 +08:00 |
|
liuhong
|
204b52f0b5
|
* Adjust code for task.
|
2023-01-03 09:17:55 +00:00 |
|
liuhong
|
2996d56fa0
|
* Finish task #81778.
|
2023-01-03 09:14:04 +00:00 |
|
xieqiyu
|
62070301f4
|
* Code for task#81779.
|
2023-01-03 17:04:09 +08:00 |
|
孙广明
|
57c4f5329d
|
Merge branch 'bug_liuhong_30537' into 'zentaopms_281'
Bug liuhong 30537
See merge request easycorp/zentaopms!6664
|
2023-01-03 05:54:30 +00:00 |
|
孙广明
|
f5f9b93684
|
Merge branch '281_liuhong_81781' into 'zentaopms_281'
* Finish task #81781.
See merge request easycorp/zentaopms!6665
|
2023-01-03 05:54:16 +00:00 |
|
liuhong
|
b922f85ecd
|
* Finish task #81781.
|
2023-01-03 04:50:20 +00:00 |
|
xieqiyu
|
5a2b75d24f
|
* Finish task#81780.
|
2023-01-03 10:59:35 +08:00 |
|
liuhong
|
da18b4b7f0
|
* Adjust code for bug #30537.
|
2023-01-03 02:33:48 +00:00 |
|
liuhong
|
9bd8f21ac6
|
* Fix bug #30537.
|
2023-01-03 02:22:37 +00:00 |
|
wangyidong
|
ccec9bcc16
|
Merge branch 'zentaopms279'
|
2023-01-03 08:39:33 +08:00 |
|
朱金勇
|
96871c4f38
|
Merge branch 'lyk_31251' into 'master'
* Fix bug #31251.
See merge request easycorp/zentaopms!6660
|
2022-12-30 11:28:26 +00:00 |
|
liuyongkai
|
43e79f8809
|
* Fix bug #31251.
|
2022-12-30 19:18:38 +08:00 |
|
孙广明
|
8f632d7de8
|
Merge branch 'zenops_46' into 'master'
Merge zenops 46 into master
See merge request easycorp/zentaopms!6656
|
2022-12-30 09:50:44 +00:00 |
|
zhaoke
|
064f241de0
|
* Add clear interval.
|
2022-12-30 09:42:19 +00:00 |
|
liugang
|
6c16d840d5
|
* Optimize the display label of story of the program statistic.
|
2022-12-30 15:41:10 +08:00 |
|
王怡栋
|
99470be30e
|
Merge branch 'cyy_optimize' into 'master'
* Modify text style.
See merge request easycorp/zentaopms!6658
|
2022-12-30 07:19:05 +00:00 |
|
caoyanyi
|
597b11524f
|
* Modify text style.
|
2022-12-30 15:09:44 +08:00 |
|
wangyidong
|
be81b08952
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-12-30 14:48:49 +08:00 |
|
wangyidong
|
6a27d4d272
|
Merge branch 'feedback_1796'
|
2022-12-30 14:48:08 +08:00 |
|
wangyidong
|
f85db70c20
|
* adjust for save weekly.
|
2022-12-30 14:46:20 +08:00 |
|
孙广明
|
b34e312e86
|
* Fix bug #31353.
|
2022-12-30 14:18:50 +08:00 |
|
tanghucheng
|
d837ce9ac4
|
* Fix code style.
|
2022-12-30 14:09:00 +08:00 |
|
liugang
|
de8f9e6372
|
* Update the count of closed projects of each year.
|
2022-12-30 14:08:25 +08:00 |
|
tanghucheng
|
e6a17511b9
|
* Update button name.
|
2022-12-30 14:03:42 +08:00 |
|
tanghucheng
|
720365e1e2
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 14:03:21 +08:00 |
|
zhaoke
|
e095b605f5
|
* Fix bug.
|
2022-12-30 05:54:20 +00:00 |
|
tanghucheng
|
511d82eb97
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 13:50:44 +08:00 |
|
曾刚
|
c6cfa19dd9
|
Merge branch 'master' into 'feedback_1796'
# Conflicts:
# module/testcase/js/browse.js
|
2022-12-30 05:45:51 +00:00 |
|