Commit Graph

194 Commits

Author SHA1 Message Date
Yagami
0924720a8f * Merge code. 2020-12-09 15:36:40 +08:00
Yagami
90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
z
55fb0867cb * code for task #8496. 2020-11-25 10:06:09 +08:00
z
3c7da6dc60 * code for task #8496. 2020-11-24 15:38:21 +08:00
Yagami
97ac6f0b9c * Merge code. 2020-11-24 14:46:19 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
z
5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
holan20180123
48d521f958 * Finish task #8392. 2020-11-17 17:21:58 +08:00
holan20180123
bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
Yagami
b12cf02ef0 * Code for UR name and SR name. 2020-11-09 15:35:24 +08:00
holan20180123
09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Yagami
662c7f4545 * Fix doc bug. 2020-09-25 13:27:46 +08:00
Yagami
3b31984c72 * Fix code style. 2020-09-25 10:21:17 +08:00
Yagami
8ec9f74477 * Add custom user role list. 2020-09-25 10:19:49 +08:00
holan20180123
00dc2ad43a * Restore task #7930. 2020-09-23 17:22:55 +08:00
z
3fa53be319 * code for task #7939. 2020-09-23 15:05:45 +08:00
holan20180123
76e319039d * Finish task #7930. Fix bug #3430. 2020-09-23 10:36:25 +08:00
Yagami
11bc9076ac * Code for task #7825. 2020-09-07 14:18:32 +08:00
Yagami
f0e7160544 * Delete plan config. 2020-09-03 09:56:46 +08:00
Yagami
a1f4a8e7bb * Finish task #7812. 2020-09-02 11:27:34 +08:00
Yagami
f696462213 * Adjust code style. 2020-08-31 14:01:45 +08:00
Yagami
116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
Yagami
bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
Yagami
2b0dfd8168 * Adjust code style. 2020-08-31 09:04:25 +08:00
holan20180123
22f5c0b363 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:48:23 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
leiyong
df1a9ee5ef * Finish task#7702. 2020-08-27 09:23:10 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami
5639a2a7f1 * Fix details. 2020-08-19 08:30:12 +08:00
Yagami
9c8252a0c4 * Move estimate from qc to zentao. 2020-08-17 13:25:46 +08:00
tianshujie98
f423abddca * Finish task #7577. 2020-08-06 17:13:45 +08:00
tianshujie98
9eb723689b * Finish task #7417. 2020-07-14 15:26:11 +08:00
wangyidong
fd0da30d09 * fix bug. 2020-05-26 09:14:31 +08:00
guanxiying
f1949ae5de * Go to my index page when concept inited. 2019-11-26 17:38:52 +08:00
guanxiying
9a74ca9c40 * Finish task 6569. 2019-11-26 14:13:45 +08:00
guanxiying
19d585f6c7 * Remove unused unset typeList codes. 2019-11-20 13:53:09 +08:00
guanxiying
871a6de666 * Fix ajax request. 2019-11-18 14:42:32 +08:00
guanxiying
be4a224c64 * Fix hour point setting function. 2019-11-18 14:20:55 +08:00
guanxiying
bda037db53 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-18 13:09:10 +08:00
guanxiying
58357af226 * Finish task #6549. 2019-11-18 13:06:50 +08:00
Yagami
029c22e0ac * Finish task #6500. 2019-11-18 11:26:30 +08:00
wangyidong
6143a0ae5b * adjust for user contact. 2019-05-31 10:31:00 +08:00
wangyidong
aca82aeded * finish task #5578. 2019-05-30 17:41:44 +08:00
Yagami
7fd493a1c3 * Finish task #5546. 2019-05-29 09:55:05 +08:00
yfl
6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
yfl
e4952b3eb2 * Task #5423 2019-05-05 18:40:51 +08:00
yfl
526e5298b4 * Finish task #5380 2019-04-28 17:44:49 +08:00
wangyidong
216c6f5c0e * adjust for custom timezone. 2019-02-26 16:49:49 +08:00
wangyidong
7d1a2d4d7f * remove useless code. 2019-02-25 09:01:30 +08:00