 xieqiyu
|
877ebd38ad
|
* Delete unused code.
|
2021-11-11 09:37:40 +08:00 |
|
|
xieqiyu
|
00ced21b19
|
* Optimize the code.
|
2021-11-11 09:34:30 +08:00 |
|
|
xieqiyu
|
d2685055cb
|
* Fix a bug.
|
2021-11-10 15:44:17 +08:00 |
|
|
xieqiyu
|
880f91a3d2
|
* Add duplicate name judgment.
|
2021-11-10 15:32:05 +08:00 |
|
|
xieqiyu
|
50b928ac9b
|
* Fix bug#16143.
|
2021-11-10 14:48:37 +08:00 |
|
|
xieqiyu
|
36b9634059
|
* Add duplicate name judgment.
|
2021-11-10 14:21:47 +08:00 |
|
|
李玉春
|
8165200c74
|
Merge branch 'sprint/170_xieqiyu_43920' into 'sprint/170'
Sprint/170 xieqiyu 43920
See merge request easycorp/zentaopms!378
|
2021-11-10 05:20:01 +00:00 |
|
|
xieqiyu
|
089238bd79
|
* Modify review questions.
|
2021-11-10 12:26:55 +08:00 |
|
|
xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +08:00 |
|
|
xieqiyu
|
adaa7cd1d2
|
* Add dynamic when batch edit main branch.
|
2021-11-10 09:50:43 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
xieqiyu
|
76651524d9
|
* Add order.
|
2021-11-09 20:10:07 +08:00 |
|
|
xieqiyu
|
0a3dc10f4a
|
* Finish task#43905.
|
2021-11-09 19:46:08 +08:00 |
|
|
hufangzhou
|
9f77cc6fb6
|
* Finish task #43898.
|
2021-11-09 17:16:30 +08:00 |
|
|
xieqiyu
|
d889184204
|
* Finish task#43920.
|
2021-11-09 16:17:15 +08:00 |
|
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
|
tianshujie
|
eedcc1aed5
|
* Modify code logic.
|
2021-11-09 10:28:16 +08:00 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
|
xieqiyu
|
74c1b31476
|
* Fix bug#16051.
|
2021-11-08 16:37:19 +08:00 |
|
|
xieqiyu
|
b483b28d80
|
* Conflict resolution.
|
2021-11-08 14:18:57 +08:00 |
|
|
李玉春
|
7692460500
|
Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170'
Finish task#44028.
See merge request easycorp/zentaopms!327
|
2021-11-08 06:08:31 +00:00 |
|
|
李玉春
|
9fe54a903c
|
Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new'
# Conflicts:
# module/branch/control.php
|
2021-11-08 05:53:39 +00:00 |
|
|
xieqiyu
|
866c7adc75
|
* Code for task#43902.
|
2021-11-08 13:53:16 +08:00 |
|
|
xieqiyu
|
c15b6e7e61
|
* Code for task#43902.
|
2021-11-08 13:36:43 +08:00 |
|
|
李玉春
|
c65c9b2384
|
Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170'
* Finish task #43893.
See merge request easycorp/zentaopms!325
|
2021-11-08 01:36:37 +00:00 |
|
|
tianshujie
|
c5779575c1
|
* Modify code logic.
|
2021-11-08 09:29:45 +08:00 |
|
|
xieqiyu
|
acf5b15c06
|
* Code for task#43902.
|
2021-11-08 09:20:57 +08:00 |
|
|
qiyu-xie
|
f22b3ea149
|
* Code for task#43902.
|
2021-11-07 18:12:57 +08:00 |
|
|
qiyu-xie
|
f94e0ecb08
|
* Code for task#44028.
|
2021-11-07 16:05:02 +08:00 |
|
|
qiyu-xie
|
8f902ccf2d
|
* Code fot task#44028.
|
2021-11-07 13:44:24 +08:00 |
|
|
xieqiyu
|
988bb5c774
|
* Code for task#44028.
|
2021-11-05 17:25:27 +08:00 |
|
|
tianshujie
|
77da777064
|
* Finish task #43893.
|
2021-11-05 15:46:52 +08:00 |
|
|
胡方舟
|
21cd984c78
|
Merge branch 'sprint/170' into 'sprint/170_xieqiyu_43919'
# Conflicts:
# db/zentao.sql
|
2021-11-05 06:56:47 +00:00 |
|
|
xieqiyu
|
7992f18ea3
|
* Code for task#43919. Modify review questions.
|
2021-11-05 14:50:15 +08:00 |
|
|
xieqiyu
|
8b7616a626
|
* Code for task#43919. Add lang and main default.
|
2021-11-05 13:48:09 +08:00 |
|
|
tianshujie
|
fcfa4a9064
|
* Add all options in the branch drop-down.
|
2021-11-05 09:25:47 +08:00 |
|
|
tianshujie
|
6cb70ab01d
|
* Finish task #43903.
|
2021-11-05 08:59:55 +08:00 |
|
|
xieqiyu
|
d74ce66445
|
* Code for task#43919.
|
2021-11-05 08:45:34 +08:00 |
|
|
qiyu-xie
|
c9ee925c65
|
* When execution manage products, make the normal product without 'has-branch' class.
|
2021-07-20 08:24:19 +08:00 |
|
|
Yagami
|
fbd2d87db8
|
* Verify branch name.
|
2021-06-16 16:01:57 +08:00 |
|
|
wangyidong
|
769e6b433b
|
* merge from 15.0.beta3.
|
2021-06-05 13:01:53 +08:00 |
|
|
holan20180123
|
39a273978c
|
* Fix task #36447.
|
2021-03-12 15:01:08 +08:00 |
|
|
leiyong
|
4f2775d77a
|
* Adjust the projectstory module.
|
2020-11-26 13:10:08 +08:00 |
|
|
wangyidong
|
7dc69e1f83
|
* code for htmlspecialchars_decode branch name.
|
2020-05-15 11:21:06 +08:00 |
|
|
wangyidong
|
630c2a87e7
|
* get all branch for workflowdatasource.
|
2019-11-07 11:29:29 +08:00 |
|
|
wangyidong
|
17b53acaa9
|
* finish task #6161.
|
2019-07-30 15:38:49 +08:00 |
|
|
jinianlan
|
c90aac3512
|
* finish task #6166,#6149,6139
|
2019-07-29 15:54:08 +08:00 |
|
|
wangyidong
|
2671f7a044
|
* finish task #6090.
|
2019-07-15 15:56:31 +08:00 |
|
|
wangyidong
|
3b54364860
|
* code for task #5673.
|
2019-06-11 08:20:49 +08:00 |
|
|
wangyidong
|
e825abcc97
|
* finish task #5410.
|
2019-04-26 13:59:45 +08:00 |
|