Commit Graph
17526 Commits
Author SHA1 Message Date
leiyong 4ec79ae237 * Finish cmmi task#866; 2020-06-19 01:39:58 -07:00
sgm0422 3a2626bab8 * Fix menu order. 2020-06-19 13:39:19 +08:00
sgm0422 e4a3afc3a6 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-06-19 10:39:13 +08:00
sgm0422 3cdcc9b22c * Fix main menu. 2020-06-19 10:38:58 +08:00
leiyong 91ecc5764b * Finish cmmi task#869. 2020-06-18 19:16:47 -07:00
leiyong a822238342 Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x 2020-06-18 19:07:52 -07:00
sgm0422 942446b521 * Finish task #939. 2020-06-19 10:00:30 +08:00
sgm0422 f4efdf5ca0 * Fix main menu. 2020-06-18 17:00:16 +08:00
leiyong 63d0791138 * Adjust menu. 2020-06-18 00:06:19 -07:00
sgm0422 fe63a13c20 * Fix sql for qc. 2020-06-17 17:32:57 +08:00
sgm0422 57500e2102 * Fix bug and add program admin. 2020-06-17 15:08:09 +08:00
sgm0422 8e706b6e0c * Add create project button. 2020-06-17 13:08:37 +08:00
sgm0422 a90ceec8fd * Fix program priv. 2020-06-17 10:39:51 +08:00
sgm0422 7af773d821 * Fix bug. 2020-06-17 08:32:53 +08:00
sgm0422 0e9b3e9609 * Fix details. 2020-06-16 17:24:14 +08:00
sgm0422 74a663af11 * Merge sql to zentao.sql. 2020-06-16 15:15:47 +08:00
sgm0422 956c0ab6e8 * Merge code. 2020-06-16 14:48:44 +08:00
sgm0422 19a1db72df * Fix user view bug. 2020-06-16 14:15:22 +08:00
sgm0422 bb92200ea5 * Add en lang. 2020-06-16 13:38:41 +08:00
sgm0422 861a03ed72 * Add update user view to program. 2020-06-16 10:56:13 +08:00
sgm0422 316cc2b551 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-06-16 10:49:52 +08:00
sgm0422 8ecac0f6fb * Fix group error. 2020-06-16 10:49:23 +08:00
z 4eff282d98 Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x 2020-06-16 10:39:43 +08:00
z 79db80e3b4 * adjust for merge program style. 2020-06-16 10:39:01 +08:00
sgm0422 fc4d8db013 * Merge code. 2020-06-15 17:12:17 +08:00
Catouse f28fd3f4cf * fix #dropMenu not work as expected. 2020-06-15 17:02:24 +08:00
z 70ed978c2d * adjust for merge program. 2020-06-15 16:24:00 +08:00
sgm0422 e2663052ed * Fix bug. 2020-06-15 16:15:39 +08:00
sgm0422 ca21685f4b * Fix project set menu. 2020-06-15 14:35:21 +08:00
sgm0422 1f162f9c35 * Add init user view method. 2020-06-15 13:33:37 +08:00
sgm0422 44f9274c99 * Fix sql and details. 2020-06-15 10:20:37 +08:00
sgm0422 84d7ff857b * Fix detail. 2020-06-12 18:55:54 +08:00
sgm0422 09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
sgm0422 317c049104 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-06-12 16:42:12 +08:00
sgm0422 5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
z 1f42d3867d * set program team. 2020-06-12 16:40:26 +08:00
z 2327aa145a * change for merge program. 2020-06-12 10:58:58 +08:00
z c156aff9a4 * fix bug #2530. 2020-06-12 10:55:33 +08:00
z cace41c441 Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x 2020-06-12 09:55:51 +08:00
z da8d8b55d3 * change for merge program. 2020-06-12 09:07:07 +08:00
sgm0422 2d97663c5d * Compute program priv. 2020-06-11 17:25:36 +08:00
sgm0422 cfbba4b4bb * Code for task #7235. 2020-06-11 14:41:08 +08:00
sgm0422 c4fc2c99b1 * Fix menu and add program group. 2020-06-11 13:23:03 +08:00
sgm0422 cbe28d7e61 * Fix details. 2020-06-10 17:33:13 +08:00
sgm0422 4fbd9f6fd2 * Finish task #7234. 2020-06-10 14:10:09 +08:00
z 18337e6ae0 * adjust for merge program. 2020-06-10 11:14:33 +08:00
z b25f67c5ba * finish task #7221. 2020-06-09 08:54:08 +08:00
sgm0422 3bdd3d8a23 * Fix error. 2020-06-05 18:04:17 +08:00
sgm0422 c02319385c * Fix install and upgrade logic. 2020-06-05 15:48:57 +08:00
sgm0422 13597923a1 * Fix install && upgrade sql. 2020-06-05 15:12:05 +08:00