Commit Graph
207 Commits
Author SHA1 Message Date
zhouxudong 2196d2746d * Finish task #60388. 2022-07-12 01:05:21 +00:00
liuruogu 80a7f810d6 * Finish task #59641. 2022-07-05 01:39:38 +00:00
liumengyi 6c8c18ef61 * Fix bug #24468. 2022-06-28 15:48:16 +08:00
liumengyi 2379f0e4a4 * Finish task #58558, #58559. 2022-06-28 13:22:23 +08:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
hufangzhou ee7960af51 * Fix bug #24157,#24155,#24154. 2022-06-22 17:42:59 +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
xieqiyu a7c8401684 * Fix bug#14454. 2022-04-14 16:45:28 +08:00
xieqiyu f971ded6fd * Fix bug#14454. 2022-04-14 16:13:18 +08:00
zhouxudong 61198c8486 * Fix bug #14189. 2022-04-13 15:40:09 +08:00
tanghucheng b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +08:00
caoyanyi f58099b204 * Add app language. 2022-03-25 09:17:21 +08:00
caoyanyi b7b3a26e33 * Add app language. 2022-03-23 16:26:51 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan a2a4ec8d6f *Translate. 2022-02-25 11:16:41 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
tanghucheng 41e0b66473 * finish task #49013. 2022-02-14 13:17:56 +08:00
孙广明 a2477a59bf * Delete unused lang. 2022-01-21 14:33:58 +08:00
zhouxudong 919a355220 *Code for language. 2022-01-12 11:38:39 +08:00
zhouxudong 0f958a378d *Fix bug #17388. 2022-01-12 09:07:01 +08:00
zhouxudong 82f0cd2fd6 *Fix bug #17388. 2022-01-12 08:41:15 +08:00
zhouxudong 84c9e3aa58 *Fix bug #17388. 2022-01-12 08:34:41 +08:00
王怡栋 cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
孙广明 1faf545954 * Remove unused code. 2021-12-02 13:10:55 +08:00
孙广明 d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
王怡栋 808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
tianshujie98 aa84629f3b * Finish task #41798. 2021-08-20 13:17:10 +08:00
Hao Sun 13aa0c9628 * support for limiting user place some panel in other columns. 2021-08-05 15:20:34 +08:00
wangyidong 268c4e47b7 * finish task #40293. 2021-07-16 13:02:42 +08:00
wangyidong 3034d24f2c * adjust for task #40020. 2021-07-12 10:09:39 +08:00
wangyidong 834d42610c * finish task #40020. 2021-07-08 13:11:27 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
Yagami 18acf1cef6 * Fix progress block logic. 2021-06-29 16:24:26 +08:00
tianshujie98 16b3845b2e * Add meeting to pending block. 2021-06-12 21:06:57 +08:00
wangyidong 3785a39325 * adjust for zh-tw lang. 2021-04-30 14:14:43 +08:00
holan20180123 a6e9f70abd * Finish task #37528. 2021-04-15 10:27:10 +08:00
tianshujie98 8c1de08633 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 08:21:32 +08:00
tianshujie98 985101a0f0 * Adjust the language items of the block module. 2021-04-15 08:20:46 +08:00
Yagami 38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
tianshujie98 d0b6699671 * Finish task#37020. 2021-04-01 17:40:15 +08:00
hufangzhou 5b1a279c3d * Finish task #37041. 2021-04-01 13:24:56 +08:00
Yagami dad8fc8e7f * Fix upgrade details. 2021-04-01 13:20:24 +08:00
tianshujie98 2ad6666fa9 * Fix bug #11035. 2021-03-30 16:58:44 +08:00
holan20180123 0c8a298230 * Finish task #37028. 2021-03-30 13:31:46 +08:00
holan20180123 8f386f8ed2 * Finish task #37014. 2021-03-30 11:30:51 +08:00
holan20180123 2116dd48f6 * Finish task #37009. 2021-03-29 17:16:52 +08:00
tianshujie98 a4c865e7fd * Deal with more link issues in project blocks. 2021-03-26 12:16:56 +08:00
qiyu-xie 05d469e703 * Finish task#36761. 2021-03-16 13:10:50 +08:00