 tanghucheng
|
ccc11c4e4b
|
* Hide preference and tutorial.
|
2022-02-28 15:18:57 +08:00 |
|
|
liumengyi
|
51ef04f29c
|
* FIx bug #19924.
|
2022-02-25 15:58:26 +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 |
|
|
孙广明
|
25f71e0a51
|
Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
# module/task/model.php
|
2022-02-25 00:41:58 +00:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
孙广明
|
f9ed1e1dd9
|
* Fix group bug.
|
2022-02-24 15:41:12 +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 |
|
|
Wenrui LI
|
2fdb1de490
|
* show only groups of current vision on user create, bug #18849.
|
2022-02-22 14:52:36 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +08:00 |
|
|
王怡栋
|
3082abe478
|
* adjust for set vision.
|
2022-02-18 08:36:54 +08:00 |
|
|
王怡栋
|
3ebcfb1ddc
|
* fix bug #19693.
|
2022-02-17 11:06:28 +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 |
|
|
王怡栋
|
770ae16589
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-02-15 09:43:31 +08:00 |
|
|
王怡栋
|
98c6d7b2b1
|
* code for task #48840.
|
2022-02-15 09:42:47 +08:00 |
|
|
liyuchun
|
0d16a79b63
|
* Fix bug #19323.
|
2022-02-15 08:22:25 +08:00 |
|
|
tanghucheng
|
c7fab53ed1
|
* finish task #49090.
|
2022-02-14 09:57:10 +08:00 |
|
|
mayue
|
2cc103e46f
|
* Fix bug #18308.
|
2022-02-07 11:10:43 +08:00 |
|
|
Wenrui LI
|
2702a886da
|
* query group by vision when authorizing user.
|
2022-01-21 10:18:05 +08:00 |
|
|
zhujinyong
|
2e85ff6e08
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-19 09:08:22 +08:00 |
|
|
zhujinyong
|
8ed8e31da9
|
* Fix doc menu for lite.
|
2022-01-19 09:08:07 +08:00 |
|
|
王怡栋
|
03d2e3cb4a
|
Merge branch 'master' into lite
|
2022-01-19 08:44:43 +08:00 |
|
|
zhujinyong
|
faff9d3dbd
|
+ Switch vision.
|
2022-01-18 11:50:29 +08:00 |
|
|
liumengyi
|
79813a2166
|
* Modify judgment.
|
2022-01-17 18:53:45 +08:00 |
|
|
liumengyi
|
c11615933a
|
* Fix bug #18625.
|
2022-01-17 18:51:50 +08:00 |
|
|
liumengyi
|
47e7cd7f10
|
* Fix bug #18625.
|
2022-01-17 18:46:58 +08:00 |
|
|
liumengyi
|
842ca07618
|
* Fix bug #18625.
|
2022-01-17 18:25:39 +08:00 |
|
|
孙广明
|
66515d7ed8
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.
See merge request easycorp/zentaopms!1420
|
2022-01-17 00:57:03 +00:00 |
|
|
孙广明
|
758c03968f
|
* Add kanban type in query.
|
2022-01-17 08:41:59 +08:00 |
|
|
liumengyi
|
fc5ad0f893
|
* FIx bug #18489,#18478,#18466.
|
2022-01-16 17:11:40 +08:00 |
|
|
mayue
|
a2765b7427
|
* Optimize code.
|
2022-01-06 13:50:43 +08:00 |
|
|
mayue
|
fcb699c84d
|
* Fix bug #18147,18149.
|
2022-01-06 13:38:10 +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 |
|
|
zhujinyong
|
e944c4a428
|
Merge branch 'sprint/180_sunhao/task46524' into sprint/180
|
2021-12-31 11:21:25 +08:00 |
|
|
Hao Sun
|
dff300cf88
|
* Task #46524, refactor user selector for page "project/managemembers".
|
2021-12-30 17:02:32 +08:00 |
|
|
mayue
|
9d89d77c57
|
* Finish task #46527.
|
2021-12-30 13:10:17 +08:00 |
|
|
王怡栋
|
0d2f111a67
|
* fix error for php8.0.
|
2021-12-24 08:40:34 +08:00 |
|
|
朱金勇
|
8ba0385b58
|
Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization
See merge request easycorp/zentaopms!924
|
2021-12-20 00:47:21 +00:00 |
|
|
liyuchun
|
df21c2f8bf
|
* Fix bug #17521.
|
2021-12-14 16:56:40 +08:00 |
|
|
Yurun
|
c89277b5fc
|
Optimize user module
|
2021-12-11 09:06:08 +08:00 |
|
|
王怡栋
|
c16478c5d0
|
* fix for upgrade from lower version.
|
2021-12-03 15:47:39 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
孙广明
|
801c9ce3d0
|
Merge branch 'sprint/169' into sprint/168
|
2021-11-30 13:47:05 +08:00 |
|
|
王怡栋
|
8fc78ccd45
|
* adjust for api.
|
2021-11-29 13:06:47 +08:00 |
|
|
liumengyi
|
5dbd0ad4b9
|
* Fix bug #16869.
|
2021-11-29 10:28:52 +08:00 |
|
|
liumengyi
|
b6acb88c21
|
* Fix bug #16869.
|
2021-11-29 09:55:00 +08:00 |
|
|
liumengyi
|
c72bdbbdfb
|
* Finish task #45158.
|
2021-11-26 10:50:16 +08:00 |
|