tianshujie
|
792f1c5a98
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 08:33:25 +08:00 |
|
tianshujie
|
ad1d1631a3
|
* Code for finish task #84593.
|
2023-02-16 14:42:27 +08:00 |
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
tianshujie
|
be00a4a8ae
|
* Code for finish task #84580.
|
2023-02-16 09:29:05 +08:00 |
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
王怡栋
|
3a6bca8dc2
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.
See merge request easycorp/zentaopms!6966
|
2023-02-15 09:22:38 +00:00 |
|
wangyuting2
|
a86eb599d9
|
* Fix project extend priv bug.
|
2023-02-15 17:20:35 +08:00 |
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
Yagami
|
da62f994d9
|
Merge branch 'sgm_dtable' into zentaopms_284
|
2023-02-15 15:49:53 +08:00 |
|
liuhong
|
a767115e92
|
* Resolved feedback 2191.
|
2023-02-15 06:16:55 +00:00 |
|
Yagami
|
947307c349
|
* Fix bugs for dtable.
|
2023-02-15 11:14:09 +08:00 |
|
tianshujie
|
f989173e10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-15 08:29:48 +08:00 |
|
tianshujie
|
b2fef4f696
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-15 08:19:27 +08:00 |
|
王怡栋
|
20f17196b2
|
Merge branch 'ticket_366' into 'master'
Ticket 366
See merge request easycorp/zentaopms!6941
|
2023-02-14 05:04:09 +00:00 |
|
王怡栋
|
5c28eb1317
|
Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.
See merge request easycorp/zentaopms!6940
|
2023-02-14 05:03:43 +00:00 |
|
liuhong
|
e9d2d7362a
|
* Adjust code for feedback #2191
|
2023-02-14 01:43:35 +00:00 |
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
zenggang
|
317ddd5fbc
|
* Fix bug #32024
|
2023-02-13 02:02:32 +00:00 |
|
wangyidong
|
ff66b39a2a
|
* code for task #83736.
|
2023-02-10 17:37:50 +08:00 |
|
liumengyi
|
a5807a3a68
|
* Hide change table mode when currentModule is execution and currentMethod is all.
|
2023-02-10 13:40:30 +08:00 |
|
daitingting
|
060f843b07
|
* Fix bug #31996.
|
2023-02-10 05:15:12 +00:00 |
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
wangyuting2
|
e7a66de47f
|
* Fix admin model menu bug.
|
2023-02-10 10:31:32 +08:00 |
|
hufangzhou
|
8d26dceb4b
|
* Compatible with php5.3.
|
2023-02-09 05:54:15 +00:00 |
|
Yagami
|
7d5d82693a
|
* Add dtable.
|
2023-02-08 17:45:51 +08:00 |
|
liumengyi
|
84970085ec
|
* Finish task #83942.
|
2023-02-08 14:14:08 +08:00 |
|
tianshujie
|
3c4c046f5f
|
* Delete space.
|
2023-02-08 10:43:38 +08:00 |
|
tianshujie
|
c29df55df8
|
* Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-08 10:39:45 +08:00 |
|
tianshujie
|
42b65e5986
|
* Code for finish task #83722.
|
2023-02-08 09:33:14 +08:00 |
|
tianshujie
|
2b265f6157
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation
|
2023-02-07 09:01:49 +08:00 |
|
tianshujie
|
1a1f8d3a07
|
* Put holiday permissions in the open source edition.
|
2023-02-06 17:05:37 +08:00 |
|
tianshujie
|
adc0616341
|
* Code for finish task #83721,83722.
|
2023-02-06 15:41:55 +08:00 |
|
guofeilong
|
5f629ca690
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 14:50:15 +08:00 |
|
liuhong
|
2d3cfc3613
|
*Fix the testtask and testcase creatBug open new label.
|
2023-02-02 05:59:18 +00:00 |
|
wangyidong
|
de17879c59
|
* code for task #83436.
|
2023-02-01 15:37:07 +08:00 |
|
wangyidong
|
8ec471f950
|
* code for task #83439.
|
2023-02-01 11:20:57 +08:00 |
|
caoyanyi
|
dfb991ba7c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-01 08:54:25 +08:00 |
|
wangyidong
|
7af8d535f1
|
* code for task #83439.
|
2023-01-31 16:15:00 +08:00 |
|
liumengyi
|
df9883b126
|
* Finish task #83216.
|
2023-01-31 09:27:01 +08:00 |
|
chaideqing
|
ed34ae2cae
|
* Hide drop-down menu when click one item.
|
2023-01-30 09:39:55 +00:00 |
|
tianshujie
|
8b5f786bd2
|
* Finish task #83329.
|
2023-01-30 17:23:10 +08:00 |
|
tanghucheng
|
f499e9e4af
|
* Remove init operation for zahost and zanode.
|
2023-01-12 13:22:03 +08:00 |
|
zhaoke
|
f8a69684b4
|
* Fix bug 31348.
|
2023-01-03 05:26:19 +00:00 |
|
tanghucheng
|
c04a1207d0
|
* Fix bug.
|
2022-12-30 10:40:41 +08:00 |
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
liugang
|
3141fb89f3
|
* Rename the screen menu.
|
2022-12-27 10:58:14 +08:00 |
|
liugang
|
8100689bb2
|
Merge branch 'sprint/biz17'
|
2022-12-26 08:50:31 +08:00 |
|
liugang
|
0257517d94
|
* Add privilege control of screen.
|
2022-12-23 14:53:28 +08:00 |
|
liugang
|
d04fc1fe4a
|
* Move the screen module to open source.
|
2022-12-23 14:39:01 +08:00 |
|