Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
20,146 Commits 2 Branches 292 Tags
0d07b3abaed3d64d7583cbac87b67c049fe3bd11
Commit Graph
997 Commits
Author SHA1 Message Date
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 310bf2b2c3 * Rename my project and program. 2020-11-20 14:53:33 +08:00
z 3e902392ac * search with account. 2020-11-20 13:09:02 +08:00
z 5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
qiyu-xie 3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
leiyong 2d866bbd8b * Fix bug. 2020-11-17 16:23:24 +08:00
tianshujie98 ed8dcc38cd * Finish task #8422. 2020-11-17 14:42:50 +08:00
tianshujie98 9b811e95cb * Adjust code style and add language item. 2020-11-13 16:44:43 +08:00
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
guanxiying 7bcea20380 * Add bind and oauth register function. 2020-11-02 16:33:22 +08:00
guanxiying 7f1029c349 * Add usermodel::login function 2020-11-02 16:31:10 +08:00
guanxiying b29244195c * Add login function. 2020-11-02 16:30:38 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
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
Catouse 2c6d7d153b * storage template html as templateHtml property of keditor instance. 2020-10-12 20:08:20 +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 677fa52863 * Revert submission. 2020-10-09 08:31:30 +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 dd3c2677b6 * Adjust code style. 2020-09-25 16:51:31 +08:00
tianshujie98 31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
tianshujie98 ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +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