 田淑杰
|
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 |
|
|
wangyuting2
|
aa9bc2b8ec
|
* Fix systemMode bug.
|
2022-10-10 07:32:11 +00:00 |
|
|
liugang
|
f0d3d3e70f
|
* Fix bug #27897.
|
2022-10-10 14:57:30 +08:00 |
|
|
daitingting
|
f8259297b7
|
* Finish task #71585,#71586,#71587.
|
2022-10-10 05:46:31 +00:00 |
|
|
liugang
|
4512eaf2b4
|
* Fix bug #27899.
|
2022-10-10 13:40:04 +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 |
|
|
王怡栋
|
97f4bdac55
|
Merge branch 'zentaopms_239_task#71580' into 'zentaopms_239'
* Finish task #71580,#71581,#71582,#71583,#71584.
See merge request easycorp/zentaopms!5694
|
2022-10-10 03:01:48 +00: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 |
|
|
wangyidong
|
059cf9a8af
|
* code for task #71608.
|
2022-10-09 17:24:56 +08:00 |
|
|
daitingting
|
39064a3e22
|
* Finish task #71580,#71581,#71582,#71583,#71584.
|
2022-10-09 08:22:27 +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 |
|
|
wangyidong
|
96f993d108
|
* code for task #71603.
|
2022-10-09 10:04:38 +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 |
|
|
sunguangming
|
7efbb7d6ca
|
* Fix bug #28227.
|
2022-10-08 17:02:01 +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 |
|
|
liugang
|
1645dbd263
|
* Fix bug #27896,27898.
|
2022-09-30 13:48:12 +08:00 |
|
|
wangyidong
|
acc7774419
|
* adjust for manage members and products for no multiple project.
|
2022-09-30 13:23:22 +08: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 |
|
|
tianshujie
|
ecdfcffa58
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70505
|
2022-09-30 09:18:19 +08:00 |
|
|
wangzemei
|
5c579dc137
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28234
|
2022-09-30 09:09:10 +08:00 |
|
|
wangzemei
|
7c6d631ee8
|
* fix bug 28215
|
2022-09-30 09:08:42 +08:00 |
|
|
wangyidong
|
d300ee00da
|
Merge branch 'master' into zentaopms_239
|
2022-09-30 09:07:53 +08:00 |
|
|
李玉春
|
7d24a5ce0d
|
Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug
See merge request easycorp/zentaopms!5633
|
2022-09-30 00:58:12 +00:00 |
|
|
wangyidong
|
a88cc7454d
|
Merge branch 'sprint/zentaopms240' into zentaopms_239
|
2022-09-30 08:49:33 +08:00 |
|
|
tianshujie
|
750e7c41d0
|
* Fix bug #28161.
|
2022-09-30 08:48:51 +08:00 |
|