Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,550 Commits 2 Branches 292 Tags
7af812ca3ee8ae50a22ff06a6bbdd92fdcf8f441
Commit Graph
1001 Commits
Author SHA1 Message Date
tianshujie 7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
zhouxin 603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00:00
tianshujie 7b6e89c8d6 * Fix bug #21213. 2022-03-29 09:07:47 +08:00
zhouxin 6bc82e81c1 * Fix bug #14512. 2022-03-28 09:19:14 +00:00
zhouxin 25338e33f5 * Fix bug #14512. 2022-03-28 07:23:53 +00:00
朱金勇 530f055e7b Merge branch 'sgm_storytest' into 'master' 
* Remove unused code and fix bug.

See merge request easycorp/zentaopms!2545
 2022-03-25 06:29:10 +00:00
孙广明 4b50d187e4 * Remove unused code and fix bug. 2022-03-25 14:25:26 +08:00
mayue 71d64d8e65 * Handling PHP compatibility issues. 2022-03-25 11:05:18 +08:00
孙广明 02e91b8ac5 * Fix program whitelist bug. 2022-03-25 10:27:56 +08:00
tianshujie 9b7d8686c7 * Modify the judgment logic. 2022-03-24 09:42:08 +08:00
tianshujie e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
xieqiyu 23a898218d * Fix bug#20850. 2022-03-16 16:28:32 +08:00
tianshujie df14bc65ef * Fix icon for kanban project. 2022-03-16 10:39:50 +08:00
tianshujie 69bd684cd3 * Fix bug #20353. 2022-03-04 15:47:17 +08:00
liumengyi c237c59b5e * Fix bug #20339. 2022-03-04 13:57:01 +08:00
tianshujie 3246d38e73 * Fix bug #20300. 2022-03-03 16:50:52 +08:00
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