 tianshujie
|
23f5c939ae
|
* Finish task #68934.
|
2022-09-21 10:10:14 +08:00 |
|
|
zhouxudong
|
45ace8beb5
|
* Fix bug #25103.
|
2022-07-27 09:11:56 +00:00 |
|
|
zhouxudong
|
26babb4762
|
* Fix bug #25105.
|
2022-07-14 01:58:45 +00:00 |
|
|
王怡栋
|
1aa2f24efc
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of create project when select all branch.
See merge request easycorp/zentaopms!4470
|
2022-07-12 07:00:55 +00:00 |
|
|
王怡栋
|
7bc7fe0e54
|
Merge branch 'sprint/master_zhouxudong_60389' into 'master'
Sprint/master zhouxudong 60389
See merge request easycorp/zentaopms!4451
|
2022-07-11 07:56:48 +00:00 |
|
|
zhouxudong
|
d2fe52d3b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 06:55:36 +00:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
zhouxudong
|
b5475f51b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 03:28:17 +00:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
xieqiyu
|
74f38571af
|
* Fix bug of create project when select all branch.
|
2022-07-01 13:54:38 +08:00 |
|
|
xieqiyu
|
727446a03b
|
* Fix bug of edit and close branch button.
|
2022-07-01 13:22:09 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
xieqiyu
|
c1bc3c7d41
|
* Fix bug of select main branch.
|
2022-06-01 20:44:31 +08:00 |
|
|
xieqiyu
|
5f5f721d19
|
* Finish task#55631.
|
2022-06-01 00:26:43 +08:00 |
|
|
xieqiyu
|
63032ffe42
|
* Fix bug#21936.
|
2022-04-22 15:57:57 +08:00 |
|
|
mayue
|
5f5cc8768e
|
* Fix bug #21904.
|
2022-04-21 15:04:59 +08:00 |
|
|
hufangzhou
|
9b6857a689
|
* Fix bug #17933.
|
2022-04-19 15:47:26 +08:00 |
|
|
孙广明
|
95faa5d390
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add unit test of branch.
See merge request easycorp/zentaopms!2998
|
2022-04-18 09:01:51 +00:00 |
|
|
liumengyi
|
bdbf43362d
|
* Add unit test of branch.
|
2022-04-18 17:00:06 +08:00 |
|
|
hufangzhou
|
ddb4ab243a
|
* Remove the unused code.
|
2022-04-18 15:00:51 +08:00 |
|
|
hufangzhou
|
281fa51fc1
|
* Fix bug #21822.
|
2022-04-18 14:58:06 +08:00 |
|
|
孙华伟
|
a5d6663342
|
* Fix bug #20316.
|
2022-04-18 10:55:42 +08:00 |
|
|
孙华伟
|
fb57638d07
|
*Hide change default branch feature.
|
2022-04-11 13:47:26 +08:00 |
|
|
xieqiyu
|
8aaaeafcb3
|
* Modify review code.
|
2022-04-07 17:22:15 +08:00 |
|
|
xieqiyu
|
1a59190992
|
* Fix bug#21550.
|
2022-04-07 17:09:41 +08:00 |
|
|
mayue
|
db41ae487b
|
* Fix bug #17360.
|
2022-04-01 09:15:57 +08:00 |
|
|
mayue
|
ba263d1b90
|
* Fix bug #17342.
|
2022-03-31 14:14:36 +08:00 |
|
|
songchenxuan
|
7a9afd7052
|
*AjaxGetBranches function code format.
|
2022-03-24 15:39:35 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
xieqiyu
|
9024dae71e
|
* Modify linked products when edit product.
|
2022-02-28 10:15:16 +08:00 |
|
|
xieqiyu
|
9fa66c3d0f
|
* Code for task#49304.
|
2022-02-24 14:40:14 +08:00 |
|
|
zhujinyong
|
1f8e1b0021
|
* Fix return print() -> return.
|
2022-02-22 09:35:25 +08:00 |
|
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
hufangzhou
|
44783c6933
|
* Fix bug #17999.
|
2021-12-27 18:08:09 +08:00 |
|
|
hufangzhou
|
4b2890c766
|
* Add the new version.
|
2021-12-24 15:01:04 +08:00 |
|
|
xieqiyu
|
1491db714d
|
* Fix bug: batch update branch.
|
2021-12-24 13:45:05 +08:00 |
|
|
xieqiyu
|
c9eaa1cb0d
|
* Add a period.
|
2021-12-24 09:51:07 +08:00 |
|
|
hufangzhou
|
5a8966c8e8
|
* Fix bug #17903.
|
2021-12-23 17:28:29 +08:00 |
|
|
hufangzhou
|
897f930f48
|
* Adjust the merge branch page style.
|
2021-12-23 14:01:25 +08:00 |
|
|
孙广明
|
f5da2d8a21
|
Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master'
* Finish task #46096.
See merge request easycorp/zentaopms!1095
|
2021-12-23 03:32:01 +00:00 |
|
|
hufangzhou
|
e1075ca205
|
* Finish task #46096.
|
2021-12-23 11:29:51 +08:00 |
|
|
孙广明
|
7bdb0499e9
|
Merge branch 'master' into 'sprint/178_songchenxuan_46100'
# Conflicts:
# module/productplan/view/batchedit.html.php
# module/productplan/view/browse.html.php
|
2021-12-23 02:46:03 +00:00 |
|
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
|
hufangzhou
|
10c2f33c2b
|
* Adjust the issue of merge branch.
|
2021-12-22 08:50:42 +08:00 |
|
|
zhujinyong
|
42fc345e2a
|
Merge branch 'sprint/176_xieqiyu_mergeBranch'
|
2021-12-21 16:12:48 +08:00 |
|
|
hufangzhou
|
2809bc0b94
|
* Perfect details.
|
2021-12-21 15:42:26 +08:00 |
|