Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
17,494 Commits 2 Branches 292 Tags
09c2a265f4500b7e6be8564a4b0fd1cf703bb338
Commit Graph
17494 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
sgm0422 485bc23dfd * Merge code. 2020-06-05 13:29:45 +08:00
sgm0422 18c3752d9a * Delete program from repo. 2020-06-03 13:13:54 +08:00
sgm0422 bf1cdda8f5 * Add program to task and story. 2020-06-03 09:02:28 +08:00
sgm0422 3cc7f35436 * Add program condition. 2020-06-01 16:25:11 +08:00
Yagami 60e13af347 * Fix menu. 2020-05-31 23:18:24 +08:00
leiyong 7746738868 * Finish task#812. 2020-05-28 19:59:03 -07:00
leiyong 16609125c0 * Adjust menu. 2020-05-28 17:20:16 -07:00
leiyong 08b21f4336 * Adjust menu. 2020-05-27 01:23:53 -07:00
zhaohaibo 0fb4b5ce32 add param of currentProgram 2020-05-27 14:34:57 +08:00
sgm0422 53df7402db Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-27 14:05:18 +08:00
sgm0422 a9b0976c65 * Fix menu. 2020-05-27 14:04:55 +08:00
zhaohaibo d4b09b733d add param currentProgram 2020-05-27 13:26:08 +08:00
Catouse 3842bd351d * fix UI error in kindeditor table dialog. 2020-05-26 16:21:36 +08:00
zhaohaibo c2cabc0d64 * add param currentProgram 2020-05-26 15:53:12 +08:00
zhaohaibo f486ac38fb * add param of currentProgram 2020-05-26 15:44:08 +08:00
zhaohaibo 63809883f1 * fix bug 2020-05-26 14:12:00 +08:00
zhaohaibo e9b2a4bc32 add param $this->session->program 2020-05-26 13:37:02 +08:00
zhaohaibo ee52389234 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-26 13:33:33 +08:00
zhaohaibo d5a80a5718 * add param of programID 2020-05-26 10:02:45 +08:00
Catouse 2a44b295af * update icon-qc. 2020-05-26 10:02:28 +08:00
zhaohaibo 488cd83cba * Fix link. 2020-05-25 16:37:07 +08:00
zhaohaibo 69e0bc3513 * fix bug 2020-05-22 13:46:51 +08:00
sgm0422 4b5844e64e Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x zentaopms_15.0_20200521 2020-05-21 09:31:38 +08:00
sgm0422 23a2df6a50 * Fix vars. 2020-05-21 09:31:25 +08:00
zhaohaibo 9a72a1e4cd * fix bug 2020-05-20 18:22:26 +08:00
zhaohaibo 0606da04e1 fix bug 2020-05-20 17:11:10 +08:00
Catouse 00cd8c535d * add icon-qc by update zui icon fonts.. zentaopms_15.0_20200520 2020-05-20 15:08:39 +08:00
sgm0422 a5969ce265 * Fix menu. 2020-05-20 14:51:33 +08:00
sgm0422 48e0bf9043 * Change version. 2020-05-20 10:22:59 +08:00
sgm0422 c6ebec0920 * Fix admin menu. 2020-05-20 09:26:59 +08:00
Yagami a14ad24aa7 * Fix menu. 2020-05-19 22:02:09 +08:00
sgm0422 f23e26cd86 * Fix program managemembers and create link. 2020-05-19 19:32:08 +08:00