 李玉春
|
28ffbcd9fc
|
Merge branch 'sprint/247_wzm_28406' into 'master'
* fix 247 bug
See merge request easycorp/zentaopms!5724
|
2022-10-11 06:50:54 +00:00 |
|
|
wangzemei
|
e31a9c3a01
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_28406
|
2022-10-11 14:44:04 +08:00 |
|
|
wangzemei
|
d9c4eddb1e
|
* fix bug28304
|
2022-10-11 14:41:59 +08:00 |
|
|
wangzemei
|
740e144707
|
* fix bug 28388 && 28395
|
2022-10-11 14:05:33 +08:00 |
|
|
李玉春
|
99cd8f7ef2
|
Merge branch 'sprint/244_tianshujie_71890' into 'master'
Sprint/244 tianshujie 71890
See merge request easycorp/zentaopms!5721
|
2022-10-11 05:54:40 +00:00 |
|
|
tianshujie
|
65d21e59b6
|
Delete unnecessary Spaces.
|
2022-10-11 13:49:39 +08:00 |
|
|
tianshujie
|
df424fcefe
|
* Fix bug #28431.
|
2022-10-11 13:19:03 +08:00 |
|
|
tianshujie
|
5ea1955b6d
|
* Fix todo list error.
|
2022-10-11 13:11:05 +08:00 |
|
|
tianshujie
|
647859b82c
|
* Fix project list error.
|
2022-10-11 13:10:18 +08:00 |
|
|
wangzemei
|
b14dd4c6ed
|
* fix 28426
|
2022-10-11 12:11:22 +08:00 |
|
|
tianshujie
|
1d4bab43ab
|
* Fix bug #28423.
|
2022-10-11 11:01:52 +08:00 |
|
|
tianshujie
|
d498b40d17
|
* Finish task #71890.
|
2022-10-11 10:55:21 +08:00 |
|
|
wangzemei
|
b37f3e8d42
|
* fix bug 28416
|
2022-10-11 10:32:35 +08:00 |
|
|
wangzemei
|
66dfa21542
|
* fix bug28406
|
2022-10-11 10:05:47 +08:00 |
|
|
王怡栋
|
70d4ffb566
|
Merge branch 'feedback_983' into 'master'
* Feedback#983.
See merge request easycorp/zentaopms!5715
|
2022-10-10 09:25:11 +00:00 |
|
|
王怡栋
|
9f9d913205
|
Merge branch 'bug_28378' into 'master'
* Fix bug#28378
See merge request easycorp/zentaopms!5711
|
2022-10-10 09:24:58 +00:00 |
|
|
leiyong
|
f8dadc8da5
|
* Feedback#983.
|
2022-10-10 09:20:23 +00:00 |
|
|
李玉春
|
6a5148bbe8
|
Merge branch 'sprint/247_tianshujie_71905' into 'master'
Sprint/247 tianshujie 71905
See merge request easycorp/zentaopms!5713
|
2022-10-10 09:16:37 +00:00 |
|
|
tianshujie
|
11ab1572af
|
* Delete unnecessary Spaces.
|
2022-10-10 16:58:25 +08: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 |
|
|
liyuchun
|
d7cfe55cfb
|
Merge branch 'sprint/247_tianshujie_table'
|
2022-10-10 16:44:15 +08: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 |
|
|
tianshujie
|
fa4b34d58f
|
* Delete unnecessary Spaces.
|
2022-10-10 16:39:54 +08: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
|
2d2f0f63c3
|
* Delete unnecessary Spaces.
|
2022-10-10 16:32:22 +08:00 |
|
|
曹延义
|
fce6c0a80f
|
* Adjust code.
|
2022-10-10 16:20:30 +08:00 |
|
|
tianshujie
|
6947f423f4
|
* Finish task #71889.
|
2022-10-10 16:16:55 +08:00 |
|
|
tianshujie
|
ff6c9221cb
|
* Finish task #71904.
|
2022-10-10 16:14:45 +08:00 |
|
|
李玉春
|
e9f5c5add9
|
Merge branch 'sprint/247_wzm_71885' into 'master'
* finish task #71885 && #71893
See merge request easycorp/zentaopms!5705
|
2022-10-10 08:14:44 +00: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 |
|
|
李玉春
|
a925591017
|
Merge branch 'sprint/gfl_71875' into 'master'
Sprint/gfl 71875
See merge request easycorp/zentaopms!5702
|
2022-10-10 08:07:11 +00:00 |
|
|
李玉春
|
713d35512d
|
Merge branch 'sprint/gfl_71881' into 'master'
* finish task 71881
See merge request easycorp/zentaopms!5701
|
2022-10-10 08:06:26 +00:00 |
|
|
zenggang
|
3d68550408
|
* Fix bug#28378
|
2022-10-10 07:57:30 +00:00 |
|
|
曹延义
|
8e0909cc76
|
* Fix bug #28321.
|
2022-10-10 15:51:25 +08:00 |
|
|
曹延义
|
0bff4d85fd
|
* Fix bug #28360.
|
2022-10-10 15:49:57 +08:00 |
|
|
tianshujie
|
e6082de4f4
|
* Finish task #71905.
|
2022-10-10 14:56:42 +08:00 |
|
|
tianshujie
|
f4e39b358d
|
* Finish task #71905.
|
2022-10-10 14:19:11 +08:00 |
|
|
tianshujie
|
4e772cc5bf
|
* Adjust lang of release.
|
2022-10-10 14:15:06 +08:00 |
|
|
tianshujie
|
531f5d2cb8
|
* Finish task #71905.
|
2022-10-10 14:14:55 +08:00 |
|
|
tianshujie
|
f080000984
|
* Finish task #71905.
|
2022-10-10 14:14:33 +08:00 |
|
|
曹延义
|
f9f8a11b90
|
* Finish task #71903.
|
2022-10-10 13:57:56 +08:00 |
|
|
wangzemei
|
c66f9728ea
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71885
|
2022-10-10 13:39:14 +08:00 |
|
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
|
王怡栋
|
0b569126ea
|
Merge branch 'master_26245' into 'master'
* The execution logic to which the update task belongs when it is newly created.
See merge request easycorp/zentaopms!5680
|
2022-10-10 03:13:59 +00:00 |
|
|
liuhong
|
7571484ba7
|
*Adjust code for bug #26245.
|
2022-10-10 03:11:30 +00:00 |
|
|
曹延义
|
c10a84603a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71874
|
2022-10-10 11:06:32 +08:00 |
|
|
曹延义
|
20a77c4811
|
* Modify language.
|
2022-10-10 11:05:49 +08:00 |
|
|
李玉春
|
aff554786d
|
Merge branch 'dht_unittest' into 'master'
* Add repo create unittest.
See merge request easycorp/zentaopms!5699
|
2022-10-10 03:05:13 +00:00 |
|
|
王怡栋
|
d9522cec75
|
Merge branch 'feedback_420' into 'master'
*Fix feedback #420.
See merge request easycorp/zentaopms!5676
|
2022-10-10 03:04:49 +00:00 |
|
|
王怡栋
|
6db31d7f33
|
Merge branch 'leiyong_merge_code' into 'master'
* Merge code.
See merge request easycorp/zentaopms!5697
|
2022-10-10 03:02:56 +00:00 |
|