Commit Graph
690 Commits
Author SHA1 Message Date
hufangzhou fa1e4ef625 * Finish task#8559. 2020-12-01 08:53:38 +08:00
Yagami 1e7021328a * Finish task #8502. 2020-11-27 14:36:46 +08:00
leiyong 1a70a9f311 * Add projectstory module permissions. 2020-11-26 17:52:30 +08:00
holan20180123 4203dcc7ca * Finish task #8497. 2020-11-26 09:32:23 +08:00
z 7328fa8d30 * adjust for merge. 2020-11-24 08:30:29 +08:00
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 5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
leiyong adca539b56 * Finish task#8341. 2020-11-12 09:33:43 +08:00
Yagami 227d6c8211 * Adjust code detail. 2020-11-02 14:31:47 +08:00
leiyong c66f0f9bc5 * Adjustment language files. 2020-11-02 11:48:43 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 055d52f45e * Project related products. 2020-10-30 10:55:11 +08:00
leiyong 71a6c3b318 * Fix upgrade errors. 2020-10-29 16:37:02 +08:00
leiyong 1ab465d4d7 * Modify upgrade whitelist. 2020-10-29 11:37:09 +08:00
leiyong eb845834ef * Adjust language item file. 2020-10-28 15:00:56 +08:00
tianshujie98 a5fac81ec9 * Edit comment. 2020-10-28 10:43:43 +08:00
tianshujie98 7a84c2f826 * Revert commit. 2020-10-28 10:41:55 +08:00
leiyong 0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
tianshujie98 f56b541129 * Adjust code style. 2020-10-26 15:13:47 +08:00
Yagami 21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +08:00
tianshujie98 e8b6c85f25 I * Finish task #12794. 2020-10-21 10:47:55 +08:00
Yagami 7772cb6d63 * Add lang and priv. 2020-10-21 09:14:39 +08:00
leiyong efd978eb95 * Adjustment Code. 2020-10-20 17:27:04 +08:00
Yagami a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
leiyong c400b4b9f3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-10-20 09:09:24 +08:00
leiyong 5dab208c02 * Adding permissions and maintaining language files. 2020-10-20 09:08:45 +08:00
Yagami a2dded7193 * Add lang. 2020-10-20 09:07:20 +08:00
leiyong 848c61cd96 * Adjustment language files. 2020-10-19 23:15:57 +08:00
Yagami b5ffeda25c * Fix bug. 2020-10-19 16:27:58 +08:00
Yagami c9ea9c7d2e * Meger code. 2020-10-13 16:56:13 +08:00
Yagami a8b95e3fa7 * Finish task #8110. 2020-10-12 14:52:59 +08:00
Yagami 5813c42a71 * Finish task #8107,8108,8109. 2020-10-12 14:52:59 +08:00
Yagami 695aaf5fce * Fix sql error. 2020-10-09 16:34:25 +08:00
Yagami c7e8b79519 * Add program priv. 2020-09-24 10:42:31 +08:00
Yagami d9e57180de * Add group. 2020-09-23 17:21:30 +08:00
holan20180123 9a5fccfa8a * Finish task #7931. 2020-09-21 15:53:48 +08:00
holan20180123 1033a3e484 * Finish task #7931. 2020-09-21 15:51:39 +08:00
holan20180123 7c4cdf25a2 * Finish task #7931. Fix bug #3424. 2020-09-21 14:35:32 +08:00
holan20180123 1e6785c111 * Finish task #7931. Fix bug #3424. 2020-09-21 14:20:36 +08:00
Yagami 9757e21c75 * Change program to PRJ. 2020-09-21 13:21:14 +08:00
leiyong d5bb930589 * Delete swp file. 2020-09-20 23:27:44 +08:00
leiyong 94fae1d49e * Add edit and copy method under project. 2020-09-20 23:27:06 +08:00
leiyong 3550097dc8 * Add project authority management function. 2020-09-20 22:57:24 +08:00
holan20180123 33004a4ba2 * Adjust resource mistake. 2020-09-17 10:40:12 +08:00
holan20180123 3235db1db5 * Finish task #7931. 2020-09-17 10:39:12 +08:00
holan20180123 61bc92a6df * Finish task #7931. 2020-09-17 10:32:29 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00