Commit Graph
29129 Commits
Author SHA1 Message Date
李玉春 2f4e67eda8 Merge branch 'sprint/175_tengfei_lang' into 'sprint/168'
* Edit lang file.

See merge request easycorp/zentaopms!651
2021-11-30 01:37:31 +00:00
孙广明 361f840ce8 Merge branch 'sprint/29_zhouxin_45100' into 'sprint/168'
Finish task 45100.

See merge request easycorp/zentaopms!647
2021-11-30 01:32:21 +00:00
reneeteng bd2b8ab2a6 * Edit lang file. 2021-11-29 16:31:18 +08:00
zhouxin 4cec6b697d Finish task 45100. 2021-11-29 07:00:16 +00:00
孙广明 4ca2f22704 Merge branch 'sprint/29_zhouxin_45107' into 'sprint/168'
Finish task 45107.

See merge request easycorp/zentaopms!638
2021-11-29 03:25:28 +00:00
zhouxin bbcdd1a8a1 Change planProject to project. 2021-11-29 03:17:59 +00:00
孙广明 b9a508facd Merge branch 'sprint/29_zhouxin_45102' into 'sprint/168'
Finish task 45102.

See merge request easycorp/zentaopms!622
2021-11-29 03:10:47 +00:00
李玉春 5eaeb090d3 Merge branch 'sprint/175_liumengyi_45157' into 'sprint/168'
* Finish task #45157.

See merge request easycorp/zentaopms!621
2021-11-29 02:55:48 +00:00
liumengyi 3e1fc7ad5a * minor refactor. 2021-11-29 10:52:29 +08:00
liumengyi cd62501f36 * minor refactor. 2021-11-29 10:49:56 +08:00
李玉春 a5991c4f6a Merge branch 'sprint/175_liumengyi_16869' into 'sprint/168'
* Fix bug #16869.

See merge request easycorp/zentaopms!637
2021-11-29 02:44:46 +00:00
liumengyi 235d7bbc0a * Finish task #45157. 2021-11-29 10:43:05 +08:00
liumengyi 41d073f19d * Finish task #45157. 2021-11-29 10:37:56 +08:00
liumengyi 5dbd0ad4b9 * Fix bug #16869. 2021-11-29 10:28:52 +08:00
李玉春 803a3524b9 Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168'
* Finish task #45156.

See merge request easycorp/zentaopms!634
2021-11-29 02:10:47 +00:00
liumengyi b6acb88c21 * Fix bug #16869. 2021-11-29 09:55:00 +08:00
liumengyi 2cfb89f727 * Finish task #45157. 2021-11-29 09:47:04 +08:00
zhouxin 456b7d06a1 Finish task 45107. 2021-11-29 01:35:28 +00:00
孙广明 d33ab012e1 Merge branch 'sprint/175_liyuchun_45152' into 'sprint/168'
* Finish task #45152.

See merge request easycorp/zentaopms!627
2021-11-29 00:58:04 +00:00
liumengyi 0dcdc497a2 * Finish task #45156. 2021-11-29 08:37:47 +08:00
李玉春 5afe0b12b5 Merge branch 'sprint/175_liumengyi_45158' into 'sprint/168'
* Finish task #45158.

See merge request easycorp/zentaopms!624
2021-11-29 00:34:53 +00:00
liumengyi 143dff6f0b * Finish task#45156. 2021-11-29 08:24:04 +08:00
liumengyi f77c484548 * Finish task #45157. 2021-11-29 08:21:29 +08:00
朱金勇 8c1b5a2a5b Merge branch 'sprint/168_sunhao/task44627' into 'sprint/168'
* task #44627, add web client entry button to bottom navbar in index page.

See merge request easycorp/zentaopms!632
2021-11-26 07:43:15 +00:00
孙浩 8ff597ece9 Merge branch 'sprint/168_qixinzhi_44858' into 'sprint/168'
* product plan card for xuanxuan extension

See merge request easycorp/zentaopms!628
2021-11-26 07:38:59 +00:00
Hao Sun ba19230925 * improve UI for embed web client. 2021-11-26 15:38:06 +08:00
liumengyi e5f3e87ea1 * Finish task #45157. 2021-11-26 15:08:17 +08:00
liumengyi 0c2b88ae38 * Finish task #45157. 2021-11-26 15:04:47 +08:00
李玉春 d4020ba717 Merge branch 'sprint/175_liumengyi_16805' into 'sprint/168'
* Fix bug #16805.

See merge request easycorp/zentaopms!629
2021-11-26 07:03:18 +00:00
Hao Sun 84092dcc2c * add web client entry button to bottom navbar in index page. 2021-11-26 15:03:18 +08:00
Hao Sun 8632e63341 * refactor. 2021-11-26 15:01:51 +08:00
liumengyi d374d467cc * Fix bug #16805. 2021-11-26 14:31:33 +08:00
qixinzhi e7b79d83fc * product plan card for xuanxuan extension 2021-11-26 14:15:53 +08:00
liumengyi e4e040326b * Finish task #45156. 2021-11-26 14:01:11 +08:00
liyuchun 1b63752f83 * Finish task #45152. 2021-11-26 14:00:54 +08:00
liumengyi c72bdbbdfb * Finish task #45158. 2021-11-26 10:50:16 +08:00
liumengyi a9b865aa9f * Finish task #45158. 2021-11-26 10:47:53 +08:00
liumengyi df2f48128a * Finish task #45157. 2021-11-26 10:31:47 +08:00
liumengyi 2c8777ebe9 * Finish task #45157. 2021-11-26 10:26:43 +08:00
zhouxin e732fd1a51 Finish task 45102. 2021-11-26 02:25:56 +00:00
liumengyi 4d8b54a0b1 * Finish task #45157. 2021-11-26 10:08:56 +08:00
liumengyi 542369e382 * Finish task #45157. 2021-11-26 09:13:24 +08:00
liumengyi 508b73fea6 * Finish task #45157. 2021-11-26 09:09:48 +08:00
liumengyi c6e4ff62d6 * Finish task #45157. 2021-11-26 09:07:28 +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
liumengyi 99b52e6b7e * Finish task #45157. 2021-11-26 08:59:55 +08:00
liumengyi fb843381ca * Finish task #45157. 2021-11-26 08:55:04 +08: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