Commit Graph
2569 Commits
Author SHA1 Message Date
tianshujie dfddd4e48b * Modify the code. 2022-01-21 13:19:02 +08:00
tianshujie fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
liumengyi 039437a741 * Modify bug smooth refresh variable. 2022-01-21 10:49:54 +08:00
liumengyi 02c47ead7c * Finish task #48012. 2022-01-21 10:39:54 +08:00
liumengyi 445a26f81e * Modify code format. 2022-01-20 17:22:10 +08:00
liumengyi 3ec206f626 * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. 2022-01-20 17:07:03 +08:00
朱金勇 fc7302c5ce Merge branch 'sprint/183_zhouxudong_trans47956' into 'master'
*Finish task #47956.

See merge request easycorp/zentaopms!1502
2022-01-20 07:38:21 +00:00
朱金勇 1ce16c8e3a Merge branch 'sprint/scx_international' into 'master'
Sprint/scx international

See merge request easycorp/zentaopms!1499
2022-01-20 07:38:04 +00:00
songchenxuan f458304c06 *Finish task #47951,47952,47953,47954. 2022-01-19 16:43:20 +08:00
zhouxudong f49dc4541c *Finish task #47956. 2022-01-19 16:29:40 +08:00
zhouxudong 93aafabf4f *Finish task #47955 #47957. 2022-01-19 15:50:41 +08:00
songchenxuan 2cc7870623 *Finish task #47951,47952,47953. 2022-01-19 10:22:02 +08:00
hufangzhou 0f9fa42664 * Fix bug #18673. 2022-01-18 15:31:10 +08:00
孙广明 431f7d100e Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: Branch error when click header.

See merge request easycorp/zentaopms!1474
2022-01-18 06:05:48 +00:00
xieqiyu e35fa62b97 * Fix bug: Branch error when click header. 2022-01-18 14:01:46 +08:00
tianshujie 5d042bcbea * Modify the code. 2022-01-18 13:11:52 +08:00
tianshujie 1ebf1c4827 * Restore code. 2022-01-18 11:21:49 +08:00
tianshujie 93ef9baf9f * Fix bug #18646. 2022-01-18 11:19:35 +08:00
tianshujie 470801b6aa * Fix bug #18640,18646. 2022-01-18 11:09:01 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
tianshujie 97a4fb7cc9 * Adjust code of kanban and bug model. 2022-01-17 17:24:42 +08:00
tianshujie 3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
chaideqing 02bace4f99 * fix bug #18039,task #47399, keep close button is 32px in bug/story/task assignTo page 2022-01-17 11:26:33 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
liumengyi 6c1754423c * Fix bug for RD Kanban. 2022-01-13 16:06:41 +08:00
liumengyi 5d40963b8a * Fix bug for RD Kanban. 2022-01-13 16:00:42 +08:00
朱金勇 1025716534 Merge branch 'sprint/zhouxudong_fixbug_17257' into 'master'
*Fix bug #17257.

See merge request easycorp/zentaopms!1373
2022-01-13 05:06:12 +00:00
朱金勇 ee2fc5b7c6 Merge branch 'phpcs-zhanrunyu' into 'master'
Fix compatibility with PHP 5.4

See merge request easycorp/zentaopms!1371
2022-01-13 04:28:02 +00:00
zhouxudong 0b86002428 *Fix bug #17257. 2022-01-13 10:39:56 +08:00
zhangrunyu 39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
zhouxudong cc9aae99c7 *Fix bug #18036. 2022-01-12 15:55:25 +08:00
tianshujie 1c28a0462f * Change the die of the bug module to return print. 2022-01-11 08:09:13 +08:00
tianshujie 1ee5fb522f * Fix bug #18287. 2022-01-10 12:15:19 +08:00
孙广明 d5efab2baf Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
#   module/project/config.php
2022-01-07 00:46:43 +00:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
liumengyi 42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
songchenxuan bc637ef419 *Fix bug 18183,18184. 2022-01-05 15:11:26 +08:00
songchenxuan ecc3ae4608 *Fix bug 18183,18184. 2022-01-05 15:06:56 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
孙广明 1d6a70d41d Merge branch 'sprint/180_songchenxuan_46519' into 'sprint/180'
*Finish task #46519.

See merge request easycorp/zentaopms!1198
2021-12-30 08:17:21 +00:00
songchenxuan 5e7c715efb *Finish task #46519. 2021-12-29 17:42:41 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
朱金勇 58716fddf1 Merge branch 'sprint/180_songchenxuan_fix_classicbranchbug' into 'sprint/180'
Sprint/180 songchenxuan fix classicbranchbug

See merge request easycorp/zentaopms!1164
2021-12-29 08:55:59 +00:00
liyuchun 2b44879ba2 * Adjust code style. 2021-12-29 10:24:39 +08:00
liyuchun 8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00