Commit Graph
467 Commits
Author SHA1 Message Date
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
leiyong 055d52f45e * Project related products. 2020-10-30 10:55:11 +08:00
leiyong eb845834ef * Adjust language item file. 2020-10-28 15:00:56 +08:00
Yagami 21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +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
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 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 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
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
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
Yagami f0e7160544 * Delete plan config. 2020-09-03 09:56:46 +08:00
Yagami 3bf3187bfe Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 11:28:04 +08:00
Yagami a1f4a8e7bb * Finish task #7812. 2020-09-02 11:27:34 +08:00
qiyu-xie 4c7e7ae2e5 *Add design module resource. 2020-09-02 11:09:15 +08:00
qiyu-xie 75b03bc73c *Fix group module lang. 2020-09-01 13:17:30 +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
tianshujie98 ec4afb7863 *Finish task #7770. 2020-08-31 09:46:42 +08:00
Yagami 1b2228a367 * Adjust common/weekly code detail. 2020-08-29 13:21:46 +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 5c6c487580 * Adjust menu。 2020-08-27 13:34:36 +08:00
qiyu-xie 9ca95ac3e6 *Add design assignTo priv. 2020-08-27 11:30:45 +08:00
leiyong df1a9ee5ef * Finish task#7702. 2020-08-27 09:23:10 +08:00
leiyong 06e5748f12 * Adjust lang file. 2020-08-27 09:11:23 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
tianshujie98 1011f0cb0e * Checkout module/group/lang/resource.php xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php 2020-08-25 15:30:10 +08:00
tianshujie98 60fcf05741 * Delete empty line. 2020-08-25 14:53:50 +08:00