Commit Graph
29083 Commits
Author SHA1 Message Date
liumengyi a9b865aa9f * Finish task #45158. 2021-11-26 10:47:53 +08:00
孙广明 00b34e5e1f Merge branch 'sprint/29_zhouxin_45099' into 'sprint/168'
Finish task #45099.

See merge request easycorp/zentaopms!619
2021-11-26 01:06:42 +00:00
孙广明 1e47b084a4 Merge branch 'sprint/168_zhengrunyu_45151' into 'sprint/168'
*Finish task #45151.

See merge request easycorp/zentaopms!620
2021-11-26 01:06:06 +00:00
zhengrunyu 119a3fab7d *Finish task #45151. 2021-11-26 08:48:26 +08:00
李玉春 617474ece6 Merge branch 'sprint/175_liumengyi_45155' into 'sprint/168'
* Finish task #45155

See merge request easycorp/zentaopms!615
2021-11-26 00:24:14 +00:00
liumengyi 4c090eefe2 * Finish task #45155. 2021-11-25 15:58:10 +08:00
李玉春 8a0841977e Merge branch 'sprint/168_sgm_45153' into 'sprint/168'
* Finish task #45153.

See merge request easycorp/zentaopms!618
2021-11-25 07:34:22 +00:00
孙广明 8656350081 * Remove noproject merge method. 2021-11-25 15:28:54 +08:00
zhouxin cd9290d80b Finish task #45099. 2021-11-25 07:26:24 +00:00
孙广明 182106be13 * Finish task #45153. 2021-11-25 15:14:10 +08:00
zhengrunyu 3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
liumengyi 7fa6f3ef5c * Finish task #45155:. 2021-11-25 13:53:13 +08:00
孙广明 a2f81d7d85 Merge branch 'sprint/168_tanghucheng_formax' into 'sprint/168'
* Code for project model function getTeamMemberPairs.

See merge request easycorp/zentaopms!609
2021-11-25 05:33:36 +00:00
tanghucheng 17f6a6203c * Code for project. 2021-11-25 13:32:06 +08:00
liumengyi bcf7283bc7 * Finish task #45155. 2021-11-25 13:28:45 +08:00
tanghucheng 72863779bb * Code for project function getTeamMemberPairs. 2021-11-25 10:31:49 +08:00
tanghucheng 8742bd0314 * Code for project model function getTeamMemberPairs. 2021-11-24 17:15:05 +08:00
李玉春 66d1d59357 Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix php 5.3 bug.

See merge request easycorp/zentaopms!608
2021-11-24 08:19:37 +00:00
孙广明 c5e7bd91c3 * Fix php 5.3 bug. 2021-11-24 15:06:09 +08:00
李玉春 2c0e949608 Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix bug.

See merge request easycorp/zentaopms!606
2021-11-24 06:03:12 +00:00
孙广明 59172b420e * Fix project and product relation bug. 2021-11-24 14:01:50 +08:00
Lwrless 0913466eb7 * update zentao extension for xuanxuan. 2021-11-24 14:01:50 +08:00
孙广明 9a9f31d4ec Merge branch 'sprint/168_liwenrui_update_xuanxuan_extension' into 'sprint/168'
Update zentao-integrated xuanxuan extension.

See merge request easycorp/zentaopms!607
2021-11-24 05:20:11 +00:00
Lwrless b7a6b06a00 * update zentao extension for xuanxuan. 2021-11-24 13:17:53 +08:00
孙广明 b956e21448 * Fix bug. 2021-11-24 13:10:40 +08:00
李玉春 cfde5172f3 Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix bug #16703.

See merge request easycorp/zentaopms!605
2021-11-24 05:03:12 +00:00
朱金勇 40e772acea Merge branch 'sprint/168_chaideqing_44636' into 'sprint/168'
modify zentao bug/task/story card page's srollbar and actionbar

See merge request easycorp/zentaopms!604
2021-11-24 05:01:16 +00:00
chaideqing 45556985f7 * refactor ifelse code 2021-11-24 11:22:07 +08:00
孙广明 2dc2c46737 * Fix bug #16703. 2021-11-24 10:55:42 +08:00
chaideqing 70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +08:00
李玉春 052157902a Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix bug #16530.

See merge request easycorp/zentaopms!602
zentaopms_16.0.alpha3_20211124
2021-11-23 09:13:54 +00:00
孙广明 c6d990a3f5 * Fix bug #16530. 2021-11-23 16:26:30 +08:00
孙广明 e42559561e Merge branch 'sprint/172_liyuchun_16518' into 'sprint/168'
* Fix bug #16518.

See merge request easycorp/zentaopms!588
2021-11-23 06:08:49 +00:00
liyuchun d396d4e6a9 * Adjust code style. 2021-11-23 14:05:43 +08:00
朱金勇 9d2bb37821 Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168'
* Task #44358, drop card immediately on mouse leave page.

See merge request easycorp/zentaopms!598
2021-11-22 09:40:44 +00:00
Hao Sun ff1d07fdf1 * task #44358, drop card immediately on mouse leave page. 2021-11-22 17:13:41 +08:00
王怡栋 6b32de5910 Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* fix scroll bar css invalid after merge

See merge request easycorp/zentaopms!582
2021-11-22 08:15:47 +00:00
朱金勇 4801bd8ea7 Merge branch 'sprint/168_sunhao/client_integrated' into 'sprint/168'
* task #44639, task #44637, support for using zentao apps in client left navbar.

See merge request easycorp/zentaopms!581
2021-11-22 07:47:53 +00:00
Hao Sun b011796c15 * fix php syntax error. 2021-11-22 15:33:59 +08:00
liyuchun afafa08d92 * Fix bug #16518. 2021-11-22 15:17:00 +08:00
Hao Sun 6619652319 * append special class to body in client mode. 2021-11-22 15:10:00 +08:00
孙广明 1016c9762c Merge branch 'sprint/172_liyuchun_16523' into 'sprint/168'
* Fix bug #16523.

See merge request easycorp/zentaopms!568
2021-11-22 06:51:02 +00:00
孙广明 11a320555c Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168'
* Adjust execution button name.

See merge request easycorp/zentaopms!578
2021-11-22 06:50:34 +00:00
liyuchun 5dc23ad4f2 * Adjust create bug view. 2021-11-22 14:48:33 +08:00
Hao Sun f7b8fcd85f * fix app menu not show in browser. 2021-11-22 14:41:15 +08:00
李玉春 c5751d1de2 Merge branch 'sprint/168_hufangzhou_16509' into 'sprint/168'
* Fix bug #16509.

See merge request easycorp/zentaopms!583
2021-11-22 06:36:09 +00:00
Hao Sun 5a92064d51 * update zentao integrated extension. 2021-11-22 14:30:50 +08:00
hufangzhou 63bc9f80c4 * Fix bug #16509. 2021-11-22 14:11:13 +08:00
liyuchun dfe63ef1a6 * Adjust style of create story. 2021-11-22 14:00:53 +08:00
qixinzhi f5d89fee3d * fix scroll bar css invalid after merge 2021-11-22 13:51:27 +08:00