Commit Graph
1795 Commits
Author SHA1 Message Date
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
tianshujie 7c46d9c61d * Fix bug #17291. 2022-03-25 12:51:59 +08:00
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
2022-03-24 09:20:45 +00:00
李玉春 eef0da7fd0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2517
2022-03-24 09:16:36 +00:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
Wenrui LI b6cc4de226 * set z-index to table-footer, fix bug #21053. 2022-03-24 14:25:57 +08:00
tianshujie 69bac81a9d * Fix bug #17395. 2022-03-24 11:01:00 +08:00
zhouxin cebd0a33d5 Fix bug #13855. 2022-03-22 07:38:24 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙华伟 9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
孙华伟 a2d2db7b27 *Fix bug#17639 2022-03-15 13:21:14 +08:00
tianshujie 19017161b6 * Delete useless variables. 2022-03-08 09:45:21 +08:00
tianshujie 23f8d33293 * Add variable judgment. 2022-03-08 08:59:15 +08:00
tianshujie c2f14bb9c2 * Finish task #50318. 2022-03-08 08:53:55 +08:00
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
Hao Sun aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
王怡栋 44be255e67 * adjust task #49362 and check priv. 2022-03-01 11:23:44 +08:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
孙广明 e6338d280e Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.

See merge request easycorp/zentaopms!1936
2022-02-24 02:46:43 +00:00
zhangzilong a9e3772439 * Finish task #49280. 2022-02-24 09:30:52 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
tanghucheng fd0ee50bbe * Fix bug #19307. 2022-02-08 16:15:13 +08:00
liumengyi ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +08:00
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
孙广明 fb8fd8b7de Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18584, #18594.

See merge request easycorp/zentaopms!1453
2022-01-18 01:32:19 +00:00
孙广明 139f1dbcac * Fix delay bug. 2022-01-18 09:18:13 +08:00
liumengyi c377f3b54c * Fix bug #18584, #18594. 2022-01-18 09:03:30 +08:00
孙广明 820993a452 * Add delay. 2022-01-18 08:52:13 +08:00
liumengyi 842ca07618 * Fix bug #18625. 2022-01-17 18:25:39 +08:00
王怡栋 d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +08:00
孙广明 48473a63dc Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444
2022-01-17 08:31:47 +00:00
liumengyi 00f85a4ee8 * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. 2022-01-17 16:13:45 +08:00
孙广明 f82881b592 * Fix bugs. 2022-01-17 15:37:52 +08:00
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
王怡栋 25d152f63d Merge branch 'sgm_kanban' into 'kanban'
* Fix details and add upgrade logic.

See merge request easycorp/zentaopms!1411
2022-01-14 06:37:28 +00:00
孙广明 19aaf9740c * Fix details and add upgrade logic. 2022-01-14 14:31:59 +08:00
孙广明 13e653f600 * Process kanban execution. 2022-01-14 13:34:47 +08:00
liumengyi 92c3693650 * Fix bug #18419, #18414, #18411. 2022-01-13 17:20:21 +08:00
liumengyi 8850815c58 * Finish task #47339. 2022-01-13 14:13:03 +08:00
tianshujie bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
tianshujie e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +08:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明 1cae18380b Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
2022-01-11 00:39:37 +00:00
hufangzhou 63226a2e84 * Finish task #47330. 2022-01-10 15:45:24 +08:00