 李玉春
|
fc09ce2d86
|
Merge branch 'sprint/wzm/28207' into 'master'
* Fix bug #28207
See merge request easycorp/zentaopms!5618
|
2022-09-29 08:49:47 +00:00 |
|
|
李玉春
|
27d7245fb1
|
Merge branch 'sprint/244_tianshujie_70503' into 'master'
* Finish task #70503.
See merge request easycorp/zentaopms!5614
|
2022-09-29 07:05:05 +00:00 |
|
|
wangzemei
|
8ebea231d8
|
* Fix bug #28207
|
2022-09-29 14:56:40 +08:00 |
|
|
孙广明
|
9c5e3353e6
|
Merge branch 'lyk_27556' into 'master'
* Fix bug #27556.
See merge request easycorp/zentaopms!5615
|
2022-09-29 06:43:24 +00:00 |
|
|
liuyongkai
|
11448f3cee
|
* Fix bug #27556.
|
2022-09-29 06:39:47 +00:00 |
|
|
liuyongkai
|
2b815f88c1
|
* Fix bug #27556.
|
2022-09-29 06:09:50 +00:00 |
|
|
tianshujie
|
d4182b0360
|
* Finish task #70503.
|
2022-09-29 13:55:58 +08:00 |
|
|
王怡栋
|
b14a0a31c7
|
Merge branch 'bug_28073' into 'master'
* Fix bug#28073
See merge request easycorp/zentaopms!5601
|
2022-09-29 05:50:49 +00:00 |
|
|
王怡栋
|
fe8d365582
|
Merge branch 'master_27982' into 'master'
Master 27982
See merge request easycorp/zentaopms!5602
|
2022-09-29 05:50:26 +00:00 |
|
|
孙广明
|
235b8967eb
|
Merge branch 'sprint/scx_releaseapilimit' into 'master'
*Add release to release api.
See merge request easycorp/zentaopms!5589
|
2022-09-29 05:31:22 +00:00 |
|
|
孙广明
|
03e94b87fa
|
Merge branch 'lyk_28078' into 'master'
* Fix bug #28078.
See merge request easycorp/zentaopms!5610
|
2022-09-29 05:29:00 +00:00 |
|
|
李玉春
|
3c1f5443d9
|
Merge branch 'sprint/244_wangzemei_71075' into 'master'
* finish task #71075
See merge request easycorp/zentaopms!5607
|
2022-09-29 05:27:10 +00:00 |
|
|
wangzemei
|
b982e8b494
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075
|
2022-09-29 13:26:06 +08:00 |
|
|
wangzemei
|
ac72fe5540
|
* extract common variable for kanban colWidth
|
2022-09-29 13:24:23 +08:00 |
|
|
liuyongkai
|
d21a3f8d26
|
* Fix bug #28078.
|
2022-09-29 05:23:53 +00:00 |
|
|
李玉春
|
77c12dc78a
|
Merge branch 'sprint/244_tianshujie_70493' into 'master'
Sprint/244 tianshujie 70493
See merge request easycorp/zentaopms!5609
|
2022-09-29 05:19:49 +00:00 |
|
|
tianshujie
|
55135337ba
|
* Delete unnecessary Spaces.
|
2022-09-29 13:16:53 +08:00 |
|
|
tianshujie
|
13f7077309
|
* Finish task #70493.
|
2022-09-29 13:14:56 +08:00 |
|
|
tianshujie
|
8f37fe7ab0
|
* Finish task #70493.
|
2022-09-29 12:27:02 +08:00 |
|
|
wangzemei
|
e38d934cbd
|
* extract common variable for kanban colWidth
|
2022-09-29 12:20:54 +08:00 |
|
|
曹延义
|
d972797ed2
|
* Modify kanban set validate.
|
2022-09-29 11:23:20 +08:00 |
|
|
曹延义
|
05a255653b
|
* Code for bug #28153.
|
2022-09-29 11:00:37 +08:00 |
|
|
wangzemei
|
769d447a78
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075
|
2022-09-29 10:52:29 +08:00 |
|
|
曹延义
|
dd4af4cacb
|
* Modify save tips.
|
2022-09-29 10:46:03 +08:00 |
|
|
李玉春
|
8a557f691e
|
Merge branch 'sprint/244_dyl_zui' into 'master'
* update zui.
See merge request easycorp/zentaopms!5606
|
2022-09-29 02:34:46 +00:00 |
|
|
李玉春
|
0dabcbeaa1
|
Merge branch 'sprint/cyy_bug' into 'master'
* Modify batch edit style.
See merge request easycorp/zentaopms!5590
|
2022-09-29 02:34:31 +00:00 |
|
|
曹延义
|
885121c725
|
* Modify classic model style.
|
2022-09-29 10:27:45 +08:00 |
|
|
wangzemei
|
45ec08b5e1
|
* add placeholder
|
2022-09-29 10:26:20 +08:00 |
|
|
dingyongliang
|
15c1f99afa
|
* update zui.
|
2022-09-29 02:19:38 +00:00 |
|
|
wangzemei
|
7b222116eb
|
* kanban setting: add isset
|
2022-09-29 09:58:36 +08:00 |
|
|
曹延义
|
f8b207f843
|
* Add save validate for kanban.
|
2022-09-29 09:50:16 +08:00 |
|
|
曹延义
|
7546ed9e09
|
* Modify create page error.
|
2022-09-29 09:47:40 +08:00 |
|
|
曹延义
|
2f7ed68fa2
|
* Add kanban setting check.
|
2022-09-29 09:43:43 +08:00 |
|
|
wangyidong
|
a4ae767404
|
* adjust for ztSessionHandler.
|
2022-09-29 09:38:22 +08:00 |
|
|
朱金勇
|
445bbb276a
|
Merge branch 'ci' into 'master'
change the gitlab ci file, adjust the jobs name and the style
See merge request easycorp/zentaopms!5603
|
2022-09-29 01:22:58 +00:00 |
|
|
曹延义
|
2160b5efff
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075
|
2022-09-29 09:18:42 +08:00 |
|
|
曹延义
|
feb98f882c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug
|
2022-09-29 09:16:40 +08:00 |
|
|
曹延义
|
94df83c6a1
|
* Add js comment.
|
2022-09-29 09:13:07 +08:00 |
|
|
李玉春
|
b5fff7a098
|
Merge branch 'sprint/244' into 'master'
Sprint/244
See merge request easycorp/zentaopms!5605
|
2022-09-29 01:10:27 +00:00 |
|
|
李玉春
|
ce3c531d6e
|
Merge branch 'sprint/244_tianshujie_70493' into 'sprint/244'
Sprint/244 tianshujie 70493
See merge request easycorp/zentaopms!5604
|
2022-09-29 01:09:49 +00:00 |
|
|
李玉春
|
befe790a5f
|
Merge branch 'sprint/244_tianshujie_70482' into 'sprint/244'
Sprint/244 tianshujie 70482
See merge request easycorp/zentaopms!5600
|
2022-09-29 01:08:46 +00:00 |
|
|
曹延义
|
480f5db2d0
|
* Modify multi task estimate order.
|
2022-09-29 09:08:19 +08:00 |
|
|
李玉春
|
c06e69212f
|
Merge branch 'sprint/244_tianshujie_70019' into 'sprint/244'
Sprint/244 tianshujie 70019
See merge request easycorp/zentaopms!5599
|
2022-09-29 01:06:27 +00:00 |
|
|
李玉春
|
13bd794cdc
|
Merge branch 'sprint/244_tianshujie_70017' into 'sprint/244'
Sprint/244 tianshujie 70017
See merge request easycorp/zentaopms!5592
|
2022-09-29 01:01:38 +00:00 |
|
|
liyuchun
|
2b79ccbcc1
|
Merge branch 'sprint/244_wangzemei_70009' into sprint/244
|
2022-09-29 08:58:39 +08:00 |
|
|
李玉春
|
b7576eedcb
|
Merge branch 'sprint/244' into 'sprint/244_wangzemei_70009'
# Conflicts:
# www/theme/blue/style.css
# www/theme/green/style.css
|
2022-09-29 00:58:03 +00:00 |
|
|
tianshujie
|
5338c0e70f
|
* Finish task #70493.
|
2022-09-29 08:50:09 +08:00 |
|
|
unknown
|
4e86365fcd
|
change the gitlab ci file, adjust the jobs name and the style
|
2022-09-29 08:36:25 +08:00 |
|
|
李玉春
|
45d2decd5f
|
Merge branch 'sprint/244_wangzemei_70496' into 'sprint/244'
* finish task #70496
See merge request easycorp/zentaopms!5597
|
2022-09-29 00:35:39 +00:00 |
|
|
tianshujie
|
f4fbe572b6
|
Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244
|
2022-09-29 08:10:59 +08:00 |
|