 王怡栋
|
0529d3b656
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20458,20369,20140,20373.
See merge request easycorp/zentaopms!2153
|
2022-03-09 03:52:04 +00:00 |
|
|
tanghucheng
|
07f2f81d43
|
* Fix bug #20432.
|
2022-03-09 10:55:55 +08:00 |
|
|
王怡栋
|
f5d4dfc9ad
|
* code for task #49356.
|
2022-03-09 10:53:08 +08:00 |
|
|
tanghucheng
|
2d3c8464d3
|
* Fix bug #20458,20369,20140,20373.
|
2022-03-09 10:20:46 +08:00 |
|
|
王怡栋
|
b960a07ecf
|
* code for task #49352.
|
2022-03-08 10:52:48 +08:00 |
|
|
tianshujie
|
38d53186ba
|
* Modify the code.
|
2022-03-07 15:34:10 +08:00 |
|
|
tianshujie
|
1e11c1b4e1
|
* Fix bug #20287.
|
2022-03-07 14:15:15 +08:00 |
|
|
tianshujie
|
d616ef30c0
|
* Fix bug #20284.
|
2022-03-07 13:54:53 +08:00 |
|
|
王怡栋
|
a783b5d736
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
# module/user/view/batchcreate.html.php
|
2022-03-07 05:25:38 +00:00 |
|
|
孙广明
|
1b137f7bc8
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2107
|
2022-03-07 05:13:55 +00:00 |
|
|
tanghucheng
|
79a38cc9ad
|
* Fix bug.
|
2022-03-07 13:04:06 +08:00 |
|
|
tianshujie
|
8215369e8d
|
* Modify the code.
|
2022-03-07 12:26:44 +08:00 |
|
|
王怡栋
|
3a6dc5a72c
|
* code for task #48840.
|
2022-03-07 11:32:12 +08:00 |
|
|
tianshujie
|
01d0a6b902
|
* Finish task #50311.
|
2022-03-07 11:32:10 +08:00 |
|
|
tianshujie
|
162b015ae5
|
* Modify the code.
|
2022-03-04 14:09:12 +08:00 |
|
|
tianshujie
|
5b5213c761
|
* Fix bug #20301.
|
2022-03-04 13:21:09 +08:00 |
|
|
tianshujie
|
75ba14eb95
|
* Fix bug #20298.
|
2022-03-03 17:05:35 +08:00 |
|
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
|
tianshujie
|
391d9cc18b
|
* Fix bug #20090.
|
2022-03-02 10:02:27 +08:00 |
|
|
tanghucheng
|
87aa943546
|
* Fix bug for classic.
|
2022-03-02 09:04:20 +08:00 |
|
|
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 |
|