Commit Graph

313 Commits

Author SHA1 Message Date
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春
3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-07 08:50:57 +00: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
王怡栋
ff06288dc8 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803
2021-12-07 08:21:33 +00:00
liyuchun
b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
1faf545954 * Remove unused code. 2021-12-02 13:10:55 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
孙广明
d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
王怡栋
076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
tianshujie
4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
dingna
d9ac355260 * Fix bug #14529. 2021-09-17 13:19:57 +08:00
hufangzhou
149650ee8f * Finish task #42139. 2021-09-02 13:38:04 +08:00
王怡栋
75f004f38a * add new version and upgrade. 2021-08-23 10:24:12 +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
54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
qiyu-xie
34992b6a40 * Adjust code. 2021-07-16 14:00:27 +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
leiyong
e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
tianshujie98
690d4aa32a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 17:40:46 +08:00
tianshujie98
d0b6699671 * Finish task#37020. 2021-04-01 17:40:15 +08:00
hufangzhou
ee4864a30a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:48:24 +08:00
hufangzhou
24e7dd0e61 * Finish task #37035. 2021-04-01 15:48:18 +08:00
qiyu-xie
9db0c51417 * Finish task#37029. 2021-04-01 14:33:45 +08:00
hufangzhou
bddbc3d7d1 * Finish task #37053. 2021-04-01 13:37:30 +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
Yagami
5c59c161e5 * Fix bugs. 2021-03-31 10:57:34 +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
6ac7575072 * Finish task #37014. 2021-03-30 11:05:23 +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
qiyu-xie
40da174ece * Finish task#36759. 2021-03-16 11:41:24 +08:00