Commit Graph

971 Commits

Author SHA1 Message Date
Yagami
1480098b5e * Fix priv. 2020-10-30 11:00:21 +08:00
leiyong
c4211ae32e * Add Modify user view calculation. 2020-10-29 09:43:20 +08:00
Yagami
30d7bb81b7 * Fix details. 2020-10-28 14:39:36 +08:00
Yagami
a52a622ce4 * Merge code. 2020-10-28 11:45:26 +08:00
leiyong
0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
Yagami
0f3348ad2a * Finish task #8164. 2020-10-27 14:46:03 +08:00
Yagami
6f25acbb87 * Fix details. 2020-10-22 17:15:48 +08:00
Yagami
a18eff2a3c * Fix bug. 2020-10-22 09:34:52 +08:00
leiyong
61365c9f78 * Adjusting the programplan module code. 2020-10-22 09:09:48 +08:00
Yagami
21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +08:00
leiyong
c0e5bf03f0 * Adjustment language files. 2020-10-21 09:48:40 +08:00
Yagami
7772cb6d63 * Add lang and priv. 2020-10-21 09:14:39 +08:00
Yagami
a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
Yagami
44f32d9ed5 * Rename openinside to program. 2020-10-20 14:02:48 +08:00
Yagami
9113f3fd96 * Merge stage and sprint to sprint in user view. 2020-10-20 13:39:21 +08:00
Yagami
b5ffeda25c * Fix bug. 2020-10-19 16:27:58 +08:00
Yagami
2fe5ec9993 * Program/project edit page change acl. 2020-10-19 13:56:46 +08:00
sgm0422
dc706ed54a * Fix compute user view method. 2020-10-16 22:43:54 +08:00
Yagami
316c8dbbfe * Add comment and fix sql. 2020-10-16 17:30:28 +08:00
Yagami
f21ea4477f * Finish task #8122,#8117,#8115,#8114,#8113. 2020-10-16 16:45:55 +08:00
Yagami
0cbfddb802 * Code for update user view. 2020-10-15 17:34:30 +08:00
Yagami
7d7305bab8 * Code for #8119. 2020-10-15 09:07:32 +08:00
Catouse
eb01165a2e * storage template html as templateHtml property of keditor instance. 2020-10-12 20:10:01 +08:00
reneeteng
61dfd90a1d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-10-11 15:16:36 +08:00
leiyong
d29da8f33d * Finish task#8102. 2020-10-10 14:51:27 +08:00
leiyong
5c81e807ce * Finish task#8118. 2020-10-10 14:02:41 +08:00
reneeteng
021caa114d * Update password tips for adding a user. 2020-10-10 10:10:36 +08:00
tianshujie98
48c178e9a6 * Revert submission. 2020-10-09 08:27:33 +08:00
tianshujie98
77739b6d92 * Adjust code style. 2020-09-25 16:57:59 +08:00
tianshujie98
31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
Yagami
ffaf91d467 * Rename program to PRJ. 2020-09-22 15:10:11 +08:00
Yagami
9757e21c75 * Change program to PRJ. 2020-09-21 13:21:14 +08:00
leiyong
3550097dc8 * Add project authority management function. 2020-09-20 22:57:24 +08:00
leiyong
a8103fd03e * Add project creation method. 2020-09-18 14:26:27 +08:00
holan20180123
0a438c628d * Finish task #7917. 2020-09-17 16:16:25 +08:00
qiyu-xie
89cda99a6e * Finish task#7929. 2020-09-16 15:53:15 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
tianshujie98
66c636d771 * Fix bug #3464. 2020-09-10 15:59:00 +08:00
tianshujie98
d27efffa6d * Fix bug #3464. 2020-09-09 09:10:17 +08:00
holan20180123
05d84a4e6d * Adjust singular to plural for contribute. 2020-09-04 13:55:10 +08:00
hufangzhou
c80bc3d36b * Fix a bug. 2020-09-03 17:00:13 +08:00
holan20180123
d9dbbad25b * Adjust story and testcase page for my module. 2020-09-02 14:37:50 +08:00
holan20180123
9406ae4b07 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 15:47:51 +08:00
holan20180123
20a09be88e * Finish task #7734. 2020-09-01 15:47:03 +08:00
qiyu-xie
c5c9d0c155 *Fix user module lang. 2020-09-01 14:04:16 +08:00
Yagami
0e9de1a8be * Finish task #7725. 2020-09-01 09:13:59 +08:00
holan20180123
7cb74a6158 * Finish task #7711. 2020-08-27 14:06:35 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
holan20180123
f4ccf99b1d * Edit English lang file for user module. 2020-08-26 09:10:23 +08:00