Commit Graph

267 Commits

Author SHA1 Message Date
tianshujie98
0a7f82bc45 * Finish task #8087. 2020-09-30 14:16:08 +08:00
tianshujie98
32444c9564 * Finish task #7990. 2020-09-18 13:11:14 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie
4170ad49b5 Fix bug #2582 2020-08-17 08:59:45 +08:00
holan20180123
29a2c25ef1 * Fix bug #3334. 2020-08-12 08:15:40 +08:00
holan20180123
afdf88d276 * Fix bug #3340. 2020-08-10 17:33:42 +08:00
chenfei
893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
sgm0422
ecb1f9b128 * Finish task #1102. 2020-07-20 16:08:13 +08:00
sgm0422
9358aa343b * Finish task #1087. 2020-07-20 15:34:32 +08:00
sgm0422
2e454b1415 * Finish task #7429. 2020-07-14 11:21:12 +08:00
guanxiying
54e1e27436 * Fix request type of task. 2020-07-07 11:23:54 +08:00
sgm0422
1b9e88ca2b * Add task type. 2020-07-07 11:03:41 +08:00
z
ac3e27aa04 * revert for recordZero. 2020-07-06 17:11:53 +08:00
tianshujie98
97429381e8 * Fix bug #3258. 2020-07-01 17:46:52 +08:00
wangyidong
65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00
wangyidong
e8db459f5f * finish task #6622. 2019-12-04 11:33:00 +08:00
wangyidong
ecbf8220da * add new version and upgrade. 2019-11-28 09:29:36 +08:00
Yagami
697a1122ba * Code for task #6410. 2019-10-14 15:55:30 +08:00
Yagami
31af090d1e * Finish task #6410. 2019-10-14 14:39:56 +08:00
Yagami
b16752383d * Finish task #6392. 2019-10-10 14:39:46 +08:00
wangyidong
2a83351760 * add en and zh-tw lang. 2019-08-22 17:34:55 +08:00
Yagami
0976a004a8 * Add lang file for workflow. 2019-07-30 11:10:14 +08:00
liugang
5e32ee1081 * Add subStatus in lang files.
* Change sub status when status is changed and sub status is not set, and record the changes.
2019-07-30 10:10:10 +08:00
jinianlan
c383da7a8c * finish task #6097,#6103,#6108,#6100 2019-07-15 17:07:26 +08:00
wangyidong
4453ebcac0 * finish task #5943. 2019-07-10 17:15:43 +08:00
wangyidong
47e23892c0 * finish task #5957. 2019-07-10 14:42:54 +08:00
wangyidong
f4153b7623 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-10 12:15:52 +08:00
wangyidong
23922ac917 * finish task #5993. 2019-07-10 12:15:19 +08:00
reneeteng
d082ebafad * Remove space in lang file. 2019-07-09 16:12:03 +08:00
reneeteng
7efd22a0ab * Lang file update. 2019-07-09 09:42:01 +08:00
reneeteng
a3e86de815 * Lang file update. 2019-07-08 10:48:13 +08:00
reneeteng
c1f342e0bb * Lang file update for proj. 2019-07-05 16:28:38 +08:00
reneeteng
9a0698b347 * Lang optimized. 2019-07-04 10:12:43 +08:00
Yagami
368775a796 * Finish task #5892. 2019-07-01 14:18:23 +08:00
Yagami
4296bd1291 * Finish task #5892. 2019-06-28 15:16:41 +08:00
Yagami
f0e6ad5643 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-18 18:00:34 +08:00
wangyidong
f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
wangyidong
96d2cdca60 * adjust for style. 2019-06-11 10:04:25 +08:00
wangyidong
c3f0fd4714 * finish task #5628. 2019-06-06 15:14:36 +08:00
reneeteng
176f776614 * Lang file update. 2019-06-06 11:18:57 +08:00
reneeteng
de2725da3b * Lang file update. 2019-06-05 17:22:34 +08:00
Yagami
b590c371bb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-05 17:16:29 +08:00
reneeteng
c27f1e3758 * Lang file update. 2019-06-05 15:19:49 +08:00
Yagami
2aeb751159 * Fix Est(h) to Est. 2019-06-04 11:30:18 +08:00
reneeteng
23eb8f03cb * Lang file update. 2019-06-04 09:35:12 +08:00
reneeteng
029572d70a * Lang file update. 2019-06-03 17:25:06 +08:00
reneeteng
fa047a15c4 * Lang file update. 2019-06-03 16:14:42 +08:00
reneeteng
c4e897ac15 * Lang file update. 2019-05-31 10:57:24 +08:00
reneeteng
16a92b51cb * Lang file update. 2019-05-29 17:07:58 +08:00
reneeteng
d0b6386ca7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 11:23:19 +08:00