Commit Graph
2226 Commits
Author SHA1 Message Date
leiyong 680c880b5a * Fix bug. 2020-10-30 17:32:19 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Yagami 755513d9cd * Fix details. 2020-10-30 13:43:05 +08:00
Yagami 1480098b5e * Fix priv. 2020-10-30 11:00:21 +08:00
z 1bccfd5744 * add new version and upgrade. 2020-10-30 10:40:00 +08:00
Yagami d1f2919365 * Fix details. 2020-10-30 10:30:38 +08:00
Yagami 7e52b15bbb * Fix details. 2020-10-29 16:59:21 +08:00
leiyong b8166b7b84 * Modify the program icon. 2020-10-29 10:52:13 +08:00
holan20180123 68cdea8fe8 * Fixed bug with menu bar not highlighted. 2020-10-29 09:08:47 +08:00
holan20180123 d9f4ac717d * Finish task #12957. 2020-10-28 17:29:19 +08:00
holan20180123 e930c53b0d * Finish task #12957. 2020-10-28 17:14:08 +08:00
leiyong abf386a1e3 * Adjust whitelist deletion logic. 2020-10-27 16:08:46 +08:00
leiyong 5002be3199 * Modify whitelist related logic. 2020-10-27 13:10:54 +08:00
leiyong aff516e659 * Project add whitelist function. 2020-10-26 14:38:41 +08:00
leiyong 969b52508c * Product add white list function. 2020-10-26 13:04:56 +08:00
leiyong adad0cedfb * Add sync whitelist. 2020-10-26 10:19:19 +08:00
leiyong c0f44f6465 * Adding a white list. 2020-10-25 17:30:41 +08:00
Yagami 21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +08:00
Yagami ec4dd58fb7 * Fix bugs. 2020-10-21 09:53:39 +08:00
holan20180123 13038a9a5b * Remove duplicate query code. 2020-10-21 09:42:17 +08:00
holan20180123 35ecdc8290 * Remove duplicate query code. 2020-10-21 09:31:28 +08:00
leiyong 6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
Yagami 7772cb6d63 * Add lang and priv. 2020-10-21 09:14:39 +08:00
leiyong c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +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 00631c63f8 * Adjusting the left menu style. 2020-10-19 16:05:11 +08:00
leiyong 2554993ae0 * Adjusting the left menu style. 2020-10-19 15:49:46 +08:00
Yagami f21ea4477f * Finish task #8122,#8117,#8115,#8114,#8113. 2020-10-16 16:45:55 +08:00
leiyong 55e1126f0b * Adjusting programplan and project and panel module code. 2020-10-16 14:28:52 +08:00
Yagami c9ea9c7d2e * Meger code. 2020-10-13 16:56:13 +08:00
leiyong 71d9073644 * Finish task#8124. 2020-10-13 16:55:24 +08:00
holan20180123 2f20925a47 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-10-12 15:50:22 +08:00
holan20180123 7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
Yagami c7301bdf7a * Fix common en lang. 2020-10-12 14:55:15 +08:00
Yagami f950266577 * Merge code. 2020-10-12 14:54:02 +08:00
leiyong 526b475395 * Finish task#8112. 2020-10-12 10:22:41 +08:00
holan20180123 b849999023 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-10 16:57:05 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
leiyong f540658839 * Finish task#8106. 2020-10-10 14:58:16 +08:00
leiyong ea40e7d63e * Finish task#8112. 2020-10-10 10:13:48 +08:00
z 12820bf546 * fix for task #8091. 2020-10-09 11:43:18 +08:00
z 1af3353ae1 * adjust notice. 2020-10-09 11:02:01 +08:00
z 3d0ccb781d * finish task #8091. 2020-10-09 09:13:29 +08:00
z 4262f4c782 * finish task #8051. 2020-09-30 20:34:53 +08:00
leiyong b60e13adff * Finish task#8076. 2020-09-30 14:16:17 +08:00
z a7b7d8da4a * fix bug for set https. 2020-09-30 13:36:49 +08:00
leiyong 8e74ba9677 * Adjust code. 2020-09-29 09:47:25 +08:00
leiyong d066fef4e5 *Adjust code. 2020-09-29 08:31:27 +08:00