 wangzemei
|
da15610004
|
* rebuild green
|
2022-10-11 16:49:49 +08:00 |
|
|
wangzemei
|
01a12c95d9
|
* fix bug #283950
|
2022-10-11 16:42:59 +08:00 |
|
|
wangzemei
|
4c26cec1f6
|
* change important theme color
|
2022-10-11 15:29:24 +08:00 |
|
|
王怡栋
|
7087125106
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5725
|
2022-10-11 07:15:49 +00:00 |
|
|
tianshujie
|
40f225d93b
|
* Finish task #71890.
|
2022-10-11 15:11:14 +08:00 |
|
|
tianshujie
|
875ac851b4
|
* Fix bug #28460.
|
2022-10-11 15:07:12 +08:00 |
|
|
tianshujie
|
e1aa6ac3d4
|
* Fix bug #28433.
|
2022-10-11 15:06:55 +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 |
|
|
李玉春
|
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 |
|
|
tianshujie
|
d29c43fef1
|
* Fix bug #28436.
|
2022-10-11 14:29:43 +08:00 |
|
|
曹延义
|
980f4b6ee6
|
* Adjust code.
|
2022-10-11 14:09:13 +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
|
5ffeb14e65
|
* Finish task #71888.
|
2022-10-11 13:53:50 +08:00 |
|
|
tianshujie
|
202be34c31
|
* Finish task #71888.
|
2022-10-11 13:50:58 +08:00 |
|
|
tianshujie
|
65d21e59b6
|
Delete unnecessary Spaces.
|
2022-10-11 13:49:39 +08:00 |
|
|
tianshujie
|
8973962e24
|
* Finish task #71888.
|
2022-10-11 13:28:02 +08:00 |
|
|
曹延义
|
cf23ad6c07
|
* Revert testtask page.
|
2022-10-11 13:23:59 +08:00 |
|
|
tianshujie
|
f64f1c4848
|
* Finish task #71888.
|
2022-10-11 13:22:11 +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
|
96cf29a7ef
|
* Finish task #71888.
|
2022-10-11 11:27:34 +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 |
|
|
曹延义
|
bb688e7e49
|
* Code for task #72179.
|
2022-10-11 08:52:16 +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 |
|
|
曹延义
|
3f32ccdcb5
|
* Modify bug title.
|
2022-10-11 08:34:53 +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 |
|
|
guofeilong
|
3d563b958b
|
* finish task 71875
|
2022-10-10 09:21:54 +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 |
|