Commit Graph
50549 Commits
Author SHA1 Message Date
songpeiyan b1927d4cd2 *Fix bug #30856 2023-02-01 16:46:42 +08:00
孙广明 fd06ece2f1 Merge branch 'songpeiyan_bug#30079' into 'master'
Songpeiyan bug#30079

See merge request easycorp/zentaopms!6825
2023-02-01 07:57:41 +00:00
孙广明 95972539ab Merge branch 'songpeiyan_bug#31558' into 'master'
* Fix bug #31558.

See merge request easycorp/zentaopms!6821
2023-02-01 07:56:43 +00:00
songpeiyan bfa6c4bd29 Fix bug #30079 2023-02-01 15:48:45 +08:00
songpeiyan b1d3eb75f8 *Fix bug #30079 2023-02-01 15:41:00 +08:00
songpeiyan f8eba3cc9b * Fix bug #31558. 2023-02-01 14:30:43 +08:00
王怡栋 84ea957712 Merge branch 'master_xieqiyu_30834' into 'master'
* Fix bug#30834.

See merge request easycorp/zentaopms!6820
2023-02-01 06:28:30 +00:00
王怡栋 3c316330d1 Merge branch 'master_xieqiyu_30859' into 'master'
* Fix bug#30859.

See merge request easycorp/zentaopms!6819
2023-02-01 06:28:14 +00:00
王怡栋 fb0ffba7a2 Merge branch 'master_xieqiyu_31366' into 'master'
* Fix bug#31366.

See merge request easycorp/zentaopms!6818
2023-02-01 06:27:20 +00:00
王怡栋 a02b41962e Merge branch 'zentaopms284_wangyuting' into 'master'
* Adjust modal width.

See merge request easycorp/zentaopms!6815
2023-02-01 06:26:48 +00:00
王怡栋 0933b65d15 Merge branch 'zentaopms_284_task_#83032' into 'master'
* Finish task #83032.

See merge request easycorp/zentaopms!6813
2023-02-01 06:26:36 +00:00
xieqiyu aeb0d8054d * Fix bug#30834. 2023-02-01 11:13:11 +08:00
xieqiyu eb176697b1 * Fix bug#30859. 2023-02-01 10:48:48 +08:00
孙广明 c6a4775b7d Merge branch 'fixbug/liumengyi_fixbug' into 'master'
* Fix bug for empty password.

See merge request easycorp/zentaopms!6812
2023-02-01 01:54:09 +00:00
孙广明 5e1ef2f376 Merge branch 'zhouxin_feedback_fixbugs' into 'master'
* Fix bug for feedback #2015.

See merge request easycorp/zentaopms!6816
2023-02-01 01:54:02 +00:00
xieqiyu d1d82a03fc * Fix bug#31366. 2023-02-01 09:43:57 +08:00
zhouxin c5570bf560 * Fix bug for feedback #2015. 2023-02-01 09:18:27 +08:00
wangyuting2 809ba4b43e * Adjust modal width. 2023-02-01 08:26:08 +08:00
daitingting eac10fe708 * Finish task #83032. 2023-01-31 09:19:02 +00:00
liumengyi bd86dca878 * Fix bug for empty password. 2023-01-31 16:31:51 +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
孙广明 ba9dbce86b Merge branch 'lyk_ticket_295' into 'master'
* Resolve ticket #295.

See merge request easycorp/zentaopms!6811
2023-01-31 08:05:49 +00:00
liuyongkai 828244c433 * Resolve ticket #295. 2023-01-31 15:23:32 +08:00
孙广明 45d23ceddf Merge branch 'lyk_fix' into 'master'
* Remove error commited file.

See merge request easycorp/zentaopms!6810
2023-01-31 06:12:16 +00:00
liuyongkai b05c2d6dae * Remove error commited file. 2023-01-31 14:10:16 +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
王怡栋 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
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
zhouxin d207715804 * Resolve feedback #2015. 2023-01-31 09:02:38 +08:00
王怡栋 27d762ff59 Merge branch 'zentaopms284_wangyuting' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6803
2023-01-31 00:48:35 +00: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
王怡栋 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
孙广明 94771c4901 Merge branch 'revert-967b1c73' into 'master'
Revert "Merge branch 'lyk_ticket_287' into 'master'"

See merge request easycorp/zentaopms!6799
2023-01-30 07:40:58 +00: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
孙广明 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