 zhouxin
|
735c0eae85
|
Fix bug #18245.
|
2022-01-06 02:37:08 +00:00 |
|
|
zhouxin
|
d34b83cd96
|
Fix bug #18201.
|
2022-01-05 05:54:10 +00:00 |
|
|
zhouxin
|
ee431f18e3
|
Fix bug #18199.
|
2022-01-05 05:09:08 +00:00 |
|
|
李玉春
|
3125190938
|
Merge branch 'devops18_caoyanyi' into 'master'
* Finish task #47051.
See merge request easycorp/zentaopms!1259
|
2022-01-05 02:29:38 +00:00 |
|
|
caoyanyi
|
5d9dc4885b
|
* Finish task #47051.
|
2022-01-05 02:03:30 +00:00 |
|
|
zhujinyong
|
90ffee0f0c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-05 09:06:07 +08:00 |
|
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
|
李玉春
|
76a3ebdd7b
|
Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fixbug 18172.
See merge request easycorp/zentaopms!1257
|
2022-01-04 08:50:03 +00:00 |
|
|
zhengrunyu
|
18a744763f
|
*Fixbug 18172.
|
2022-01-04 16:47:33 +08:00 |
|
|
王怡栋
|
2df95c203e
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18150.
See merge request easycorp/zentaopms!1256
|
2022-01-04 08:17:56 +00:00 |
|
|
liyuchun
|
2c5d8abc45
|
* Fix bug #18150.
|
2022-01-04 16:15:17 +08:00 |
|
|
孙广明
|
a4f76848ec
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Add maximum width for plan title.
See merge request easycorp/zentaopms!1255
|
2022-01-04 08:15:02 +00:00 |
|
|
liumengyi
|
cc2601a4d5
|
* Add maximum width for plan title.
|
2022-01-04 16:08:38 +08:00 |
|
|
孙广明
|
087cc82369
|
Merge branch 'sprint/32_zhouxin_46683' into 'master'
Sprint/32 zhouxin 46683
See merge request easycorp/zentaopms!1253
|
2022-01-04 07:48:53 +00:00 |
|
|
zhouxin
|
68f27d5fd8
|
Change geshi.
|
2022-01-04 07:48:11 +00:00 |
|
|
李玉春
|
de825118bc
|
Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fix bug 18168.
See merge request easycorp/zentaopms!1252
|
2022-01-04 07:37:30 +00:00 |
|
|
zhengrunyu
|
41eeabc074
|
*Fix bug 18168.
|
2022-01-04 15:32:54 +08:00 |
|
|
zhouxin
|
d44067f4e6
|
Fix a bug.
|
2022-01-04 07:31:20 +00:00 |
|
|
王怡栋
|
a4ed3b0319
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Add unit cases.
See merge request easycorp/zentaopms!1251
|
2022-01-04 07:18:49 +00:00 |
|
|
李玉春
|
0d673c2e97
|
Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fix bug 18165.
See merge request easycorp/zentaopms!1250
|
2022-01-04 07:18:02 +00:00 |
|
|
liyuchun
|
c8786ef9ee
|
* Adjust unit case.
|
2022-01-04 15:16:53 +08:00 |
|
|
liyuchun
|
a6f469e461
|
* Add unit cases.
|
2022-01-04 15:10:28 +08:00 |
|
|
zhengrunyu
|
f06de76227
|
*Fix bug 18165.
|
2022-01-04 14:50:44 +08:00 |
|
|
孙广明
|
b1d0c553a1
|
Merge branch 'zhengry_codeedit' into 'master'
*Code edit.
See merge request easycorp/zentaopms!1247
|
2022-01-04 04:19:32 +00:00 |
|
|
zhengrunyu
|
0d05a3aa8c
|
*Code edit.
|
2022-01-04 12:00:42 +08:00 |
|
|
王怡栋
|
36a1c6f8a9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-04 11:29:53 +08:00 |
|
|
王怡栋
|
7001079844
|
* adjust for block priv.
|
2022-01-04 11:28:43 +08:00 |
|
|
李玉春
|
7739f455a0
|
Merge branch 'sgm_changevar' into 'master'
* Merge code.
See merge request easycorp/zentaopms!1246
|
2022-01-04 03:26:17 +00:00 |
|
|
孙广明
|
e370a094a9
|
* Merge code.
|
2022-01-04 11:08:30 +08:00 |
|
|
孙广明
|
a92e8b5435
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code...
See merge request easycorp/zentaopms!1244
|
2022-01-04 03:04:16 +00:00 |
|
|
zhujinyong
|
87817d186c
|
* Fix router error of api.
|
2022-01-04 10:52:29 +08:00 |
|
|
zhujinyong
|
17384dcb06
|
* Fix bug: super model must return.
|
2022-01-04 10:27:09 +08:00 |
|
|
zhengrunyu
|
7e037ff68d
|
*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.
|
2022-01-04 10:27:06 +08:00 |
|
|
李玉春
|
c5bd97f292
|
Merge branch 'sgm_46671' into 'master'
* Fix productplan bug.
See merge request easycorp/zentaopms!1243
|
2022-01-04 02:21:19 +00:00 |
|
|
孙广明
|
feb80b05d5
|
* Fix productplan bug.
|
2022-01-04 10:18:48 +08:00 |
|
|
李玉春
|
1f72bd497a
|
Merge branch 'sgm_46671' into 'master'
* Code for task 46671.
See merge request easycorp/zentaopms!1239
|
2022-01-04 02:05:58 +00:00 |
|
|
孙广明
|
9a76f5048e
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code edit.
See merge request easycorp/zentaopms!1241
|
2022-01-04 02:05:18 +00:00 |
|
|
zhouxin
|
68647da31c
|
Finish task #46683.
|
2022-01-04 01:57:16 +00:00 |
|
|
zhengrunyu
|
96c9cd54d2
|
*Code edit.
|
2022-01-04 09:56:35 +08:00 |
|
|
孙广明
|
5a7cd21296
|
Merge branch 'sprint/181_tianshujie_18143' into 'master'
* Fix bug #18143.
See merge request easycorp/zentaopms!1240
|
2022-01-04 01:56:19 +00:00 |
|
|
tianshujie
|
6ae2c2aaab
|
* Fix bug #18143.
|
2022-01-04 09:54:07 +08:00 |
|
|
孙广明
|
ba570f1467
|
* Code for task 46671.
|
2022-01-04 09:27:44 +08:00 |
|
|
孙广明
|
393371607e
|
Merge branch 'sprint/181_tianshujie_optimize' into 'master'
* Modify the batch editing plan logic.
See merge request easycorp/zentaopms!1237
|
2022-01-04 01:01:52 +00:00 |
|
|
tianshujie
|
58a4ebb665
|
* Modify the code format of productplan mode file.
|
2022-01-04 09:00:21 +08:00 |
|
|
tianshujie
|
3c174fbb7f
|
* Optimize the code for judging whether the time is correct.
|
2022-01-03 13:30:22 +08:00 |
|
|
tianshujie
|
ece63ad3c0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_optimize
|
2022-01-03 13:21:24 +08:00 |
|
|
Hao Sun
|
a9cc771d85
|
Revert "Revert "Merge branch 'devops18_caoyanyi' into 'master'""
This reverts commit 3a0ec82016.
|
2021-12-31 17:35:39 +08:00 |
|
|
Hao Sun
|
3a0ec82016
|
Revert "Merge branch 'devops18_caoyanyi' into 'master'"
This reverts commit 41004048b2, reversing
changes made to 86fb6e2680.
|
2021-12-31 17:22:32 +08:00 |
|
|
Hao Sun
|
3bf672f1f3
|
* Fix chat button not show in biz edition caused by ZentaoPHP ext rule: one control method Ican only be extended once time.
|
2021-12-31 17:20:59 +08:00 |
|
|
tianshujie
|
0ec08bca7d
|
* Adjust the code.
|
2021-12-31 15:58:00 +08:00 |
|