 李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
|
tianshujie
|
4245745bec
|
* Finish task #72351.
|
2022-10-17 16:31:40 +08:00 |
|
|
tianshujie
|
80b66aea5c
|
* Fix bug #28490.
|
2022-10-17 11:12:48 +08:00 |
|
|
wangzemei
|
478bbcc87c
|
* Fix bug #28447
|
2022-10-14 17:21:37 +08:00 |
|
|
王怡栋
|
af516229bb
|
Merge branch 'bug_28518' into 'master'
* Fix bug#28518
See merge request easycorp/zentaopms!5749
|
2022-10-14 04:17:35 +00:00 |
|
|
王怡栋
|
edf6de9fe9
|
Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499
See merge request easycorp/zentaopms!5741
|
2022-10-14 00:39:49 +00:00 |
|
|
zenggang
|
c7086c8d77
|
* Fix bug#28518
|
2022-10-13 07:50:54 +00:00 |
|
|
guofeilong
|
c46cf29a2c
|
* fix bug * 28499
|
2022-10-12 07:52:09 +00:00 |
|
|
wangzemei
|
01a12c95d9
|
* fix bug #283950
|
2022-10-11 16:42:59 +08:00 |
|
|
tianshujie
|
0b49c19866
|
* Fix bug #28451.
|
2022-10-11 14:53:01 +08:00 |
|
|
李玉春
|
bd488328ab
|
Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875
See merge request easycorp/zentaopms!5716
|
2022-10-11 06:52:12 +00:00 |
|
|
李玉春
|
30238c658f
|
Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888
See merge request easycorp/zentaopms!5723
|
2022-10-11 06:51:55 +00:00 |
|
|
wangzemei
|
740e144707
|
* fix bug 28388 && 28395
|
2022-10-11 14:05:33 +08:00 |
|
|
tianshujie
|
202be34c31
|
* Finish task #71888.
|
2022-10-11 13:50:58 +08:00 |
|
|
wangzemei
|
b14dd4c6ed
|
* fix 28426
|
2022-10-11 12:11:22 +08:00 |
|
|
曹延义
|
8f73e4d340
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875
|
2022-10-11 08:36:05 +08:00 |
|
|
guofeilong
|
3d563b958b
|
* finish task 71875
|
2022-10-10 09:21:54 +00:00 |
|
|
李玉春
|
923718371a
|
Merge branch 'sprint/cyy_71903' into 'master'
* Finish task #71903.
See merge request easycorp/zentaopms!5707
|
2022-10-10 08:44:41 +00:00 |
|
|
田淑杰
|
f6d750c01a
|
Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
# module/my/view/task.html.php
# www/theme/default/style.css
|
2022-10-10 08:43:18 +00:00 |
|
|
曹延义
|
68274e57c2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71903
|
2022-10-10 16:35:45 +08:00 |
|
|
tianshujie
|
ff6c9221cb
|
* Finish task #71904.
|
2022-10-10 16:14:45 +08:00 |
|
|
李玉春
|
333f75d6dc
|
Merge branch 'sprint/cyy_71874' into 'master'
Sprint/cyy 71874
See merge request easycorp/zentaopms!5703
|
2022-10-10 08:09:39 +00:00 |
|
|
曹延义
|
0bff4d85fd
|
* Fix bug #28360.
|
2022-10-10 15:49:57 +08:00 |
|
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
|
曹延义
|
20a77c4811
|
* Modify language.
|
2022-10-10 11:05:49 +08:00 |
|
|
guofeilong
|
150beef775
|
* finish task *71875
|
2022-10-10 02:51:03 +00:00 |
|
|
曹延义
|
aeb4bef5bc
|
* Modify execution page style.
|
2022-10-10 10:33:40 +08:00 |
|
|
李玉春
|
635693bef4
|
Merge branch 'sprint/244_wzm_70007' into 'master'
* finish task 70007 & 71896
See merge request easycorp/zentaopms!5689
|
2022-10-10 00:56:52 +00:00 |
|
|
wangzemei
|
f0c3b79018
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878
|
2022-10-09 15:42:16 +08:00 |
|
|
wangzemei
|
ec7844f035
|
* compatible datatable style
|
2022-10-09 15:42:00 +08:00 |
|
|
wangzemei
|
4a656cf175
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007
|
2022-10-09 15:19:48 +08:00 |
|
|
李玉春
|
7f1d674a73
|
Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876
See merge request easycorp/zentaopms!5683
|
2022-10-09 06:50:04 +00:00 |
|
|
曹延义
|
dc6b265503
|
* Adjust codes.
|
2022-10-09 14:48:37 +08:00 |
|
|
曹延义
|
0b55fb4095
|
* Adjust code.
|
2022-10-09 14:27:50 +08:00 |
|
|
曹延义
|
b30fc65ded
|
* Finish task #71876.
|
2022-10-09 13:26:43 +08:00 |
|
|
王怡栋
|
05d4c462a7
|
Merge branch 'master_28214' into 'master'
*Fix bug #28214.
See merge request easycorp/zentaopms!5659
|
2022-10-09 05:09:28 +00:00 |
|
|
王怡栋
|
1f68a6b1e7
|
Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.
See merge request easycorp/zentaopms!5658
|
2022-10-09 05:08:34 +00:00 |
|
|
曹延义
|
84e1f0295d
|
* Code for task #71876.
|
2022-10-09 11:15:44 +08:00 |
|
|
曹延义
|
bff2bdcbb3
|
* Finish task #71877.
|
2022-10-09 10:07:41 +08:00 |
|
|
wangzemei
|
ed225f525d
|
* finish task #71878
|
2022-10-09 10:06:57 +08:00 |
|
|
wangzemei
|
ca3a61f605
|
* finish task 71896
|
2022-10-09 09:42:29 +08:00 |
|
|
曹延义
|
162c12800b
|
* Finish task #71886.
|
2022-10-09 09:36:13 +08:00 |
|
|
liuhong
|
0f9ee29fec
|
*Fix bug #28214.
|
2022-09-30 07:20:17 +00:00 |
|
|
xieqiyu
|
57dd6eb716
|
* Fix bug#26098.
|
2022-09-30 07:19:21 +00:00 |
|
|
wangzemei
|
22b77ec407
|
* format Code
|
2022-09-30 14:55:46 +08:00 |
|
|
wangzemei
|
14742e0ad6
|
* fix bug 28210
|
2022-09-30 14:41:11 +08:00 |
|
|
xieqiyu
|
c4818a0fec
|
* Fix bug#26837.
|
2022-09-30 05:58:46 +00:00 |
|
|
tianshujie
|
7e523df39b
|
* Fix bug #28253.
|
2022-09-30 11:31:29 +08:00 |
|
|
李玉春
|
a5cd8d997e
|
Merge branch 'sprint/wangzemei/28231' into 'master'
* Fix bug 28231
See merge request easycorp/zentaopms!5632
|
2022-09-30 01:29:39 +00:00 |
|
|
李玉春
|
5e719e9a48
|
Merge branch 'sprint/wangzemei/28234' into 'master'
* fix bug 28234 & 28215
See merge request easycorp/zentaopms!5635
|
2022-09-30 01:29:10 +00:00 |
|