 王怡栋
|
6a3af094fe
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20234,20022
See merge request easycorp/zentaopms!2072
|
2022-03-04 06:38:10 +00:00 |
|
|
Zongjun Lan
|
a2e18288cf
|
* fix bug 20022
|
2022-03-04 14:31:27 +08:00 |
|
|
Zongjun Lan
|
23d699311d
|
* fix bug 20022
|
2022-03-04 14:27:25 +08:00 |
|
|
tianshujie
|
6dc0d7a70d
|
* Solve the problem that the project field of the pending task list is 0.
|
2022-03-04 09:04:02 +08:00 |
|
|
Zongjun Lan
|
7312bfe658
|
* rollback code
|
2022-03-03 14:21:44 +08:00 |
|
|
Zongjun Lan
|
cdf4b29e29
|
* fix bug 20030
|
2022-03-02 18:43:41 +08:00 |
|
|
Zongjun Lan
|
f4970f502d
|
* fix bug 20023
|
2022-03-01 16:34:34 +08:00 |
|
|
hufangzhou
|
8a71dc32bb
|
* Fix bug #20155.
|
2022-03-01 09:29:26 +08:00 |
|
|
hufangzhou
|
b79cd2db12
|
* Fix bug #20119.
|
2022-02-28 14:27:46 +08:00 |
|
|
Zongjun Lan
|
8dd88cb766
|
* fix task 49335
|
2022-02-28 11:02:52 +08:00 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
孙广明
|
25f71e0a51
|
Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
# module/task/model.php
|
2022-02-25 00:41:58 +00:00 |
|
|
王怡栋
|
a6c782de7b
|
Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* move to extension
See merge request easycorp/zentaopms!1963
|
2022-02-24 09:06:41 +00:00 |
|
|
Zongjun Lan
|
2cc1105512
|
* fix move extensions to module
|
2022-02-24 16:59:39 +08:00 |
|
|
liumengyi
|
9bd39c1e98
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:44:11 +08:00 |
|
|
Zongjun Lan
|
d97c7ee4a2
|
* move to extension
|
2022-02-24 16:22:27 +08:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
孙广明
|
39c8e0a2e7
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong
See merge request easycorp/zentaopms!1957
|
2022-02-24 08:09:43 +00:00 |
|
|
zhengrunyu
|
8d34b3ef8b
|
*Fixbug 19999.
|
2022-02-24 14:52:56 +08:00 |
|
|
zhengrunyu
|
4e392ea7b2
|
* Fixbug 19999.
|
2022-02-24 14:48:36 +08:00 |
|
|
王怡栋
|
392c0d7264
|
Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49355
See merge request easycorp/zentaopms!1933
|
2022-02-24 05:13:38 +00:00 |
|
|
Zongjun Lan
|
cf40dbba88
|
remove a line
|
2022-02-24 13:11:37 +08:00 |
|
|
Zongjun Lan
|
8d397cac21
|
* Fix bug #49355
|
2022-02-24 08:53:13 +08:00 |
|
|
王怡栋
|
189158dabd
|
Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong
|
2022-02-23 17:01:24 +08:00 |
|
|
王怡栋
|
f34bce05bf
|
* code for task #49401.
|
2022-02-23 17:00:55 +08:00 |
|
|
王怡栋
|
4fe35caf8e
|
Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49335
See merge request easycorp/zentaopms!1910
|
2022-02-23 04:58:52 +00:00 |
|
|
Zongjun Lan
|
245a062277
|
modify code format
|
2022-02-23 11:34:17 +08:00 |
|
|
Zongjun Lan
|
91f09fe484
|
modify code format
|
2022-02-23 11:27:10 +08:00 |
|
|
Zongjun Lan
|
f6b9ade20a
|
* Fix bug #49335
|
2022-02-23 11:07:27 +08:00 |
|
|
tanghucheng
|
09450e0023
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_tanghucheng_49697
|
2022-02-23 10:59:35 +08:00 |
|
|
tanghucheng
|
adb6f14e59
|
* Code for task #49697.
|
2022-02-23 10:39:51 +08:00 |
|
|
王怡栋
|
545ba95f90
|
* code for task #49372.
|
2022-02-23 09:55:38 +08:00 |
|
|
孙广明
|
e4552821b0
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# extension/lite/action/ext/lang/zh-cn/lite.php
|
2022-02-23 01:54:46 +00:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
孙广明
|
054dd42a65
|
Merge branch 'sprint/185_zhangzilong_49284' into 'sprint/185'
*Fix bug 19780.
See merge request easycorp/zentaopms!1895
|
2022-02-23 01:21:39 +00:00 |
|
|
zhangzilong
|
8d9439d0e6
|
* Fix bug #19780.
|
2022-02-23 08:57:32 +08:00 |
|
|
tanghucheng
|
6b2bc49830
|
* Finish task #49409.
|
2022-02-22 16:59:09 +08:00 |
|
|
王怡栋
|
39fad91f7e
|
* code for task #49372.
|
2022-02-22 16:28:43 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
tanghucheng
|
422811bcbd
|
* code for task #49697.
|
2022-02-21 17:01:42 +08:00 |
|
|
王怡栋
|
0cb4581eec
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.
See merge request easycorp/zentaopms!1856
|
2022-02-21 05:21:01 +00:00 |
|
|
tanghucheng
|
510e7397d4
|
* Finish task #49697.
|
2022-02-21 13:12:51 +08:00 |
|
|
liumengyi
|
fe8f6bb4dd
|
* Modify getUserSuspendTasks.
|
2022-02-18 15:52:25 +08:00 |
|
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +08:00 |
|
|
zhengrunyu
|
aa444513d6
|
* Finish task 49283.
|
2022-02-17 16:13:24 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
hufangzhou
|
2edcb893be
|
* Adjust the code.
|
2022-02-16 16:47:02 +08:00 |
|
|
hufangzhou
|
d355e858b4
|
* Fix bug #19675.
|
2022-02-16 16:26:13 +08:00 |
|
|
tianshujie
|
e22bd59961
|
* Fix bug #19306.
|
2022-02-16 09:57:17 +08:00 |
|
|
hufangzhou
|
f9cc2702f9
|
* Fix bug #19649.
|
2022-02-16 09:24:11 +08:00 |
|