Commit Graph
100 Commits
Author SHA1 Message Date
王怡栋 e75d061537 Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Add the privilege in changelog.

See merge request easycorp/zentaopms!94
2021-10-19 06:56:36 +00:00
王怡栋 3b1d8b46a1 Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Fix an error for upgrade sql.

See merge request easycorp/zentaopms!91
2021-10-19 06:21:43 +00:00
王怡栋 75c34e7e46 Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Add the upgrade sql in upgrade module.

See merge request easycorp/zentaopms!90
2021-10-19 05:50:50 +00:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
王怡栋 57fcb19976 Merge branch 'sprint/167_sgm_apitest' into 'sprint/167'
* Fix story bug and add user test.

See merge request easycorp/zentaopms!88
2021-10-19 01:46:51 +00:00
王怡栋 7f1f5c8993 Merge branch 'sprint/167_hufangzhou_15557' into 'sprint/167'
* Fix bug #15557.

See merge request easycorp/zentaopms!85
2021-10-18 08:35:14 +00:00
王怡栋 352ec4d0b4 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 16:04:22 +08:00
王怡栋 775f9942d2 * fix bug #15553. 2021-10-18 16:03:42 +08:00
王怡栋 d8ac3d1950 Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167'
* Check the code for upgrade.

See merge request easycorp/zentaopms!84
2021-10-18 05:14:44 +00:00
王怡栋 8ca427b1c7 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 10:26:28 +08:00
王怡栋 06f6d31579 * add my bug data for api. 2021-10-18 10:24:28 +08:00
王怡栋 e5dc2e2f59 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 10:20:31 +08:00
王怡栋 621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
王怡栋 375b74b9d6 * adjust for api. 2021-10-18 09:20:10 +08:00
王怡栋 72c92b6b0d * fix error. 2021-10-18 09:06:48 +08:00
王怡栋 5e0ac98809 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 08:53:30 +08:00
王怡栋 351b07352b Merge branch '15.6' into sprint/167 2021-10-18 08:53:13 +08:00
王怡栋 68cd0eb2f9 Merge branch '15.6' into sprint/167_wangyidong 2021-10-18 08:44:13 +08:00
王怡栋 d4c32965e2 * adjust for zui. 2021-10-15 17:20:51 +08:00
王怡栋 3989c71b3f * fix for large size session. 2021-10-15 13:38:05 +08:00
王怡栋 8ee2811723 Merge branch '15.6' into sprint/167 2021-10-15 13:11:52 +08:00
王怡栋 03df63c20c Merge branch '15.6' into sprint/167 2021-10-14 16:21:40 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
王怡栋 5861134df5 Merge branch 'sprint/sgm_fix_bug' into 'sprint/167'
* Fix story review bug.

See merge request easycorp/zentaopms!68
2021-10-14 07:15:48 +00:00
王怡栋 ad21350632 Merge branch 'sprint/167_sgm_15489' into 'sprint/167'
* Fix bug #15489.

See merge request easycorp/zentaopms!57
2021-10-14 03:32:18 +00:00
王怡栋 edc45687fd * fix error. 2021-10-12 14:54:35 +08:00
王怡栋 25737f9366 Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-12 13:03:13 +08:00
王怡栋 ee892ef350 * fix for api. 2021-10-12 13:02:39 +08:00
王怡栋 eec51b9f69 * adjust for zentao sql. 2021-10-11 16:18:41 +08:00
王怡栋 e5132dcc3e Merge branch '165' 2021-10-11 14:20:07 +08:00
王怡栋 f5f9772e08 Merge branch 'sprint/165_test' into 165 2021-10-11 14:15:54 +08:00
王怡栋 e99daf2900 * fix for todo data. 2021-10-09 10:41:00 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
王怡栋 0fa52d3318 * adjust for review code. 2021-10-09 09:29:10 +08:00
王怡栋 88a5c5d207 * fix loophole. 2021-10-08 10:35:38 +08:00
王怡栋 64d53657a5 Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test 2021-10-08 08:45:43 +08:00
王怡栋 a14fc4e7f9 * finish task #42848. 2021-09-30 15:49:24 +08:00
王怡栋 de72a2bcef * adjust for project zendata. 2021-09-30 14:34:08 +08:00
王怡栋 5ab6b223ba * fix loophole. 2021-09-30 11:03:06 +08:00
王怡栋 ee39f52c2e * finish task #42846. 2021-09-29 11:51:17 +08:00
王怡栋 08f1d594c0 * adjust for task #42835. 2021-09-28 09:24:33 +08:00
王怡栋 1c7301c929 * Save session with tab for project. 2021-09-27 16:04:03 +08:00
王怡栋 47c0876b9d * fix bug #15389. 2021-09-27 16:03:40 +08:00
王怡栋 f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
王怡栋 9211504ebb * fix bug #15357. 2021-09-26 15:16:28 +08:00
王怡栋 e9044ca0c9 * adjust for task #42832. 2021-09-26 12:11:44 +08:00
王怡栋 0d4c2da922 * finish task #42832. 2021-09-26 10:16:10 +08:00
王怡栋 a33f9b096d * adjust for project link in classic mode. 2021-09-24 16:27:08 +08:00
王怡栋 a71f7225d5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-22 16:49:43 +08:00
王怡栋 86c8930cdd * adjust for apache error. 2021-09-22 16:48:09 +08:00
王怡栋 9efcf7e686 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-22 08:45:36 +08:00
王怡栋 7ed13fff0a * fix bug #15215. 2021-09-22 08:45:09 +08:00
王怡栋 01b7db1dd6 * adjust for upgrade. 2021-09-18 13:51:15 +08:00
王怡栋 bd8cf246f9 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-18 13:14:21 +08:00
王怡栋 435849a9de * finish task #42598. 2021-09-18 13:09:28 +08:00
王怡栋 5f8067802d Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 17:01:59 +08:00
王怡栋 a206296708 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 14:34:59 +08:00
王怡栋 77d501887d * fix bug for save execution session. 2021-09-15 14:34:13 +08:00
王怡栋 fc887d625a * revert for bug #15187. 2021-09-15 11:26:29 +08:00
王怡栋 6c5d9b76f4 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 11:20:32 +08:00
王怡栋 342a0335b1 * Merge for bug #15187. 2021-09-15 11:19:54 +08:00
王怡栋 afb19a3a14 * Merge for userbind btn. 2021-09-15 10:36:14 +08:00
王怡栋 7757da97f5 * adjust for get wait project in program kanban. 2021-09-15 10:28:46 +08:00
王怡栋 310b23c8fa Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 10:05:04 +08:00
王怡栋 d2ef694ea6 * fix for set realStart when edit task. 2021-09-15 10:04:28 +08:00
王怡栋 a862b3b850 * fix lang. 2021-09-15 08:33:40 +08:00
王怡栋 89cd831744 * adjust for 15.5. 2021-09-14 17:33:43 +08:00
王怡栋 dd454a6bc3 * fix for flow. 2021-09-14 16:08:50 +08:00
王怡栋 c5c5a8e789 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 14:56:37 +08:00
王怡栋 993fc51fbd * adjust for flow. 2021-09-14 14:55:58 +08:00
王怡栋 f60c06fd5c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 11:36:22 +08:00
王怡栋 b70381885a * add new version and upgrade. 2021-09-14 11:36:00 +08:00
王怡栋 e1eeae030a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 10:25:05 +08:00
王怡栋 179cf13221 * fix bug #14690. 2021-09-14 10:24:34 +08:00
王怡栋 bd55ba1109 * fix bug #14975. 2021-09-14 08:39:59 +08:00
王怡栋 d18e3632dc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 11:16:37 +08:00
王怡栋 c9eb3ebfa1 * fix bug for finish task by repo. 2021-09-13 11:14:54 +08:00
王怡栋 2fadc69fa3 * fix bug #15083,15079. 2021-09-10 11:34:10 +08:00
王怡栋 9bda624e57 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-10 11:25:40 +08:00
王怡栋 5bc20274e0 * fix bug #14701. 2021-09-10 11:24:25 +08:00
王怡栋 b1b6f24e2d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-10 08:54:40 +08:00
王怡栋 5617d3b89d * adjust for edit project in program. 2021-09-09 14:33:09 +08:00
王怡栋 1cf0703cd6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 10:25:59 +08:00
王怡栋 462d61fcf3 * adjust priv and fix bug for view assigned todo. 2021-09-09 10:25:06 +08:00
王怡栋 9751d83ea1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:02:36 +08:00
王怡栋 fe3f6b3a01 * add mr zh-tw lang. 2021-09-08 16:02:11 +08:00
王怡栋 71e494840a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:01:39 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
王怡栋 5def99b75f * adjust for notes. 2021-09-08 13:28:28 +08:00
王怡栋 2a9d3735a8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 13:26:28 +08:00
王怡栋 6cb052396f * finish task #42429. 2021-09-08 13:25:37 +08:00
王怡栋 f3a07d930a * finish task #42428. 2021-09-08 13:24:37 +08:00
王怡栋 09ce55e8a6 * finish task #42426. 2021-09-08 13:21:46 +08:00
王怡栋 c427beb6f9 * finish task #42425. 2021-09-08 13:20:40 +08:00
王怡栋 b70ef8e1c0 * finish task #42424. 2021-09-08 13:19:16 +08:00
王怡栋 a265e45b8a * finish task #42398. 2021-09-08 13:16:38 +08:00
王怡栋 64c100dd05 * finish task #42397. 2021-09-08 13:15:30 +08:00
王怡栋 b87b7867cf Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 13:12:48 +08:00
王怡栋 efa385717c * finish task #42373. 2021-09-08 13:09:37 +08:00
王怡栋 84c3179179 * finish task #42372. 2021-09-08 13:07:59 +08:00