Commit Graph

139 Commits

Author SHA1 Message Date
王怡栋
c112088b06 * adjust for minifyfront. 2021-08-23 16:59:34 +08:00
wangyidong
7f9e7623e1 * add api in build. 2021-08-02 13:12:27 +08:00
wangyidong
7556d9cdb3 * adjust for merge xuanxuan. 2021-06-24 10:03:54 +08:00
wangyidong
107dd03c42 * adjust for xuanxuan. 2021-04-30 08:50:22 +08:00
wangyidong
4bb52f334f * code for xuanxuan. 2021-04-29 10:55:42 +08:00
wangyidong
faf4c2b4dd * fix bug and xuanxuan. 2021-04-28 16:27:34 +08:00
Yagami
a0f8e233f4 * Fix makefile. 2021-04-06 09:17:34 +08:00
wangyidong
8fead581a7 * revert Makefile and kindeditor. 2021-03-30 17:04:59 +08:00
wangyidong
34347209e9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:53:37 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
sgm0422
c11c68997d * Delete unused file. 2021-02-01 16:45:15 +08:00
Yagami
46bd395d61 * Code for details. 2021-01-27 16:56:56 +08:00
Yagami
ac77fa3a15 * Merge code. 2021-01-27 15:20:27 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
Yagami
e58726f7ab * Fix makefile. 2021-01-08 16:51:35 +08:00
Yagami
a409feb54a * Fix makefile. 2021-01-08 16:31:41 +08:00
wangyidong
d56406cbf2 * finish for task #8579. 2020-12-09 11:31:59 +08:00
wangyidong
fe4cd3fd3e * adjust for xuanxuan. 2020-03-24 15:58:44 +08:00
wangyidong
7c2c59bc24 * code for build zentaoxx. 2020-03-18 17:07:36 +08:00
wangyidong
cfa5261960 * finish task #6902 and merge xuanxuan. 2020-03-17 16:38:44 +08:00
wangyidong
fcfe033f28 * adjust for parent-child story. 2020-03-13 08:36:31 +08:00
wangyidong
89ea58a4da * adjust for make zentaoxx. 2020-03-10 18:07:31 +08:00
wangyidong
e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
wangyidong
fb9d64703b * adjust for xuanxuan 3.1.1. 2020-02-12 16:07:23 +08:00
wangyidong
60c64816eb * change for buile zentaoxx. 2020-02-11 17:28:57 +08:00
wangyidong
3111c7e36b * change for build zentaoxx. 2020-02-11 09:25:38 +08:00
wangyidong
1ff4817d15 * fix for change password in xx. 2019-11-29 14:27:48 +08:00
wangyidong
97f125b3b4 * change for merge xuanxuan. 2019-11-29 13:15:21 +08:00
wangyidong
7412623596 * adjust for xuanxuan. 2019-11-29 11:02:15 +08:00
wangyidong
a5ef283e58 * adjust for xuanxuan. 2019-11-29 10:19:51 +08:00
wangyidong
d14ee18ef4 * adjust for xuanxuan. 2019-11-29 09:43:31 +08:00
wangyidong
2033a0c0e9 * upgrade for xuanxuan. 2019-11-29 09:23:22 +08:00
wangyidong
f27516a1a5 * adjust for newest xuanxuan. 2019-11-29 08:27:10 +08:00
guanxiying
9720ffcf60 * Create index.html to every folder. 2019-11-21 10:06:57 +08:00
wangyidong
fc82d05224 * adjust for make zentaoxx. 2019-07-17 13:54:34 +08:00
wangyidong
00a096c5ee * change for en to de lang. 2019-07-15 08:07:30 +08:00
wangyidong
f43dc5c082 * adjust for bug. 2019-06-17 09:46:27 +08:00
wangyidong
c16de529c1 * adjust for merge xuanxuan. 2019-05-31 11:03:33 +08:00
wangyidong
2bcaaf7929 * adjust for build en rpm. 2019-05-08 18:10:09 +08:00
wangyidong
4baf52bb81 * adjust for merge xuanxuan. 2019-05-06 18:25:35 +08:00
wangyidong
df42c87ac2 * adjust for merge xuanxuan. 2019-05-06 13:04:54 +08:00
wangyidong
139021e037 * finish task #5424. 2019-04-30 14:13:03 +08:00
wangyidong
a7e7e81b32 * adjust for merge xuanxuan. 2019-04-28 09:47:05 +08:00
wangyidong
dff082a3e7 * code for task #5392. 2019-04-26 14:17:48 +08:00
wangyidong
81ea311f66 * code for task #5381. 2019-04-25 17:10:15 +08:00
chenfei
e2520978d1 * Adjust edit and delete button in view page of plan, release and build module. 2019-03-22 15:58:04 +08:00
wangyidong
bcdfc60b2a * adjust for cn2tw when make zentaoxx. 2019-01-30 15:00:24 +08:00
wangyidong
f60a6c481a * adjust for build package. 2019-01-30 11:38:29 +08:00
Yagami
d81a106fad * Fix makefile. 2019-01-25 09:07:13 +08:00
Yagami
b85628a43a * Fix makefile. 2019-01-23 16:16:27 +08:00