Commit Graph
41414 Commits
Author SHA1 Message Date
guofeilong 9cda91e65d * code for css in admin 2023-02-01 09:17:22 +08:00
guofeilong 72190413be Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-02-01 09:16:54 +08:00
caoyanyi dfb991ba7c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 08:54:25 +08:00
guofeilong cdef2f2a88 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 17:20:39 +08:00
guofeilong d502d06618 * code for css in admin/index.html 2023-01-31 17:20:22 +08:00
wangyidong 35fa42992c Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-01-31 16:19:10 +08:00
wangyidong 7af8d535f1 * code for task #83439. 2023-01-31 16:15:00 +08:00
caoyanyi 746bb0da84 * Modify language check. 2023-01-31 16:14:18 +08:00
guofeilong ed6256fac0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 16:13:24 +08:00
孙广明 ba7b473635 Merge branch 'zhouxin_feedback_2015' into 'master'
* Resolve feedback #2015.

See merge request easycorp/zentaopms!6805
2023-01-31 08:06:25 +00:00
caoyanyi 85ee9918c0 * Modify website check. 2023-01-31 15:25:46 +08:00
liuyongkai 828244c433 * Resolve ticket #295. 2023-01-31 15:23:32 +08:00
guofeilong 73ff7ad444 * code for add style in clientList 2023-01-31 14:50:09 +08:00
朱金勇 f2b5b5cd42 Merge branch 'fix/typo' into 'master'
* Fix typo.

See merge request easycorp/zentaopms!6779
2023-01-31 05:59:58 +00:00
caoyanyi 062200535c * Modify page style. 2023-01-31 13:54:21 +08:00
王怡栋 f0f2784b42 Merge branch 'zentaopms284_bug#77615' into 'master'
* Fix bug #77615.

See merge request easycorp/zentaopms!6808
2023-01-31 03:18:38 +00:00
王怡栋 8e40414917 Merge branch 'master_bug_30389' into 'master'
* Adjust code logic for 30389.

See merge request easycorp/zentaopms!6807
2023-01-31 03:18:20 +00:00
王怡栋 b584104430 Merge branch 'sprint/hidedropmenu' into 'master'
* Hide drop-down menu when click one item.

See merge request easycorp/zentaopms!6806
2023-01-31 03:18:03 +00:00
guofeilong e99e2adad0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-31 10:59:18 +08:00
guofeilong e11aa068a3 * code for style in offical-content 2023-01-31 10:54:49 +08:00
guofeilong 0ab09e26c2 * code for task #83433 2023-01-31 10:46:16 +08:00
guofeilong ffe1ccdbe8 * code for lang 2023-01-31 10:25:38 +08:00
wangyuting2 93441fab71 * Fix bug #77615. 2023-01-31 10:20:25 +08:00
liuhong 40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
guofeilong 0959b76706 * code for css in plug 2023-01-31 09:14:53 +08:00
zhouxin d207715804 * Resolve feedback #2015. 2023-01-31 09:02:38 +08:00
caoyanyi 15d3a2a5ac Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-01-31 08:56:37 +08:00
王怡栋 d8ed3dbca6 Merge branch 'sprint/285_navigation' into 'sprint/285'
* Finish task #83329.

See merge request easycorp/zentaopms!6804
2023-01-31 00:49:07 +00:00
guofeilong e7468f1699 * code for css in admin.html 2023-01-31 08:27:03 +08:00
wangyuting2 b4efdef521 * Optimize code. 2023-01-31 08:25:31 +08:00
chaideqing ed34ae2cae * Hide drop-down menu when click one item. 2023-01-30 09:39:55 +00:00
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +08:00
guofeilong 6ce4ae36ec Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-30 17:20:05 +08:00
caoyanyi 02f6b95c20 * Add extension list. 2023-01-30 17:11:28 +08:00
guofeilong 6df1f2daa6 * code for task_#83327 2023-01-30 16:37:24 +08:00
王怡栋 b75714f5b1 Merge branch 'zentaopms_284_task_#83030' into 'master'
* Finish task #83030.

See merge request easycorp/zentaopms!6800
2023-01-30 08:03:30 +00:00
王怡栋 6e2288d96d Merge branch 'zentaopms284_task#82065' into 'master'
* Send an email to the dispatcher when closing a bug or requirement.

See merge request easycorp/zentaopms!6801
2023-01-30 08:02:48 +00:00
wangyuting2 88b0a68ee0 * Send an email to the dispatcher when closing a bug or requirement. 2023-01-30 15:41:50 +08:00
孙广明 6d0110a732 Revert "Merge branch 'lyk_ticket_287' into 'master'"
This reverts merge request !6797
2023-01-30 07:40:49 +00:00
daitingting af2dc8014c * Finish task #83030. 2023-01-30 07:32:19 +00:00
guofeilong 44b526f9fc * code for task #83327 2023-01-30 14:57:46 +08:00
孙广明 7d95c8a911 Merge branch 'master_xieqiyu_31461' into 'master'
Master xieqiyu 31461

See merge request easycorp/zentaopms!6796
2023-01-30 05:36:34 +00:00
孙广明 967b1c7326 Merge branch 'lyk_ticket_287' into 'master'
* Resolve ticket #287.

See merge request easycorp/zentaopms!6797
2023-01-30 05:36:21 +00:00
liuyongkai f1030b3c5e * Resolve ticket #287. 2023-01-30 13:27:38 +08:00
xieqiyu 9bada2157b * Delete unused code. 2023-01-30 10:04:52 +08:00
xieqiyu fa78b0914f * Fix bug#31461. 2023-01-30 10:03:31 +08:00
wangyidong 516d773d1d * fix bug #31718. 2023-01-30 09:01:15 +08:00
王怡栋 73bc6538d0 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6794
2023-01-30 00:37:19 +00:00
孙广明 827f9c9508 Merge branch 'fixbug_liumengyi_31808' into 'master'
* Fix bug #31808.

See merge request easycorp/zentaopms!6795
2023-01-30 00:34:10 +00:00
liumengyi ba1f64daf9 * Fix bug #31808. 2023-01-30 08:29:51 +08:00