Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
31,228 Commits 2 Branches 292 Tags
ae9ddf75fe2ebaf8cb086c2fbd9282a5ef45ea03
Commit Graph
31228 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tanghucheng ae9ddf75fe * Finish task #46181. 2021-12-20 10:30:30 +08:00
zhujinyong 40e6051daa - Remove die() of admin module. 2021-12-20 09:15:34 +08:00
zhujinyong 90d2447cae - Remove die() of admin module. 2021-12-20 09:13:32 +08:00
zhujinyong 72b41be5b0 - Remove die() of action module. 2021-12-20 09:05:16 +08:00
朱金勇 cf477770fe Merge branch 'sprint/zui_sunhao' into 'master' 
* Add and update icons.

See merge request easycorp/zentaopms!996
 2021-12-20 00:52:21 +00:00
朱金勇 8530bbd031 Merge branch 'sprint/xuan_sunhao/web_embed' into 'master' 
* Optimize UI for embed client.

See merge request easycorp/zentaopms!995
 2021-12-20 00:50:14 +00:00
朱金勇 8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master' 
SQL optimization

See merge request easycorp/zentaopms!924
 2021-12-20 00:47:21 +00:00
王怡栋 ad57d792f1 Merge branch 'apiext' 2021-12-17 18:00:31 +08:00
王怡栋 56437f6418 Merge branch 'master' into 'apiext' 
# Conflicts:
#   config/routes.php
 2021-12-17 09:58:59 +00:00
Hao Sun b0497de051 * Add new icons: "ztool", "contacts", "chats", "tag", "tag-lock", "branch-lock", update: "menu-my", "program", "product", "project" 2021-12-17 16:50:02 +08:00
Hao Sun ae3326b8f0 * optimize UI for embed client. 2021-12-17 16:15:27 +08:00
朱金勇 c0fd222c18 Merge branch 'sprint/178_xieqiyu_46102' into 'master' 
* Code for task#46102.

See merge request easycorp/zentaopms!990
 2021-12-17 07:45:23 +00:00
朱金勇 4cddc5effd Merge branch 'sprint/176_xieqiyu_46097' into 'master' 
* Finish task#46097.

See merge request easycorp/zentaopms!989
 2021-12-17 07:44:07 +00:00
朱金勇 493b42452c Merge branch 'sprint/178_songchenxuan_46136' into 'master' 
*Finish task #46136.

See merge request easycorp/zentaopms!976
 2021-12-17 07:40:40 +00:00
朱金勇 67ecc5f8c8 Merge branch 'sprint/178_songchenxuan_46099' into 'master' 
*Finish task #46099.

See merge request easycorp/zentaopms!974
 2021-12-17 07:40:10 +00:00
朱金勇 d8852453dc Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master' 
* Optimize style for cards in client.

See merge request easycorp/zentaopms!985
 2021-12-17 07:39:30 +00:00
songchenxuan d10d8be62a *Finish task #46136. 2021-12-17 14:20:05 +08:00
songchenxuan 03399bbb8c *Finish task #46136. 2021-12-17 14:17:12 +08:00
Hao Sun fd3a645a30 * Optimize style for cards in client. 2021-12-17 14:11:50 +08:00
朱金勇 3381dd3ab0 Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master' 
* Adjust url card style in client.

See merge request easycorp/zentaopms!981
 2021-12-17 06:10:26 +00:00
Hao Sun 858894a72b * Fix error when load page in client card. 2021-12-17 13:59:53 +08:00
songchenxuan 59bbd18c55 *Finish task #46099. 2021-12-17 13:58:31 +08:00
songchenxuan 63479860a5 *Finish task #46099. 2021-12-17 13:56:24 +08:00
zhujinyong dc4eb9867b * Fix problems of mr. 2021-12-17 13:37:16 +08:00
zhujinyong 3be21de66c Merge branch 'sprint/178_mayue_17015' 2021-12-17 13:35:35 +08:00
朱金勇 12093a5dce Merge branch 'master' into 'sprint/178_mayue_17015' 
# Conflicts:
#   module/product/control.php
 2021-12-17 05:34:25 +00:00
Hao Sun 44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
李玉春 43d07b8cd0 Merge branch 'sgm_projectpriv' into 'master' 
* Reset project priv.

See merge request easycorp/zentaopms!979
 2021-12-17 03:03:39 +00:00
zhujinyong 10dfc32924 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-17 10:24:23 +08:00
zhujinyong de2e4be174 * Fix test. 2021-12-17 10:23:57 +08:00
孙广明 6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
songchenxuan c7a49edda8 *Finish task #46136. 2021-12-16 14:36:01 +08:00
朱金勇 54651928cf Merge branch 'sprint/xuan_sunhao/improve_client_ui' into 'master' 
* Task #45453, improve UI for opening in xuan client.

See merge request easycorp/zentaopms!969
 2021-12-16 05:06:35 +00:00
Hao Sun 8bf3c8e6e1 * Adjust navbar position in client. 2021-12-16 12:02:33 +08:00
Hao Sun 348e44a00e * Adjust navbar position in client. 2021-12-16 11:41:12 +08:00
Hao Sun 42599b5d8a * Fix text color in app header in client. 2021-12-16 11:16:53 +08:00
Hao Sun 697b314cc0 * Improve UI for opening in xuan client. 2021-12-16 10:53:05 +08:00
xieqiyu 788c1c3f42 * Code for task#46102. 2021-12-16 09:42:50 +08:00
mayue 65bcac3b67 * Optimized code. 2021-12-16 09:07:51 +08:00
songchenxuan fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
xieqiyu 6227d52547 * Finish task#46097. 2021-12-15 17:24:46 +08:00
mayue 4adf6e0a52 * Fix bug #17015. 2021-12-15 17:17:57 +08:00
李玉春 898f65f84b Merge branch 'sgm_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!956
 2021-12-15 07:45:07 +00:00
孙广明 874b4c6cdd Merge branch 'sprint/master_tanghucheng_17565' into 'master' 
* Fix bug #17565.

See merge request easycorp/zentaopms!959
 2021-12-15 06:56:07 +00:00
tanghucheng 8409760490 * Fix bug #17565. 2021-12-15 14:55:04 +08:00
孙广明 04eb385659 * Fix bug. 2021-12-15 14:34:52 +08:00
朱金勇 eba28ffa85 Merge branch 'sprint/176_songchenxuan_45535' into 'master' 
*Fix task #45535 bug.

See merge request easycorp/zentaopms!944
 2021-12-15 00:40:22 +00:00
朱金勇 b3b60dd4e4 Merge branch 'sprint/176_songchenxuan_45545' into 'master' 
*Fix task #45545 bug.

See merge request easycorp/zentaopms!941
 2021-12-15 00:39:56 +00:00
songchenxuan 8a014b58f4 *Fix task #45535 bug. 2021-12-15 08:37:31 +08:00
songchenxuan 731c7fb45c *Fix task #45545 bug. 2021-12-14 17:33:01 +08:00