Commit Graph
31683 Commits
Author SHA1 Message Date
liumengyi e2cbf7dab7 * Fix bug #17765, #17763, #17737. 2021-12-21 15:21:18 +08:00
孙广明 a29de2106e Merge branch 'fix-die' into 'master'
Fix die naming compatibility

See merge request easycorp/zentaopms!1033
2021-12-21 06:37:35 +00:00
Yurun c19e44c044 Fix die naming compatibility 2021-12-21 14:25:53 +08:00
zhujinyong f6e6ef8bff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 14:06:54 +08:00
zhujinyong 14ee3504fa * Compatibility from PHP5.4. 2021-12-21 14:06:24 +08:00
孙广明 0fa8bbfb70 Merge branch 'sprint/179_tianshujie_17754' into 'master'
* Fix bug #17756,#17755,#17754,#17752,#17747.

See merge request easycorp/zentaopms!1031
2021-12-21 06:03:33 +00:00
朱金勇 3a8eabb057 Merge branch 'change-die-zhangrunyu' into 'master'
Change die

See merge request easycorp/zentaopms!1029
2021-12-21 05:59:10 +00:00
tianshujie 171045fab4 * Fix bug #17756,#17755,#17754,#17752,#17747. 2021-12-21 13:59:03 +08:00
孙广明 4de57a92d2 Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.

See merge request easycorp/zentaopms!1030
2021-12-21 05:56:06 +00:00
liumengyi 3bb8ba6b1d * Change 'let' to 'var'. 2021-12-21 13:55:00 +08:00
朱金勇 f2110111fb Merge branch 'sprint/178_songchenxuan_46095' into 'master'
Sprint/178 songchenxuan 46095

See merge request easycorp/zentaopms!1028
2021-12-21 05:53:23 +00:00
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
songchenxuan 72a6d27e6c *Finish task #46095. 2021-12-21 13:48:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
朱金勇 0b213848a5 Merge branch 'sprint/178_songchenxuan_17584' into 'master'
*Fix bug #17584.

See merge request easycorp/zentaopms!1014
2021-12-21 05:38:27 +00:00
Yurun 08935cfe5b Optimize 2021-12-21 13:21:12 +08:00
songchenxuan 72252707d3 *Fix bug #17584. 2021-12-21 11:55:35 +08:00
songchenxuan 116b1a717d *Fix bug #17584. 2021-12-21 11:54:54 +08:00
孙广明 187c67fd3b Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17694,17683.

See merge request easycorp/zentaopms!1027
2021-12-21 03:32:08 +00:00
zhujinyong 01a62fe94b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 11:28:26 +08:00
zhujinyong 9ed65123b5 * Fix bug: display dropmenu when no lib. 2021-12-21 11:27:55 +08:00
tianshujie 7d49e79513 * Fix bug #17694,17683. 2021-12-21 11:26:26 +08:00
朱金勇 49ae6abad6 Merge branch 'sprint/178_songchenxuan_17563' into 'master'
*Fix bug #17563.

See merge request easycorp/zentaopms!1013
2021-12-21 03:11:57 +00:00
朱金勇 338657c59f Merge branch 'sprint/178_songchenxuan_17684' into 'master'
*Fix bug #17684.

See merge request easycorp/zentaopms!1024
2021-12-21 03:09:34 +00:00
王怡栋 a8bcb49883 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 11:08:56 +08:00
朱金勇 da2117bb2e Merge branch 'sprint/179_sunhao/icon' into 'master'
* Update icons: add icon-sonarqube, remove icon-zone, update icon-cube.

See merge request easycorp/zentaopms!1025
2021-12-21 03:08:34 +00:00
王怡栋 bf4dcdd19c * adjust get api version. 2021-12-21 11:08:28 +08:00
孙广明 68e2a1c668 Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Fix bug

See merge request easycorp/zentaopms!1023
2021-12-21 03:05:42 +00:00
zhengrunyu 1681d07f6a *Fix task 46163. 2021-12-21 11:04:12 +08:00
zhengrunyu f7ff2b00d9 *Fix bug. 2021-12-21 10:58:30 +08:00
Hao Sun c4638ccc9d * Update icons: add icon-sonarqube, remove icon-zone, update icon-cube. 2021-12-21 10:58:22 +08:00
songchenxuan 147c03f2f0 *Fix bug #17684. 2021-12-21 10:17:51 +08:00
zhengrunyu 8599448fda *Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug 2021-12-21 10:08:11 +08:00
孙广明 951dea2b63 Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17704,17740,17694.

See merge request easycorp/zentaopms!1022
2021-12-21 01:56:29 +00:00
songchenxuan 30cd7944ff *Finish task #46095. 2021-12-21 09:55:50 +08:00
tianshujie 8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
Yurun 2ca28f589f Add EndResponseException and helper::die() 2021-12-21 09:47:31 +08:00
zhujinyong 6307414ef2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 09:36:54 +08:00
zhujinyong 411b060895 + Create demo data for api. 2021-12-21 09:36:25 +08:00
songchenxuan c9c65ce3ef *Finish task #46095. 2021-12-21 09:16:56 +08:00
孙广明 d8c93c3dc8 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for task#46150,#46158.

See merge request easycorp/zentaopms!1021
2021-12-21 01:07:07 +00:00
liumengyi 4f369ace40 * Modify edit card html. 2021-12-21 09:04:57 +08:00
孙广明 c5cb021416 Merge branch 'sprint/179_tianshujie_46245' into 'master'
* Finish task #46245.

See merge request easycorp/zentaopms!1019
2021-12-21 01:02:52 +00:00
liumengyi 8318d1fa69 * Fix bug for task#46150,#46158. 2021-12-21 09:02:24 +08:00
tianshujie 5863beeb76 * Remove extra spaces. 2021-12-21 09:01:53 +08:00
孙广明 53c741481b Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
Sprint/179 zhengrunyu fixbug

See merge request easycorp/zentaopms!1020
2021-12-21 00:58:01 +00:00
zhengrunyu d3e873976d *Fix bug 17662. 2021-12-21 08:55:15 +08:00
zhengrunyu 402458803d *Fixbug17662. 2021-12-21 08:54:02 +08:00
tianshujie d364b7c362 * Remove useless attributes. 2021-12-21 08:53:21 +08:00
tianshujie c04c2506ae * Finish task #46245. 2021-12-21 08:51:03 +08:00