Commit Graph

433 Commits

Author SHA1 Message Date
tianshujie
3246d38e73 * Fix bug #20300. 2022-03-03 16:50:52 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng
966f00c07a * finish task #49421,49338. 2022-02-17 14:58:59 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhouxudong
31e2c020f7 *Finish task #48843. 2022-02-09 16:09:57 +08:00
tanghucheng
1f81f7cef8 * Fix projectlist. 2022-01-25 16:27:13 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
孙广明
758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
Wenrui LI
7b498302d0 * tweak project list for lite vision, task #47144. 2022-01-11 10:32:08 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
王怡栋
f895777dec * adjust for z tool. 2021-12-31 09:54:58 +08:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou
2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
songchenxuan
d10d8be62a *Finish task #46136. 2021-12-17 14:20:05 +08:00
songchenxuan
03399bbb8c *Finish task #46136. 2021-12-17 14:17:12 +08:00
songchenxuan
c7a49edda8 *Finish task #46136. 2021-12-16 14:36:01 +08:00
孙广明
7f7533c521 * Fix program kanban error. 2021-12-08 13:47:24 +08:00
孙广明
c1f2a2272f * Fix kanban bug. 2021-12-08 13:08:28 +08:00
songchenxuan
bb6dba1a78 *Fix bug #17111. 2021-12-06 11:12:21 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +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
王怡栋
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
孙广明
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
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
王怡栋
076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
王怡栋
001ca0ef8f * code for task #43347. 2021-10-26 15:39:46 +08:00
xieqiyu
e9b614a72b * Fix bug#15561. 2021-10-18 16:37:36 +08:00
王怡栋
351b07352b Merge branch '15.6' into sprint/167 2021-10-18 08:53:13 +08:00
xieqiyu
5697ba482a * Fix bug#15543. 2021-10-15 14:13:41 +08:00
王怡栋
8ee2811723 Merge branch '15.6' into sprint/167 2021-10-15 13:11:52 +08:00
xieqiyu
8e38b12360 * Code for bug#14879. 2021-10-15 08:06:44 +08:00