Commit Graph

299 Commits

Author SHA1 Message Date
tanghucheng
987d0d0443 * Fix bug #20968,20964. 2022-03-21 17:00:42 +08:00
zhujinyong
90d2447cae - Remove die() of admin module. 2021-12-20 09:13:32 +08:00
liyuchun
d392f0e44c * Code for task #41764. 2021-08-26 17:59:58 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +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
Yagami
88b7632ac0 * Fix bug. 2021-04-01 11:43:18 +08:00
qiyu-xie
f06361ffcc * Fix bug#11665. 2021-03-31 09:29:09 +08:00
Yagami
50fe4e5033 * Finish add left top btn task. 2021-03-23 11:45:15 +08:00
zhujinyong
6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
zhujinyong
a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami
2f5eb04e08 * Merge code. 2021-03-19 15:14:14 +08:00
leiyong
bcf500a081 * Finish task#36317. 2021-03-12 09:51:11 +08:00
zhujinyong
c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
zhujinyong
f54307a4cc * Fix code style. 2021-03-10 23:07:20 +08:00
Yagami
9516eeafff * Finish task #36481. 2021-03-09 15:22:30 +08:00
hufangzhou
1a75c3c3e1 * Finish task #36433. 2021-03-09 13:25:16 +08:00
qiyu-xie
d02eee1c8a * Fix bug. 2021-03-08 11:05:27 +08:00
leiyong
e133e198e3 * Adjust the language item. 2021-03-08 10:35:54 +08:00
leiyong
65ba71cec3 * Adjust admin module code. 2021-03-08 09:37:03 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong
e5b0134b22 * finish task #9114. 2021-01-29 14:27:32 +08:00
holan20180123
7c4cdf25a2 * Finish task #7931. Fix bug #3424. 2020-09-21 14:35:32 +08:00
holan20180123
1e6785c111 * Finish task #7931. Fix bug #3424. 2020-09-21 14:20:36 +08:00
holan20180123
3235db1db5 * Finish task #7931. 2020-09-17 10:39:12 +08:00
holan20180123
61bc92a6df * Finish task #7931. 2020-09-17 10:32:29 +08:00
holan20180123
143ada5106 * Fix bug #8034. 2020-09-16 11:09:57 +08:00
holan20180123
8edc1d2ec5 * Fix bug #8034. 2020-09-16 09:55:10 +08:00
z
0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z
5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
Yagami
bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
chenfei
1aa8187ae8 * Fix bug #3273. 2020-07-07 16:25:08 +08:00
zhaohaibo
e49039bd29 * task #753 2020-05-19 18:58:49 +08:00
wangyidong
65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00
wangyidong
dfc8de0b65 * finish task #7085. 2020-04-30 16:42:52 +08:00
wangyidong
523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
reneeteng
9e21c86389 * Install lang updated. 2020-03-17 15:38:35 +08:00
wangyidong
b0c98b5084 * fix bug for login use api. 2019-12-18 11:40:03 +08:00
wangyidong
6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
wangyidong
8d0f8521ba * finish task #6623. 2019-12-09 14:29:43 +08:00
wangyidong
6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +08:00
wangyidong
9d4b78a8f2 * finish task #6171. 2019-08-09 10:29:57 +08:00
wangyidong
17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
jinianlan
b3b77d8b8d Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-29 15:57:51 +08:00
jinianlan
c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong
282b43d426 * finish task #6167. 2019-07-29 14:53:14 +08:00
jinianlan
f26fb45064 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 08:51:59 +08:00
jinianlan
c383da7a8c * finish task #6097,#6103,#6108,#6100 2019-07-15 17:07:26 +08:00
wangyidong
2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00