Commit Graph
1072 Commits
Author SHA1 Message Date
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
caoyanyi 8267cfaa94 * Fix bug #25032. 2022-07-08 13:50:23 +08:00
tianshujie 2c6aeb6c19 * Fix bug #25014. 2022-07-08 10:15:18 +08:00
王怡栋 a97b35f2bc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code rollback

See merge request easycorp/zentaopms!4410
2022-07-07 08:13:20 +00:00
lanzongjun f51027b090 * fix bug #24280 2022-07-07 16:06:48 +08:00
liumengyi 9e5a0ff356 * Fix bug for task #59469. 2022-07-07 12:06:41 +08:00
liumengyi 7c2eae9399 * Fix bug of task #59469. 2022-07-06 13:22:01 +08:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
liumengyi f6169c53b5 * Finish task #59469. 2022-07-05 20:47:47 +08:00
liumengyi 2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00
chaideqing 5965752003 * adjust xuanxuan notification center logic, task #58691 2022-07-01 16:27:40 +08:00
孙广明 50dce20f6f * Code for action error. 2022-06-29 16:20:07 +08:00
孙广明 b9f3120c8b * Fix bug #24508. 2022-06-29 13:29:03 +08:00
孙广明 ad17666521 * Code for action details. 2022-06-28 15:32:08 +08:00
孙广明 3cac1a020c * Refactor action getDynamic. 2022-06-28 15:02:19 +08:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
tianshujie 33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
tianshujie 5dff5c5eb4 * Resolve issue #674. 2022-06-10 16:01:51 +08:00
tianshujie 9162162212 * Fix bug #23573. 2022-06-10 15:14:43 +08:00
tianshujie 01c135440b * Fix bug #23455. 2022-06-10 09:31:44 +08:00
tianshujie 6825ac20c4 * Fix bug #23421. 2022-06-10 09:31:00 +08:00
王怡栋 196b78a0aa Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476

See merge request easycorp/zentaopms!3794
2022-06-08 06:48:46 +00:00
tianshujie 9cb0df56c6 * Finish task #56453. 2022-06-08 11:05:32 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
李玉春 6fe727b009 Update model.php 2022-06-06 02:13:20 +00:00
宋辰轩 8f4cc42550 * Modify function return. 2022-06-06 10:09:48 +08:00
宋辰轩 6af617ec3b Merge branch 'master' into sprint/scx_zaction 2022-06-06 08:30:30 +08:00
Wenrui LI b627bab5a0 * filter out all xuan actions. 2022-05-29 13:46:24 +08:00
宋辰轩 53c84c3480 * Delete /tmp/patch and patch actions after upgrade. 2022-05-26 17:10:33 +08:00
宋辰轩 e7b5dcec09 * Create action for ztools. 2022-05-26 11:22:43 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
zenggang 430209e92b * Fix bug#22554,22673 2022-05-19 03:23:35 +00:00
李玉春 579391bd84 Merge branch 'sprint/191_liumengyi_54350' into 'master'
* Finish task #54350.

See merge request easycorp/zentaopms!3506
2022-05-19 03:18:38 +00:00
liumengyi d2f30493a3 * Code format for task#54350. 2022-05-19 11:17:15 +08:00
liumengyi ff4e5ba635 * Fix bug for task#54350. 2022-05-19 10:24:14 +08:00
tianshujie 45e4fcdfab * Fix bug #22636. 2022-05-18 16:51:09 +08:00
liumengyi b8c091aa27 * Finish task #54350. 2022-05-18 15:17:51 +08:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tianshujie c0d9625c1d * Add testcase of kanban module. 2022-05-17 17:07:36 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
hufangzhou 7cc75bf80a * Fix bug #22250. 2022-05-16 13:43:36 +08:00
hufangzhou b9a60485c3 * Fix bug #22439. 2022-05-13 09:33:37 +08:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master'
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
2022-05-12 08:48:06 +00:00
tianshujie 85469bca87 * Fix bug #22436. 2022-05-12 16:34:23 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00