Commit Graph
3833 Commits
Author SHA1 Message Date
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
liyuchun adee975255 Merge branch 'sprint/sunhao/task49295' 2022-03-02 13:48:36 +08:00
tianshujie 1dafa1e8dd * Fix bug #20228. 2022-03-02 09:26:39 +08:00
tianshujie 30600fb7bb * Fix bug #20200. 2022-03-01 20:37:20 +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
王怡栋 4f6834011c * fix bug for revert team when edit project. 2022-02-28 14:21:45 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
liumengyi d605fd3f2d * Modify project config edition. 2022-02-24 17:20:50 +08:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
songchenxuan 66bbe4cfbe *Translate. 2022-02-24 16:31:58 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
孙广明 4695a2bd83 Merge branch 'sprint/185_xieqiqyu_fixbug' into 'sprint/185'
* Fix bug#19974.

See merge request easycorp/zentaopms!1940
2022-02-24 05:04:34 +00:00
xieqiyu 76a66dd3e9 * Fix bug#19974. 2022-02-24 11:03:54 +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
xieqiyu 0678ee1fde * Fix bug#19928. 2022-02-24 08:54:08 +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
孙广明 47c48e68a2 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1878
2022-02-22 07:53:22 +00:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
王怡栋 2c89a401d5 * code for task #49352 and fix error. 2022-02-22 13:29:07 +08:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +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 ca0ac94d92 * code for task#49013. 2022-02-14 13:23:51 +08:00
tanghucheng 41e0b66473 * finish task #49013. 2022-02-14 13:17:56 +08:00
tanghucheng c7fab53ed1 * finish task #49090. 2022-02-14 09:57:10 +08:00
tanghucheng fd0ee50bbe * Fix bug #19307. 2022-02-08 16:15:13 +08:00
xieqiyu 0b9e65b245 * Fix bug#18983. 2022-01-26 10:27:50 +08:00
tanghucheng 1f81f7cef8 * Fix projectlist. 2022-01-25 16:27:13 +08:00
liumengyi b6b895bb87 * Modify how the creator is appended to team members. 2022-01-24 17:20:38 +08:00
liumengyi 30236e6a94 * Remove empty line. 2022-01-24 17:11:25 +08:00
liumengyi ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +08:00
zhouxudong d19df00d0b *Finish task #47958. 2022-01-21 09:07:28 +08:00
Wenrui LI acbcfb8f52 * filter project by vision for doclib creation. 2022-01-20 14:47:18 +08:00
zhouxudong a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +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
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +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
王怡栋 0a619a470e Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-17 17:25:44 +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