 hufangzhou
|
98ec568b0f
|
* Fix bug #16140.
|
2021-11-10 14:48:09 +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 |
|
|
hufangzhou
|
a80cdfd6ec
|
Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920
|
2021-11-10 09:49:31 +08:00 |
|
|
hufangzhou
|
9fa76f6912
|
* Modify the action of main branch.
|
2021-11-10 09:49:29 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
tianshujie
|
35504f6745
|
* Combine the acquisition branch into a function.
|
2021-11-10 09:17:28 +08:00 |
|
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +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
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
|
xieqiyu
|
1c4840c2c0
|
* Fix a bug.
|
2021-11-09 09:11:16 +08:00 |
|
|
xieqiyu
|
8f2deab146
|
* Adjust code style.
|
2021-11-08 17:22:29 +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
|
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 |
|
|
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
|
1424fbe869
|
* Modify the error.
|
2021-11-05 16:04:39 +08:00 |
|
|
tianshujie
|
77da777064
|
* Finish task #43893.
|
2021-11-05 15:46:52 +08:00 |
|
|
xieqiyu
|
d74ce66445
|
* Code for task#43919.
|
2021-11-05 08:45:34 +08:00 |
|
|
zhujinyong
|
1677574443
|
* return before $this->send.
|
2021-07-16 09:40:41 +08:00 |
|
|
holan20180123
|
9fd362073f
|
* Return id when create object by api.
|
2021-05-12 15:23:13 +08:00 |
|
|
hufangzhou
|
c19ad08621
|
* Finish task #37530.
|
2021-04-15 14:38:39 +08:00 |
|
|
hufangzhou
|
b8138c41cc
|
* Fix bug #11953.
|
2021-04-12 10:27:45 +08:00 |
|
|
zhujinyong
|
82428349ad
|
* Rename session->PRJ to session->project.
|
2021-03-22 12:03:10 +08:00 |
|
|
zhujinyong
|
f94a272a2c
|
+ Add branch menu of product.
|
2021-03-22 10:43:17 +08:00 |
|
|
Yagami
|
d802f35bdc
|
* Fix branch menu.
|
2021-03-17 13:49:47 +08:00 |
|
|
hufangzhou
|
abd9b39619
|
* Finish task#8868, task#8873.
|
2021-01-01 15:16:34 +08:00 |
|
|
leiyong
|
4f2775d77a
|
* Adjust the projectstory module.
|
2020-11-26 13:10:08 +08:00 |
|
|
leiyong
|
8052f2ce8f
|
* Adjust product module code.
|
2020-09-28 11:27:06 +08:00 |
|
|
Yagami
|
abd35a44c5
|
* Fix sql and add branch menu.
|
2020-09-28 10:51:12 +08:00 |
|
|
Yagami
|
be6bc36c8d
|
* Fix branch menu.
|
2020-09-23 17:31:00 +08:00 |
|
|
Yagami
|
66f4f5403a
|
* Fix sql and rename program to PRJ.
|
2020-09-16 11:28:55 +08:00 |
|
|
holan20180123
|
1111520481
|
* Adjust doc browse.
|
2020-09-03 17:34:24 +08:00 |
|
|
holan20180123
|
7a661001da
|
* Finish task #7758.
|
2020-08-31 14:57:44 +08:00 |
|
|
wangyidong
|
dc812fd161
|
* adjust code.
|
2017-03-21 15:06:38 +08:00 |
|
|
wangyidong
|
f3f18a3401
|
* finish task #2761,2732.
|
2016-11-21 17:02:44 +08:00 |
|
|
wangyidong
|
f3e552f275
|
* fix sprintf with %branch%.
|
2016-03-23 13:45:08 +08:00 |
|
|
wangyidong
|
c657433fa2
|
* adjust code and fix bug.
|
2015-11-20 10:45:18 +08:00 |
|
|
wangyidong
|
2d61ca8d34
|
* change zh-tw.
|
2015-11-13 10:55:50 +08:00 |
|