Commit Graph

269 Commits

Author SHA1 Message Date
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami
89eb2e6f34 * Code for qc. 2020-08-14 11:13:53 +08:00
tianshujie98
0f47a7f357 * Fix bug #2581. 2020-08-11 10:02:28 +08:00
tianshujie98
fba9a11c58 * Fix bug #2581. 2020-08-11 09:30:12 +08:00
Yagami
120ffbff49 * Fix user model. 2020-08-11 09:21:25 +08:00
z
4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
Yagami
e05fee759b * Fix user logic. 2020-08-06 10:28:49 +08:00
qiyu-xie
76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
Yagami
956f9e8f2b * FIx details. 2020-08-01 13:53:49 +08:00
z
9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z
174f3b99ca * finish task #7310. 2020-07-06 15:57:58 +08:00
z
3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
z
30415e3d52 * fix for undelete project and product. 2020-06-23 09:26:47 +08:00
z
6b6c9a713e * finish task #7260. 2020-06-17 14:40:44 +08:00
sgm0422
19a1db72df * Fix user view bug. 2020-06-16 14:15:22 +08:00
sgm0422
bb92200ea5 * Add en lang. 2020-06-16 13:38:41 +08:00
sgm0422
8ecac0f6fb * Fix group error. 2020-06-16 10:49:23 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
sgm0422
2d97663c5d * Compute program priv. 2020-06-11 17:25:36 +08:00
wangyidong
fd0da30d09 * fix bug. 2020-05-26 09:14:31 +08:00
wangyidong
423d6b3a5d * code for task #7197. 2020-05-14 15:47:11 +08:00
wangyidong
f70d59d5b1 * finish task #7197. 2020-05-14 15:26:06 +08:00
wangyidong
2a0b9d3f43 * finish task #7066. 2020-05-09 08:23:34 +08:00
chenfei
c7395c8b44 * Merge zentaopms_cmmi to zentaopms_12.0.1 2020-02-17 14:02:00 +08:00
leiyong
03e06b6e7d Fix bug #2941,#2937. 2020-02-06 14:12:23 +08:00
wangyidong
ee07401214 * fix bug. 2019-12-16 15:55:10 +08:00
wangyidong
1925b1812e * finish task #2903. 2019-12-13 15:11:40 +08:00
guanxiying
83dbfde648 * Fix bug #2461. 2019-12-11 17:37:26 +08:00
guanxiying
230dcd7dd7 * Setcookie with httpOnly param. 2019-11-21 13:30:49 +08:00
guanxiying
39be2ba90e * Fix bug #2812. 2019-11-19 15:13:18 +08:00
Yagami
ceebffb6fe * Finish task #6396. 2019-11-18 16:17:38 +08:00
Yagami
800bc78722 * Finish task #6502. 2019-11-18 14:57:23 +08:00
wangyidong
e3845c1032 * finish task #6421. 2019-10-16 13:11:45 +08:00
wangyidong
1e3564a250 * finish task #6409. 2019-10-15 11:24:50 +08:00
Yagami
55139fc899 * Finish task #6396. 2019-10-11 10:10:46 +08:00
wangyidong
c40fc9a762 * fix bug. 2019-08-26 11:13:46 +08:00
wangyidong
240d306680 * fix bug for batch create user. 2019-08-26 10:42:02 +08:00
wangyidong
afe1340323 * finish task #6259. 2019-08-21 10:28:23 +08:00
wangyidong
321b27c81b * finish task #6208. 2019-08-08 13:12:49 +08:00
wangyidong
008d376edc * finish task #5832. 2019-06-19 14:39:19 +08:00
wangyidong
672a73dfad * finish task #5611. 2019-05-28 09:52:24 +08:00
yfl
6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
wangyidong
060559f1ae * finish task #5439. 2019-04-29 15:35:04 +08:00
wangyidong
726a412270 * code for task #5384. 2019-04-29 08:57:00 +08:00
wangyidong
75ebcb18dc * code for task #5387. 2019-04-25 09:10:42 +08:00
yfl
17b87ba461 * product auth to feedback 2019-04-19 13:00:22 +08:00
yfl
a60f376f1f * except feedback user mv zentaobiz 2019-04-19 11:32:04 +08:00
yfl
a9aab79f65 * project team expect feedback 2019-04-19 11:17:29 +08:00
yfl
e110d289e5 * team except feedback 2019-04-15 16:54:08 +08:00
yfl
8b77b8cd4b * task #7860 2019-04-12 10:23:59 +08:00