Commit Graph
33644 Commits
Author SHA1 Message Date
songchenxuan 7a9f363287 Delete lang. 2022-02-14 14:43:25 +08:00
songchenxuan 83819fa82b *Delete lang. 2022-02-14 09:51:40 +08:00
李玉春 c856323c92 Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1773
2022-02-14 00:26:45 +00:00
周旭东 84b35d270b Update control.php 2022-02-14 00:26:15 +00:00
zhouxudong c3112657d2 *Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844. 2022-02-11 17:33:22 +08:00
王怡栋 78bf6df425 Merge branch 'sgm_jira' into 'master'
Sgm jira

See merge request easycorp/zentaopms!1772
2022-02-11 09:17:05 +00:00
李玉春 1e9277e1eb Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1768
2022-02-11 08:20:22 +00:00
周旭东 a1529b8b5a Update linkbugs.html.php 2022-02-11 08:14:20 +00:00
zhouxudong 0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
孙广明 0eee64a963 * Fix jira. 2022-02-11 14:45:08 +08:00
孙广明 23411bf8a3 * Code for jira. 2022-02-11 14:13:16 +08:00
zhouxudong 8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
孙广明 1ad816c134 Merge branch 'sprint/sunhao/new_icons' into 'master'
* Add new icons: "college", "tree", "group-view", "gantt", update: "list".

See merge request easycorp/zentaopms!1762
2022-02-11 02:23:06 +00:00
Hao Sun 522fc8199b * add new icons: "college", "tree", "group-view", "gantt", update: "list". 2022-02-11 10:11:26 +08:00
李玉春 052da8f12b Merge branch 'sprint/fixbug_19294' into 'master'
Sprint/fixbug 19294

See merge request easycorp/zentaopms!1757
2022-02-11 01:22:53 +00:00
周旭东 5ba86b7707 Update execution.zh-cn.css 2022-02-11 01:20:38 +00:00
周旭东 a909b67371 Update execution.en.css 2022-02-11 01:20:25 +00:00
李玉春 fe0504586a Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1759
2022-02-11 01:08:59 +00:00
周旭东 82d4f1c8ea Update helper.class.php 2022-02-11 01:02:07 +00:00
周旭东 acdbf7e73d Update helper.class.php 2022-02-11 01:01:50 +00:00
周旭东 294782a7f5 Update helper.class.php 2022-02-11 01:01:39 +00:00
周旭东 d2d1dc0c26 Update helper.class.php 2022-02-11 01:01:12 +00:00
zhouxudong 6ddf3fdc98 *Fix bug #19294. 2022-02-11 08:59:20 +08:00
sgm0422 47f0ca28d5 * Code for jira. 2022-02-10 21:25:41 +08:00
孙广明 dc7ced4c87 * Code for jira. 2022-02-10 17:30:47 +08:00
孙广明 708a08d52f Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1749
2022-02-10 06:55:10 +00:00
tanghucheng ebef99ccf6 * Fix bug. 2022-02-10 14:52:21 +08:00
zhouxudong 818bb2ef63 *Finish task #48844. 2022-02-10 14:04:19 +08:00
孙广明 63bd6e0c46 * Code for jira. 2022-02-10 11:56:50 +08:00
孙广明 efe77ec0fd * Add merge user. 2022-02-10 11:03:57 +08:00
李玉春 3066df4c08 Merge branch 'sprint/fixbug_19368' into 'master'
Sprint/fixbug 19368

See merge request easycorp/zentaopms!1748
2022-02-10 02:54:31 +00:00
李玉春 bc4ab66cdd Merge branch 'sprint/task_zhouxudong_48843' into 'master'
*Finish task #48843.

See merge request easycorp/zentaopms!1745
2022-02-10 02:54:20 +00:00
周旭东 b533838198 Update kanban.html.php 2022-02-10 02:38:49 +00:00
zhouxudong ec73ec4f83 *Fix bug #19368. 2022-02-10 10:35:52 +08:00
王怡栋 523aa7db37 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #19356.

See merge request easycorp/zentaopms!1746
2022-02-10 01:50:46 +00:00
孙广明 9748e70a31 * Fix bug #19356. 2022-02-10 09:37:34 +08:00
孙广明 1086d07bf4 * Code for jira. 2022-02-10 08:37:03 +08:00
孙广明 e04850e946 * Code for jira. 2022-02-10 08:36:47 +08:00
zhouxudong 31e2c020f7 *Finish task #48843. 2022-02-09 16:09:57 +08:00
孙广明 f653c1f1b7 Merge branch 'fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!1740
2022-02-09 06:06:38 +00:00
tanghucheng 3e6e604678 * Fix bug . 2022-02-09 14:05:34 +08:00
孙广明 0ce75c876f * Fix bug. 2022-02-09 13:24:33 +08:00
周旭东 4f26dd32fe Update execution.css 2022-02-09 13:24:33 +08:00
周旭东 b158a2a7aa Update execution.css 2022-02-09 13:24:33 +08:00
zhouxudong 6783e843f5 *Fix bug #19293. 2022-02-09 13:24:33 +08:00
tanghucheng 32ce0200ef * Fix bug. 2022-02-09 13:24:33 +08:00
liyuchun cc392110e0 * Fix bug. 2022-02-09 13:24:33 +08:00
zhouxudong 26156f2810 *Fix bug #19292. 2022-02-09 13:24:33 +08:00
周旭东 c7ac66ea62 Update model.php 2022-02-09 13:24:33 +08:00
周旭东 d0b19ad953 Update model.php 2022-02-09 13:24:33 +08:00