 sunjun
|
445279bb1a
|
*Fixbug_sunjun_17828
|
2022-04-28 05:26:17 +00:00 |
|
|
xieqiyu
|
565ea292d3
|
* Fix bug#21642.
|
2022-04-20 14:31:47 +08:00 |
|
|
zhouxin
|
1571548411
|
* Fix bug #21654.
|
2022-04-12 01:34:40 +00:00 |
|
|
zhouxin
|
d79f9f22e4
|
* Fix bug #21320.
|
2022-04-11 06:14:00 +00:00 |
|
|
zhouxin
|
50fe51a2e5
|
* Fix bug #21320.
|
2022-04-11 01:18:40 +00:00 |
|
|
孙广明
|
1c8f929a0d
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.
See merge request easycorp/zentaopms!2684
|
2022-04-02 06:49:30 +00:00 |
|
|
liyuchun
|
4240b563c9
|
* Fix bug #21061.
|
2022-04-01 10:27:27 +08:00 |
|
|
Zongjun Lan
|
7c99a6153d
|
* fix bug gantt
|
2022-03-29 16:11:21 +08:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
Zongjun Lan
|
47b88a959d
|
* fix bug classic user edit and batchedit
|
2022-03-25 10:15:31 +08:00 |
|
|
Zongjun Lan
|
b80761648b
|
* fix bug classic vision
|
2022-03-25 09:36:56 +08:00 |
|
|
liyuchun
|
81c04c08e9
|
* Fix bug #17367.
|
2022-03-25 09:20:22 +08:00 |
|
|
Wenrui LI
|
4a36b134cd
|
* fix hidden vision inputs.
|
2022-03-22 11:06:54 +08:00 |
|
|
Wenrui LI
|
e920e855eb
|
* add hidden vision input if vision is not shown.
|
2022-03-22 10:51:40 +08:00 |
|
|
Wenrui LI
|
450f2d7d89
|
* remove user vision field if there is no other vision available, task #51318, bug #20691.
|
2022-03-21 17:06:12 +08:00 |
|
|
tanghucheng
|
72095bf38a
|
* Fix bug #20803.
|
2022-03-15 16:31:27 +08:00 |
|
|
tanghucheng
|
6e0066af25
|
* Merge code.
|
2022-03-10 16:19:26 +08:00 |
|
|
孙广明
|
97859c945b
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# module/user/js/batchcreate.js
# module/user/view/batchcreate.html.php
|
2022-03-10 08:07:31 +00:00 |
|
|
tanghucheng
|
31588aacc7
|
* Adjust for batchcreate user.
|
2022-03-10 15:23:40 +08:00 |
|
|
tanghucheng
|
76fd14c845
|
* Adjust for create user.
|
2022-03-10 12:09:33 +08:00 |
|
|
王怡栋
|
53c2dd44fb
|
* fix bug #20113.
|
2022-03-10 10:31:10 +08:00 |
|
|
王怡栋
|
f5d4dfc9ad
|
* code for task #49356.
|
2022-03-09 10:53:08 +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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
tianshujie
|
01d0a6b902
|
* Finish task #50311.
|
2022-03-07 11:32:10 +08:00 |
|
|
tianshujie
|
391d9cc18b
|
* Fix bug #20090.
|
2022-03-02 10:02:27 +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
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15: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 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +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 |
|
|
tanghucheng
|
c7fab53ed1
|
* finish task #49090.
|
2022-02-14 09:57:10 +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 |
|
|
liumengyi
|
a9b865aa9f
|
* Finish task #45158.
|
2021-11-26 10:47:53 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
Hao Sun
|
bc312bfe2d
|
* improve UI for cropavatar dialog and fix conflict with autosize feature of ModalTrigger.
|
2021-09-15 19:23:32 +08:00 |
|
|
hufangzhou
|
2d636f7ab9
|
* Fix the upload avatar.
|
2021-09-15 18:12:05 +08:00 |
|
|
dingna
|
8fc5296ee3
|
* Fix bug #15161.
|
2021-09-14 16:05:32 +08:00 |
|
|
王怡栋
|
6230063da0
|
* Add autocomplete attr for input.
|
2021-08-31 15:59:27 +08:00 |
|
|
liyuchun
|
46f2dc73c3
|
* Finish task #41764.
|
2021-08-30 13:00:53 +08:00 |
|
|
Hao Sun
|
09f4a426d4
|
* task #41783, #task 41765, improve UI for tutorial mode.
|
2021-08-26 10:05:35 +08:00 |
|
|
王怡栋
|
11f7edc064
|
* finish task #41753.
|
2021-08-25 09:55:44 +08:00 |
|