Commit Graph
330 Commits
Author SHA1 Message Date
hufangzhou 99b2694d90 * Add the comment. 2022-06-30 15:34:02 +08:00
hufangzhou 49b54944ad * Fix bug #24623. 2022-06-30 14:47:31 +08:00
hufangzhou ab1a43e1c6 * Change the xuan version. 2022-06-30 09:10:00 +08:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
2022-06-24 01:35:58 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
dingyongliang 66828037e0 * hide nav in electron zentao. 2022-06-14 13:12:41 +08:00
文睿 李 0918fea373 * reword xuan message title. 2022-06-09 06:49:33 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
Wenrui LI 2a98caf35a * fix langName not set for web client. 2022-05-31 11:32:47 +08:00
Wenrui LI 96d4a06f35 * fix client notification. 2022-05-31 11:29:31 +08:00
hufangzhou c0121f5940 * Change the xuanxuan version. 2022-05-26 13:05:05 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong eec42b3e57 * adjust for upgrade. 2022-05-20 09:44:43 +08:00
tianshujie 45e4fcdfab * Fix bug #22636. 2022-05-18 16:51:09 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
wangyidong af305d0916 * code bug #21710. 2022-04-28 11:07:17 +08:00
caoyanyi 210d2fb29f * Fix bug #21322. 2022-04-22 05:07:13 +00:00
caoyanyi 6883f9b5fb * Fix bug #12918. 2022-04-21 01:52:21 +00:00
王怡栋 f7ded5c5cf Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2769
2022-04-07 08:38:10 +00:00
Wenrui LI a030e15375 * set integration for xuan. 2022-04-06 15:46:18 +08:00
Wenrui LI a12b67fd3b * add integration module and whitelist its method. 2022-04-06 15:04:40 +08:00
qixinzhi 60b0c5895a * format. 2022-04-01 16:03:41 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
Wenrui LI 7ecc17b836 * format code. 2022-04-01 08:57:30 +08:00
Wenrui LI 08efa363af * fix xxd lang. 2022-03-30 14:56:30 +08:00
Chenjianyu 670db9a334 * Fix bug #18299, remove download xxd button for the user who has no rights to download xxd. 2022-03-29 14:54:12 +08:00
Wenrui LI df0f6cfac4 * fix chat priv and menu, bug #21175. 2022-03-28 14:57:31 +08:00
Wenrui LI 63f93bdde2 * change client to chat. 2022-03-28 14:57:31 +08:00
hufangzhou 11e151a6fa * Add the new version. 2022-03-24 10:48:05 +08:00
王怡栋 c2d1285a2b Merge branch 'sprint/lite6_lwr_tweak_chat' into 'master'
Tweak chat, rename xuan to chat and disable by default.

See merge request easycorp/zentaopms!2474
2022-03-23 06:23:06 +00:00
王怡栋 8daf73d131 Merge branch 'sprint/fixbug_hufangzhou_xuanxuan' into 'master'
* Temporary fix the navigation of xuanxuan conference.

See merge request easycorp/zentaopms!2476
2022-03-23 06:21:45 +00:00
hufangzhou cebdf93777 * Temporary fix the navigation of xuanxuan conference. 2022-03-23 13:59:24 +08:00
Wenrui LI 921037fda2 * fix no colon before port. 2022-03-23 13:54:46 +08:00
Wenrui LI cff19cb7be * disable web chat when xxd is offline, and prevent web client from guessing urls, task #50925, bug #18927. 2022-03-23 13:52:45 +08:00
Wenrui LI 2365794124 * disable chat by default, task #51509. 2022-03-23 13:36:11 +08:00
Wenrui LI 9424577291 * change client to chat, and remove xuan promotional message, task #51510. 2022-03-23 13:36:11 +08:00
朱金勇 d4ae966ebc Merge branch 'sprint/xuanxuan_93' into 'master'
Zentaoclient related changes from xuanxuan sprint 93

See merge request easycorp/zentaopms!2398
2022-03-22 00:55:07 +00:00
caoyanyi d8c594e873 * Fix bug 12342. 2022-03-17 13:58:15 +08:00
hufangzhou c2129fa980 * Finish task #50328. 2022-03-09 14:09:56 +08:00
孙广明 312f31db50 * Finish task #50327. 2022-03-07 16:22:25 +08:00
chaideqing 0d09307183 * refactor zentao client navbar context menu to same as zentao 2022-03-04 13:48:36 +08:00
hufangzhou 4fcbccbaa8 * Change the owt to conference. 2022-03-03 09:53:14 +08:00
Wenrui LI e23a1be570 * skip merging xuan notifications with contentType of text, bug #19668, task #49980. 2022-03-02 11:25:03 +08:00
dingyongliang 8f408df0f5 * fix zentao chatNotice style. 2022-03-01 17:28:43 +08:00
qixinzhi c9cc9562e4 * Fix xuanxuan web notification avatar bug #19281. 2022-03-01 15:57:02 +08:00
zhujinyong 83164be6f8 * Refactor xuan. 2022-03-01 13:19:09 +08:00
孙广明 77c462d397 Merge branch 'sprint/186_liumengyi_19982' into 'master'
* Modify xuanxuan inlcude.

See merge request easycorp/zentaopms!2002
2022-02-28 03:05:52 +00:00
liumengyi 76c7fe894a * Modify xuanxuan inlcude. 2022-02-28 11:03:59 +08:00
tianshujie 1ca1c52bd3 * Modify the noise loading path. 2022-02-28 10:57:31 +08:00