 李玉春
|
7c9add376d
|
Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376
See merge request easycorp/zentaopms!530
|
2021-11-18 09:20:35 +00: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 |
|
|
songchenxuan
|
f92a67b62a
|
* Fix bug 16376
|
2021-11-18 17:09:42 +08:00 |
|
|
songchenxuan
|
1f9f382aa0
|
* Fix bug 16376
|
2021-11-18 17:06:44 +08:00 |
|
|
李玉春
|
644abad1fb
|
Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.
See merge request easycorp/zentaopms!523
|
2021-11-18 07:37:37 +00:00 |
|
|
tianshujie
|
662a1960f5
|
* Fix bug #16431.
|
2021-11-18 15:35:54 +08:00 |
|
|
tianshujie
|
eac30e4699
|
* Modify code.
|
2021-11-18 15:12:38 +08:00 |
|
|
tianshujie
|
0a03aea29a
|
* Fix bug #16396.
|
2021-11-18 15:07:51 +08:00 |
|
|
songchenxuan
|
745a2e3fea
|
* Code for test-bug.
|
2021-11-18 13:42:47 +08:00 |
|
|
李玉春
|
e41ccac2b7
|
Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
# module/build/view/create.html.php
# module/project/model.php
|
2021-11-18 05:15:10 +00:00 |
|
|
李玉春
|
8639b02e76
|
Merge branch 'sprint/170_songchenxuan_44490' into 'sprint/170'
Sprint/170 songchenxuan 44490
See merge request easycorp/zentaopms!501
|
2021-11-18 05:12:40 +00:00 |
|
|
songchenxuan
|
000728b47e
|
* Finish task 44490.
|
2021-11-18 09:11:57 +08:00 |
|
|
李玉春
|
fc7c9acb30
|
Merge branch 'sprint/170_tianshujie_16367' into 'sprint/170'
* Fix bug #16367.
See merge request easycorp/zentaopms!494
|
2021-11-18 00:57:39 +00:00 |
|
|
tianshujie
|
858f8327ef
|
* Fix bug #16367.
|
2021-11-18 08:46:35 +08:00 |
|
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
|
wangjianhua
|
4fd69c6661
|
* Finish task 44503.
|
2021-11-17 09:59:16 +00:00 |
|
|
tianshujie
|
8df6bbbc1e
|
* Fix bug #16396.
|
2021-11-17 17:52:38 +08:00 |
|
|
tianshujie
|
8473895bd2
|
* Restore update logic.
|
2021-11-17 17:50:07 +08:00 |
|
|
songchenxuan
|
c75f8941e5
|
* Finish task 44490
|
2021-11-17 17:44:10 +08:00 |
|
|
tianshujie
|
b61872bcd0
|
* Fix bug #16367.
|
2021-11-17 17:43:42 +08:00 |
|
|
tianshujie
|
152e27b1a8
|
* Fix bug #16367.
|
2021-11-17 17:38:42 +08:00 |
|
|
songchenxuan
|
328527a5bd
|
* Finish task 44490
|
2021-11-17 17:28:28 +08:00 |
|
|
songchenxuan
|
5b00c80c4c
|
* Finish task 44490
|
2021-11-17 17:19:29 +08:00 |
|
|
songchenxuan
|
8cd05d8301
|
* Finish task 44490.
|
2021-11-17 16:22:43 +08:00 |
|
|
songchenxuan
|
1dab48045e
|
* Finish task 44490.
|
2021-11-17 15:39:30 +08:00 |
|
|
zhengrunyu
|
db4be7990d
|
*Finish task #44501.
|
2021-11-17 10:06:56 +08:00 |
|
|
tianshujie
|
34ad92ab78
|
* Modify the judgment logic.
|
2021-11-11 17:50:47 +08:00 |
|
|
tianshujie
|
b218a43b63
|
* Fix bug #16195.
|
2021-11-11 17:38:27 +08:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
|
liyuchun
|
a588e38cbc
|
* Finish task #43178.
|
2021-10-11 14:58:22 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
zenggang
|
f139f00e61
|
* Task 42862,previously committed to the master branch, now resubmit to the 165 branch
|
2021-09-30 11:19:05 +08:00 |
|
|
liyuchun
|
9b5a28392b
|
* Finish task #42854.
|
2021-09-28 12:31:59 +08:00 |
|
|
hufangzhou
|
bc6f0a2ea8
|
* Fix bug #15240.
|
2021-09-17 16:39:45 +08:00 |
|
|
zhujinyong
|
798c0b202c
|
* Fix GET builds and projects of API.
|
2021-09-10 10:14:22 +08:00 |
|
|
zenggang
|
a8c1cd4c6a
|
* Fix builds post、put api
|
2021-09-09 17:59:11 +08:00 |
|
|
zenggang
|
f5e33aee87
|
* Finish task#42101
|
2021-09-08 11:14:30 +08:00 |
|
|
tianshujie
|
1d87bcb08b
|
* Fix bug #14890.
|
2021-09-03 10:50:31 +08:00 |
|
|
王怡栋
|
4eee4d5523
|
Merge branch '15.4'
|
2021-09-02 19:21:30 +08:00 |
|
|
zhujinyong
|
664e290f97
|
* Rename openApp to tab.
|
2021-08-31 00:30:48 +08:00 |
|
|
zenggang
|
ad66c56b0a
|
* Finish task#41691
|
2021-08-27 15:19:52 +08:00 |
|
|
王怡栋
|
c6922215ae
|
* fix bug for edit build and compute userview.
|
2021-08-27 14:42:14 +08:00 |
|
|
liyuchun
|
316d32a696
|
* Code for task #41764.
|
2021-08-26 10:05:40 +08:00 |
|
|
qiyu-xie
|
973e8be6cc
|
* Finish task#41538.
|
2021-08-24 07:58:16 +08:00 |
|
|
tianshujie98
|
15f32acefe
|
* Finish task #41693.
|
2021-08-23 11:28:47 +08:00 |
|
|
tianshujie98
|
18ae5d27ba
|
* Fix the problem that the name of the edited release build under the project is displayed incorrectly.
|
2021-08-20 11:02:03 +08:00 |
|
|
孙广明
|
34c8aa1423
|
* Fix build can't remove branch bug.
|
2021-08-12 15:04:09 +08:00 |
|