Commit Graph

982 Commits

Author SHA1 Message Date
Hao Sun
aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan
b4a5b7bff2 *Translate. 2022-02-24 16:52:16 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
songchenxuan
66bbe4cfbe *Translate. 2022-02-24 16:31:58 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong
49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +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
孙广明
9e171958bf Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.

See merge request easycorp/zentaopms!1800
2022-02-15 05:27:00 +00:00
liyuchun
0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
hufangzhou
82895b18d2 * Fix bug #19471. 2022-02-14 10:50:06 +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
tianshujie
a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +08:00
孙广明
e177702c23 Merge branch 'sprint/182_tianshujie_18475' into 'kanban'
*Fix bug #18475.

See merge request easycorp/zentaopms!1422
2022-01-17 00:50:20 +00:00
tianshujie
58c2fe04af *Fix bug #18475. 2022-01-17 08:48:42 +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
mayue
f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
mayue
15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
zhujinyong
e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +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
Hao Sun
1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
mayue
64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +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
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +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
朱金勇
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