 李玉春
|
4b223ec01b
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.
See merge request easycorp/zentaopms!657
|
2021-11-30 05:02:41 +00:00 |
|
|
mayue
|
d89aa24c8c
|
* Finish task #44987,44988,44989.
|
2021-11-30 10:32:11 +08:00 |
|
|
王怡栋
|
ef2385a150
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-30 09:38:44 +08:00 |
|
|
王怡栋
|
85d498c5cb
|
* replace lib for markdown to html.
|
2021-11-30 09:38:12 +08:00 |
|
|
李玉春
|
0cf53a32e0
|
Merge branch 'sprint/174_songchenxuan_45048' into 'master'
* Finish task 45048.
See merge request easycorp/zentaopms!650
|
2021-11-29 09:37:35 +00:00 |
|
|
songchenxuan
|
908f51250b
|
* Fix bug #15737.
|
2021-11-29 16:17:04 +08:00 |
|
|
王怡栋
|
21e42772b2
|
* add lang for api.
|
2021-11-29 15:29:00 +08:00 |
|
|
mayue
|
a77510b311
|
* Finish task #44987,44988,44989.
|
2021-11-29 15:11:16 +08:00 |
|
|
王怡栋
|
d41d6cf262
|
* adjust for api.
|
2021-11-26 13:28:45 +08:00 |
|
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
|
李玉春
|
ba8ec26e96
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.
See merge request easycorp/zentaopms!529
|
2021-11-18 09:21:25 +00:00 |
|
|
zhouxin
|
88938892b0
|
Add realBegan for program.
|
2021-11-18 16:49:11 +08:00 |
|
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|
|
zhouxin
|
b658a98de3
|
Fix some problem.
|
2021-11-18 14:13:32 +08:00 |
|
|
王怡栋
|
3510f6ef63
|
* code for task #44321.
|
2021-11-18 11:20:39 +08:00 |
|
|
mayue
|
bf7e878ae4
|
* Fix bug #16257.
|
2021-11-17 17:44:22 +08:00 |
|
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
|
李玉春
|
1161128163
|
Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
* Finish task#44489.
See merge request easycorp/zentaopms!485
|
2021-11-17 06:52:16 +00:00 |
|
|
lizhiqiang
|
6b2a45fa70
|
* Finish task#44489.
|
2021-11-17 14:47:49 +08:00 |
|
|
李玉春
|
3700fa0e63
|
Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
Sprint/170 mayue 44493,44494
See merge request easycorp/zentaopms!484
|
2021-11-17 06:44:22 +00:00 |
|
|
李玉春
|
4d605316d1
|
Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
Finish task #44489.
See merge request easycorp/zentaopms!474
|
2021-11-17 06:36:07 +00:00 |
|
|
mayue
|
51709b88d5
|
* Finish task #44493,44494.
|
2021-11-17 14:32:24 +08:00 |
|
|
mayue
|
8b8c4fe180
|
* Finish task #44493,44494.
|
2021-11-17 09:30:34 +08:00 |
|
|
mayue
|
102561019d
|
* Finish task #44493,44494.
|
2021-11-16 18:20:35 +08:00 |
|
|
mayue
|
7d496eebc2
|
* Finish task #44493,44494.
|
2021-11-16 17:05:03 +08:00 |
|
|
lizhiqiang
|
2212f7473b
|
Finish task #44489.
|
2021-11-16 16:03:07 +08:00 |
|
|
李玉春
|
81f49bd434
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Fix bug #16191.
See merge request easycorp/zentaopms!413
|
2021-11-11 08:01:22 +00:00 |
|
|
mayue
|
c9996a26ec
|
* Fix bug #16191.
|
2021-11-11 15:54:22 +08:00 |
|
|
leiyong
|
088a6374df
|
* Finish task#44172,task#44273.
|
2021-11-11 05:26:27 +00:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
mayue
|
7247a7d4b5
|
* Finish task #43892.
|
2021-11-10 11:13:37 +08:00 |
|
|
王怡栋
|
5f9b3ed654
|
* adjust for lang for api.
|
2021-11-05 13:11:42 +08:00 |
|
|
孙广明
|
5812a1e510
|
Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task #43903
See merge request easycorp/zentaopms!319
|
2021-11-05 03:22:17 +00:00 |
|
|
tianshujie
|
0fa14065b2
|
* Modify the constant name of the branch trunk.
|
2021-11-05 11:20:22 +08:00 |
|
|
tianshujie
|
6cb70ab01d
|
* Finish task #43903.
|
2021-11-05 08:59:55 +08:00 |
|
|
zhouxin
|
8fe8ad90af
|
Finish task 43877.
|
2021-11-04 13:22:09 +08:00 |
|
|
王怡栋
|
3cdf3b3395
|
Merge branch 'sprint/167_wangyidong_api' into sprint/app10
|
2021-11-01 15:35:49 +08:00 |
|
|
root
|
6db04fa88e
|
bug_15467
|
2021-11-01 09:29:45 +08:00 |
|
|
王怡栋
|
076f328914
|
* add lang for zentaoapp and adjust api.
|
2021-10-27 19:58:50 +08:00 |
|
|
xieqiyu
|
9c588bd32e
|
* Finish task#43555.
|
2021-10-27 15:24:29 +08:00 |
|
|
liyuchun
|
b32541f20f
|
* Fix bug #15639.
|
2021-10-19 20:32:06 +08:00 |
|
|
zhujinyong
|
fc2e75eeb8
|
* Fix languages.
|
2021-10-19 15:59:07 +08:00 |
|
|
王怡栋
|
6ee64dffe7
|
Merge branch 'api_doc' into sprint/167
|
2021-10-19 11:36:19 +08:00 |
|
|
王怡栋
|
352ec4d0b4
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-18 16:04:22 +08:00 |
|
|
王怡栋
|
775f9942d2
|
* fix bug #15553.
|
2021-10-18 16:03:42 +08:00 |
|
|
hufangzhou
|
c4824ba3d7
|
* Check the code for upgrade.
|
2021-10-18 13:11:07 +08:00 |
|
|
王怡栋
|
72c92b6b0d
|
* fix error.
|
2021-10-18 09:06:48 +08:00 |
|
|
王怡栋
|
5e0ac98809
|
Merge branch 'sprint/167_wangyidong' into sprint/167
|
2021-10-18 08:53:30 +08:00 |
|