Commit Graph
3127 Commits
Author SHA1 Message Date
liuhong d7bb46cda5 *Finish feedback #1133. 2022-10-18 05:46:27 +00:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
zenggang 3237e4e752 * Fix bug#28542 2022-10-17 05:22:40 +00:00
mayue 97aaafbbc3 * Remove ticket from bug. 2022-10-17 09:01:15 +08:00
王怡栋 9f9d913205 Merge branch 'bug_28378' into 'master'
* Fix bug#28378

See merge request easycorp/zentaopms!5711
2022-10-10 09:24:58 +00:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
zenggang 3d68550408 * Fix bug#28378 2022-10-10 07:57:30 +00:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 f4aa951774 * Finish task #71874. 2022-10-10 09:59:14 +08:00
wangyidong b670a47863 * fix bug #27958. 2022-10-08 15:32:49 +08:00
zenggang 29dbb25855 * Adjust code 2022-09-29 08:13:34 +00:00
zenggang 6a85ed1d6f * Fix bug#28011 2022-09-29 06:56:02 +00:00
mayue 23c42a2439 * Fix bug of feedback to bug. 2022-09-29 13:25:10 +08:00
tianshujie 1513c4a303 * Modify navigation default font color. 2022-09-27 15:14:54 +08:00
tanghucheng 2ac544b181 * Fix bug for bug export. 2022-09-27 08:45:07 +08:00
xieqiyu eed9d18857 * Fix bug#27359. 2022-09-23 09:02:39 +00:00
xieqiyu b7d243f0be * Fix bug$27453. 2022-09-23 08:32:16 +00:00
tianshujie a6cdf518d2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_fixbug 2022-09-23 10:39:27 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
tianshujie 95ed6665d8 * Fix bug #27632. 2022-09-23 10:03:53 +08:00
王怡栋 d4ed48e790 Merge branch 'sprint/241_dyl_70018' into 'master'
* task #70018, change bug confirmed color.

See merge request easycorp/zentaopms!5467
2022-09-22 06:09:26 +00:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
dingyongliang c7c4ec7429 * task #70018, change bug confirmed color. 2022-09-22 01:12:16 +00:00
tianshujie a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
王怡栋 ecbb1e7b43 Merge branch 'feedback_953' into 'master'
* Code for feedback#953

See merge request easycorp/zentaopms!5441
2022-09-21 05:20:56 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
zenggang 943e27d41c * Code for feedback#953 2022-09-21 02:05:58 +00:00
zenggang 0dcf0dfa0d * Code for feedback#835 2022-09-15 07:41:47 +00:00
tanghucheng 714dffe615 * Fix bug for bug export. 2022-09-14 14:42:44 +08:00
tianshujie 226029f1e5 * Fix bug #27451. 2022-09-09 16:34:08 +08:00
tianshujie b5630098eb * Fix bug #27449. 2022-09-09 16:10:34 +08:00
王怡栋 b9564e50a1 Merge branch 'master_xieqiyu_27124' into 'master'
Master xieqiyu 27124

See merge request easycorp/zentaopms!5300
2022-09-09 07:17:43 +00:00
xieqiyu dfe4de62a5 * Fix bug#26179. 2022-09-09 14:14:53 +08:00
xieqiyu a258b7b9db * Fix bug#26156. 2022-09-09 14:11:36 +08:00
tianshujie e9efb56769 * Fix bug #27437. 2022-09-09 10:37:28 +08:00
xieqiyu 5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu 97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
xieqiyu 592a109bed * Code for task#67691. 2022-09-08 09:09:03 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
王怡栋 19d5097ff3 Merge branch 'sprint/daitingting_optimize' into 'master'
* Optimize codes.

See merge request easycorp/zentaopms!5269
2022-09-06 05:44:51 +00:00
daitingting dc0ecc890e * Optimize codes. 2022-09-06 05:26:47 +00:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
lanzongjun 91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
王怡栋 48e11d5186 Merge branch 'sprint/hufangzhou_26458' into 'master'
* Fix bug #26458.

See merge request easycorp/zentaopms!5230
2022-09-01 06:53:53 +00:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
hufangzhou def6b278e9 * Fix bug #26458. 2022-09-01 10:50:45 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00