朱金勇
|
161233a64f
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!884
|
2021-12-10 06:15:15 +00:00 |
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +08:00 |
|
hufangzhou
|
ab5b5bdf87
|
* Fix bug #17311.
|
2021-12-09 16:54:30 +08:00 |
|
hufangzhou
|
73b43980eb
|
* Fix an error for lang item.
|
2021-12-09 10:12:08 +08:00 |
|
hufangzhou
|
7f94a46592
|
* Fix bug #16792.
|
2021-12-09 09:53:54 +08:00 |
|
李玉春
|
c62ce9a159
|
Merge branch 'sgm_fixbug' into 'master'
* Fix program kanban error.
See merge request easycorp/zentaopms!829
|
2021-12-08 07:43:41 +00:00 |
|
孙广明
|
7f7533c521
|
* Fix program kanban error.
|
2021-12-08 13:47:24 +08:00 |
|
李玉春
|
0c4f0dc504
|
Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.
See merge request easycorp/zentaopms!823
|
2021-12-08 05:10:01 +00:00 |
|
孙广明
|
c1f2a2272f
|
* Fix kanban bug.
|
2021-12-08 13:08:28 +08:00 |
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
孙广明
|
f3bd7149f9
|
Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Improve kanban UI, bug #17063.
See merge request easycorp/zentaopms!787
|
2021-12-06 05:11:11 +00:00 |
|
Hao Sun
|
8d08be2f57
|
* Fix cards count incorrect on some kanbans.
|
2021-12-06 11:18:49 +08:00 |
|
songchenxuan
|
bb6dba1a78
|
*Fix bug #17111.
|
2021-12-06 11:12:21 +08:00 |
|
Hao Sun
|
62efd53edb
|
* update kanban lib and refactor usage of it.
|
2021-12-02 16:54:56 +08:00 |
|
王怡栋
|
f25d797b54
|
* adjust for flow.
|
2021-12-02 10:06:02 +08:00 |
|
zhujinyong
|
8ee3e5ce16
|
Merge branch 'sprint/168_sunhao/task45145'
|
2021-12-01 11:32:08 +08:00 |
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
Hao Sun
|
39a2d7296b
|
* refactor pages with kanban lib.
|
2021-11-30 14:21:24 +08:00 |
|
孙广明
|
8d9fb81d9d
|
Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
# module/story/model.php
|
2021-11-29 07:26:45 +00:00 |
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
zhujinyong
|
be26a7c731
|
* Fix errors of api.
|
2021-11-29 13:09:05 +08:00 |
|
zhengrunyu
|
b3c8ee7ccb
|
*Finish task #45148.
|
2021-11-29 09:29:44 +08:00 |
|
zhujinyong
|
4b57e8627b
|
* Fix api of program.
|
2021-11-28 22:17:33 +08:00 |
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
王怡栋
|
11e5d04bf7
|
* fix bug #16439.
|
2021-11-23 13:47:12 +08:00 |
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
王怡栋
|
7cc9e9f875
|
* code for task #44308.
|
2021-11-17 09:59:39 +08:00 |
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
李玉春
|
d75156dd74
|
Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.
See merge request easycorp/zentaopms!361
|
2021-11-09 06:00:23 +00:00 |
|
root
|
397fb3e152
|
Finish task #43918.
|
2021-11-09 13:58:39 +08:00 |
|
root
|
782d1114bf
|
Finish task #43918.
|
2021-11-09 13:47:30 +08:00 |
|
root
|
44c44f11d1
|
Finish task #43918.
|
2021-11-09 13:25:52 +08:00 |
|
root
|
f23ff798b9
|
Finish task #43918.
|
2021-11-09 13:23:37 +08:00 |
|
root
|
627ba8e493
|
Finish task #43918.
|
2021-11-09 13:18:44 +08:00 |
|
root
|
fdc54380ee
|
* Finish task #43918.
|
2021-11-09 13:08:58 +08:00 |
|
root
|
ab5ee93bc3
|
* Finish task #43918.
|
2021-11-09 11:26:25 +08:00 |
|
root
|
33539633d7
|
* Finish task #43918.
|
2021-11-09 10:35:17 +08:00 |
|
root
|
b9dc220fd9
|
* Finish task #43918
|
2021-11-09 08:35:27 +08:00 |
|
zhouxin
|
92fb767ff9
|
Finish task #43916.
|
2021-11-08 14:34:44 +08:00 |
|
孙广明
|
791be24fb7
|
* Remove unused code.
|
2021-11-08 13:27:17 +08:00 |
|
孙广明
|
869faaeaaa
|
* Remove unused code.
|
2021-11-08 13:26:26 +08:00 |
|
孙广明
|
3965d5339b
|
* Finish task #44002, #44003...
|
2021-11-08 13:12:25 +08:00 |
|
孙广明
|
143abdf45b
|
* Fix an error.
|
2021-11-08 11:02:11 +08:00 |
|
孙广明
|
f9978c4841
|
* Code for task #44005.
|
2021-11-04 17:07:37 +08:00 |
|
mayue
|
c916df0117
|
* Fix bug #15780.
|
2021-11-03 15:05:44 +08:00 |
|
mayue
|
be67b785b3
|
* Fix bug #15780.
|
2021-11-03 14:50:48 +08:00 |
|
王怡栋
|
3cdf3b3395
|
Merge branch 'sprint/167_wangyidong_api' into sprint/app10
|
2021-11-01 15:35:49 +08:00 |
|
reneeteng
|
cf5682ef5b
|
* Edit api lang and related files.
|
2021-10-28 10:11:52 +08:00 |
|
mayue
|
ef9821f709
|
*Fix a bug #15793.
|
2021-10-28 10:10:04 +08:00 |
|