 wangzemei
|
25f8023fef
|
* Solve width calculation problems
|
2022-10-19 14:31:55 +08:00 |
|
|
wangzemei
|
68f702d9ef
|
* fix 28395 28640 28406
|
2022-10-19 11:07:04 +08:00 |
|
|
zhouxin
|
efbbc8a15e
|
* Fix bug.
|
2022-10-18 15:34:05 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
zhouxin
|
9593f24d92
|
* Fix bugs.
|
2022-10-17 23:05:00 +08:00 |
|
|
李玉春
|
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
|
e05f1e7f89
|
* Finish task #72374.
|
2022-10-17 16:58:30 +08:00 |
|
|
zhouxin
|
4bab4bc356
|
* Fix some bugs of ticket.
|
2022-10-17 14:01:04 +08:00 |
|
|
tianshujie
|
80b66aea5c
|
* Fix bug #28490.
|
2022-10-17 11:12:48 +08:00 |
|
|
zhouxin
|
da5d515b45
|
* Add search form for my ticket.
|
2022-10-17 09:09:09 +08:00 |
|
|
曹延义
|
1929b943c2
|
* Code for story #38730.
|
2022-10-14 09:58:09 +08:00 |
|
|
zhouxin
|
9d1b695b20
|
* Fix bugs of ticket.
|
2022-10-11 15:40:00 +08: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
|
e31a9c3a01
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_28406
|
2022-10-11 14:44:04 +08:00 |
|
|
tianshujie
|
65d21e59b6
|
Delete unnecessary Spaces.
|
2022-10-11 13:49:39 +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
|
d498b40d17
|
* Finish task #71890.
|
2022-10-11 10:55:21 +08:00 |
|
|
wangzemei
|
66dfa21542
|
* fix bug28406
|
2022-10-11 10:05:47 +08: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 |
|
|
田淑杰
|
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
|
2d2f0f63c3
|
* Delete unnecessary Spaces.
|
2022-10-10 16:32:22 +08:00 |
|
|
tianshujie
|
6947f423f4
|
* Finish task #71889.
|
2022-10-10 16:16:55 +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 |
|
|
李玉春
|
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 |
|
|
zhouxin
|
0cfb69ac5b
|
* Finish task #71836.
|
2022-10-10 15:23:22 +08:00 |
|
|
tianshujie
|
f4e39b358d
|
* Finish task #71905.
|
2022-10-10 14:19:11 +08:00 |
|
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
|
tianshujie
|
20fdae4f1b
|
* Finish task #71889.
|
2022-10-10 10:11:28 +08:00 |
|
|
wangzemei
|
83a6a8ab53
|
* finish task #71885 && #71893
|
2022-10-10 09:58:19 +08:00 |
|
|
tianshujie
|
6c39ac6ba5
|
* Finish task #71899.
|
2022-10-10 09:49:54 +08:00 |
|
|
tianshujie
|
87f5fb905a
|
* Finish task #71900.
|
2022-10-10 09:23:45 +08:00 |
|
|
tianshujie
|
b81f00714c
|
* Finish task #71901.
|
2022-10-10 09:13:13 +08:00 |
|
|
tianshujie
|
0658933923
|
* Finish task #71902.
|
2022-10-10 09:06:55 +08:00 |
|
|
guofeilong
|
ec2638b40c
|
* finish task 71881
|
2022-10-10 01:05:48 +00:00 |
|
|
wangzemei
|
ebb21c3ad4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71898
|
2022-10-10 09:02:21 +08:00 |
|
|
wangzemei
|
2a2e17b0e2
|
* remove not empty check
|
2022-10-10 09:02:10 +08:00 |
|
|
tianshujie
|
9309ca0cc8
|
* Finish task #71902.
|
2022-10-10 09:01:45 +08:00 |
|
|
tianshujie
|
c0b01a95a8
|
* Finish task #38397.
|
2022-10-10 08:57:39 +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 |
|
|
李玉春
|
412ef6d8cd
|
Merge branch 'sprint/gfl_71882' into 'master'
Sprint/gfl 71882
See merge request easycorp/zentaopms!5688
|
2022-10-10 00:46:57 +00:00 |
|
|
wangzemei
|
6b0e072793
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71898
|
2022-10-09 15:45:21 +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 |
|
|
guofeilong
|
9aeba19381
|
* add pd-r-8 to column c-hours th
|
2022-10-09 06:56:38 +00:00 |
|
|
guofeilong
|
13135a581f
|
* finish task 71882
|
2022-10-09 05:28:58 +00:00 |
|
|
guofeilong
|
768f157701
|
* finish taks #71880
|
2022-10-09 05:21:53 +00:00 |
|
|
guofeilong
|
7fa0485534
|
* finish task #71907
|
2022-10-09 02:52:47 +00:00 |
|
|
wangzemei
|
54f94d95c0
|
* finish task #71898
|
2022-10-09 10:42:30 +08:00 |
|