 liyuchun
|
7d31524581
|
* Fix bug #15861.
|
2021-11-01 13:45:43 +08:00 |
|
|
李玉春
|
44ad6d63a4
|
Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Fix kanban not work in program, product or project page.
See merge request easycorp/zentaopms!225
|
2021-10-29 05:44:50 +00:00 |
|
|
Hao Sun
|
1e39ba869a
|
* remove product card shadow.
|
2021-10-29 10:36:00 +08:00 |
|
|
xiawenlong
|
3dc8358434
|
Finish permissionOC
|
2021-10-29 10:09:07 +08:00 |
|
|
liyuchun
|
817178e93b
|
* Add button of set WIP and column name.
|
2021-10-28 16:19:16 +08:00 |
|
|
李玉春
|
f9b40d2887
|
Merge branch 'sprint/168' into 'sprint/168_sgm_43393'
# Conflicts:
# module/execution/js/kanban.js
|
2021-10-28 06:47:11 +00:00 |
|
|
孙广明
|
6c32c9a397
|
Merge branch 'sprint/tengfei_168_lang' into 'sprint/168'
Sprint/tengfei 168 lang
See merge request easycorp/zentaopms!192
|
2021-10-28 03:32:04 +00:00 |
|
|
孙广明
|
83f3079804
|
* Finish task #43393.
|
2021-10-28 11:01:50 +08:00 |
|
|
reneeteng
|
cf5682ef5b
|
* Edit api lang and related files.
|
2021-10-28 10:11:52 +08:00 |
|
|
孙广明
|
be167bcafb
|
Merge branch 'sprint/168_liyuchun_43424' into 'sprint/168'
* Finish task #43519,#43503.
See merge request easycorp/zentaopms!185
|
2021-10-27 07:46:11 +00:00 |
|
|
liyuchun
|
d0b9dda4d7
|
* Finish task #43519,#43503.
|
2021-10-27 15:41:36 +08:00 |
|
|
Hao Sun
|
7e8d65f34e
|
* fix window.columnRenderers works with defaultCardType.
|
2021-10-27 14:53:45 +08:00 |
|
|
孙广明
|
7ad0747fd6
|
Merge branch 'sprint/168_zenggang' into 'sprint/168'
* Fix menu pri judge
See merge request easycorp/zentaopms!159
|
2021-10-26 07:57:05 +00:00 |
|
|
孙广明
|
fb5687c6a4
|
Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo'
# Conflicts:
# module/execution/js/kanban.js
# module/execution/view/kanban.html.php
|
2021-10-26 07:53:38 +00:00 |
|
|
zenggang
|
1da7061d7a
|
* Fix menu pri judge
|
2021-10-26 07:49:56 +00:00 |
|
|
Hao Sun
|
43d52ddb9b
|
* improve style for affixed header in kanban.
|
2021-10-26 14:54:16 +08:00 |
|
|
tianshujie
|
f8447c9825
|
* Correct Kanban data.
|
2021-10-26 11:46:33 +08:00 |
|
|
Hao Sun
|
920b8234a3
|
+ add kanban demo files.
|
2021-10-26 11:42:23 +08:00 |
|
|
tianshujie
|
3d22a50a00
|
* Create the single execution Kanban lane and Kanban column.
|
2021-10-25 14:13:44 +08:00 |
|
|
liyuchun
|
b32541f20f
|
* Fix bug #15639.
|
2021-10-19 20:32:06 +08:00 |
|
|
zhujinyong
|
fc2e75eeb8
|
* Fix languages.
|
2021-10-19 15:59:07 +08:00 |
|
|
王怡栋
|
6ee64dffe7
|
Merge branch 'api_doc' into sprint/167
|
2021-10-19 11:36:19 +08:00 |
|
|
王怡栋
|
352ec4d0b4
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-18 16:04:22 +08:00 |
|
|
王怡栋
|
775f9942d2
|
* fix bug #15553.
|
2021-10-18 16:03:42 +08:00 |
|
|
hufangzhou
|
c4824ba3d7
|
* Check the code for upgrade.
|
2021-10-18 13:11:07 +08:00 |
|
|
王怡栋
|
72c92b6b0d
|
* fix error.
|
2021-10-18 09:06:48 +08:00 |
|
|
王怡栋
|
5e0ac98809
|
Merge branch 'sprint/167_wangyidong' into sprint/167
|
2021-10-18 08:53:30 +08:00 |
|
|
王怡栋
|
68cd0eb2f9
|
Merge branch '15.6' into sprint/167_wangyidong
|
2021-10-18 08:44:13 +08:00 |
|
|
王怡栋
|
3989c71b3f
|
* fix for large size session.
|
2021-10-15 13:38:05 +08:00 |
|
|
朱金勇
|
e50c3c65d9
|
Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179
See merge request easycorp/zentaopms!49
|
2021-10-15 01:05:33 +00:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
liyuchun
|
cfdce3652f
|
* Finish task #43187.
|
2021-10-14 13:51:47 +08:00 |
|
|
zenggang
|
de37a33ed5
|
* Adjust code format
|
2021-10-14 01:56:19 +00:00 |
|
|
liyuchun
|
3ddba6aeeb
|
* Fix bug #15479.
|
2021-10-13 10:17:53 +08:00 |
|
|
zenggang
|
8f0b4a575e
|
* Adjust code style
|
2021-10-13 01:44:56 +00:00 |
|
|
thanatos
|
cb1613604f
|
fix header action
|
2021-10-12 09:41:21 +08:00 |
|
|
zenggang
|
5f35a398ad
|
* Finish task#43179
|
2021-10-11 07:26:18 +00:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
朱金勇
|
ff09127219
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.
See merge request easycorp/zentaopms!41
|
2021-10-09 01:32:30 +00:00 |
|
|
王怡栋
|
0fa52d3318
|
* adjust for review code.
|
2021-10-09 09:29:10 +08:00 |
|
|
zhujinyong
|
0c6c024bb1
|
* Fix menu vars.
|
2021-10-08 13:48:10 +08:00 |
|
|
王怡栋
|
88a5c5d207
|
* fix loophole.
|
2021-10-08 10:35:38 +08:00 |
|
|
zenggang
|
77a9b33191
|
* Adjust code style
|
2021-10-08 02:27:50 +00:00 |
|
|
zhujinyong
|
83d598745f
|
* Finish task#43059.
|
2021-10-08 08:01:53 +08:00 |
|
|
zenggang
|
189bc062b3
|
* Fix bug#15363
|
2021-09-30 16:17:48 +08:00 |
|
|
王怡栋
|
ee39f52c2e
|
* finish task #42846.
|
2021-09-29 11:51:17 +08:00 |
|
|
王怡栋
|
08f1d594c0
|
* adjust for task #42835.
|
2021-09-28 09:24:33 +08:00 |
|
|
王怡栋
|
f30eb20fbd
|
* code for task #42835.
|
2021-09-27 14:50:09 +08:00 |
|
|
王怡栋
|
a33f9b096d
|
* adjust for project link in classic mode.
|
2021-09-24 16:27:08 +08:00 |
|
|
王怡栋
|
bd8cf246f9
|
Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5
|
2021-09-18 13:14:21 +08:00 |
|