 liumengyi
|
4976531b9b
|
* [test] modify unit test.
|
2024-07-17 14:38:50 +08:00 |
|
|
王怡栋
|
187d42e427
|
Merge branch 'ztflow-sunguangming-main#sunguangming' of zentao/zentaopms (#576)
|
2024-06-24 16:19:10 +08:00 |
|
|
sunhao
|
3d13bac8df
|
* [ui] fix loading indicator in login page.
|
2024-06-24 16:17:45 +08:00 |
|
|
sunguangming
|
f83f00f61f
|
Merge branch 'main' into feature/epic
|
2024-06-20 07:04:51 +00:00 |
|
|
wangyuting
|
8786e95345
|
* [bug#51384,done,0.2h,0h] Fix login redirection link error.
|
2024-06-19 14:17:18 +08:00 |
|
|
liumengyi
|
10b601fee3
|
* [bug#51376,done,0.2h] add load.
|
2024-06-19 10:14:53 +08:00 |
|
|
liumengyi
|
2aba82e635
|
* [bug#51371,done,0.2h] set key of dao::error.
|
2024-06-19 10:14:53 +08:00 |
|
|
sunguangming
|
c459e08f1f
|
Merge branch 'master' into story
|
2024-05-29 15:44:14 +08:00 |
|
|
hufangzhou
|
34063ce1a5
|
* [task#119064, done, 1.5h, 0h] If it's a one-click installation package, the forgotten password path prompt shows two levels deep.
|
2024-05-29 09:50:07 +08:00 |
|
|
sunguangming
|
24d3d7fb0a
|
Merge branch 'master' into story
|
2024-05-22 11:27:49 +08:00 |
|
|
tianshujie
|
37ba91033b
|
- Remove unused code.
|
2024-05-20 10:55:59 +08:00 |
|
|
tianshujie
|
08d2d86f85
|
- Remove unused code.
|
2024-05-20 10:52:43 +08:00 |
|
|
tianshujie
|
cb1a04505d
|
* Fix bug #49799.
|
2024-05-20 10:49:31 +08:00 |
|
|
sunguangming
|
1cfbf7d74b
|
Merge branch 'master' into story
|
2024-05-15 15:04:13 +08:00 |
|
|
liugang
|
fe0d8a2ecf
|
Revert "* userModel: fix sql error data too long to be truncated."
This reverts commit 68383ef62c.
|
2024-05-10 17:25:22 +08:00 |
|
|
sunguangming
|
28b2b78698
|
Merge branch 'master' into story
|
2024-05-09 15:04:07 +08:00 |
|
|
liugang
|
68383ef62c
|
* userModel: fix sql error data too long to be truncated.
|
2024-05-07 10:42:56 +08:00 |
|
|
caoyanyi
|
acc26ba24d
|
Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
# db/update20.0.beta2.sql
# lib/zin/func.php
# lib/zin/wg/fileselector/v1.php
# lib/zin/wg/upload/v1.php
# module/action/model.php
# module/backup/js/index.ui.js
# module/block/lang/vi.php
# module/block/ui/recentprojectblock.html.php
# module/block/zen.php
# module/common/lang/vi.php
# module/custom/lang/vi.php
# module/execution/js/kanban.ui.js
# module/execution/ui/story.html.php
# module/kanban/js/view.ui.js
# module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
# module/metric/test/calc/project/rate/cv_in_waterfall.php
# module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
# module/mr/control.php
# module/mr/ui/browsebyexecution.html.php
# module/product/zen.php
# module/programplan/zen.php
# module/project/model.php
# module/repo/lang/de.php
# module/repo/lang/en.php
# module/repo/lang/fr.php
# module/repo/lang/zh-cn.php
# module/space/ui/createapplication.html.php
# module/testcase/ui/view.html.php
# module/upgrade/model.php
# www/js/zui3/zen-editor/p-0aaccc7e.js
# www/js/zui3/zen-editor/p-276dd30f.js
# www/js/zui3/zen-editor/p-2b13cc9a.js
# www/js/zui3/zen-editor/p-38d18c5d.js
# www/js/zui3/zen-editor/p-3f6cad83.js
# www/js/zui3/zen-editor/p-51e3a048.js
# www/js/zui3/zen-editor/p-617d463f.js
# www/js/zui3/zen-editor/p-62c0132e.js
# www/js/zui3/zen-editor/p-6d22490c.js
# www/js/zui3/zen-editor/p-a563f50b.js
# www/js/zui3/zen-editor/p-bf31230c.js
# www/js/zui3/zen-editor/p-c6c95773.js
# www/js/zui3/zen-editor/p-d83dd3f0.js
# www/js/zui3/zen-editor/p-d8bedd14.js
# www/js/zui3/zen-editor/p-eaaa4129.js
# www/js/zui3/zen-editor/zen-editor.esm.js
# www/js/zui3/zui.zentao.css
# www/js/zui3/zui.zentao.js
|
2024-05-06 09:17:49 +08:00 |
|
|
王怡栋
|
28b7d5996c
|
Fix bug #48743.
|
2024-04-30 13:44:58 +08:00 |
|
|
liugang
|
1c13a31e99
|
* Rename $lang->colon to $lang->hyphen.
|
2024-04-28 14:35:26 +08:00 |
|
|
sunguangming
|
fd524037b3
|
* Fix bug #47956.
|
2024-04-25 11:34:39 +08:00 |
|
|
tianshujie
|
bced2b76b4
|
Merge remote-tracking branch 'origin/release-20.0'
|
2024-04-23 17:12:24 +08:00 |
|
|
liyang
|
354c300c86
|
* Modify unit test directory structure and data generation method.
|
2024-04-22 14:25:50 +08:00 |
|
|
tianshujie
|
b54e02d27e
|
* Fix bug #48142.
|
2024-04-22 10:40:20 +08:00 |
|
|
caoyanyi
|
618cb5fa14
|
Merge remote-tracking branch 'origin/release-20.0'
|
2024-04-18 10:41:42 +08:00 |
|
|
tanghucheng
|
af7cd56f40
|
* Fix bug #116457.
|
2024-04-17 14:35:29 +08:00 |
|
|
liumengyi
|
c1ef0ed386
|
* Modify style of user batch form.
|
2024-04-17 09:39:33 +08:00 |
|
|
dingguodong
|
926744bf4f
|
- Remove vi.php.
|
2024-04-17 09:11:48 +08:00 |
|
|
dingyongliang
|
aeba2f3c8e
|
* hide re-login btn in client.
|
2024-04-10 16:07:37 +08:00 |
|
|
liugang
|
49061bb7f1
|
* Remove the sessionVar parameter to avoid session injection.
|
2024-04-08 14:57:15 +08:00 |
|
|
tianshujie
|
dd81050533
|
* Fix bug #46579.
|
2024-04-03 16:33:05 +08:00 |
|
|
wangyuting
|
150af53038
|
* Fix workflow extra batch form bug.
|
2024-03-27 09:23:13 +08:00 |
|
|
tianshujie
|
05a947f244
|
* Change the data-app for jump link.
|
2024-03-26 09:43:55 +08:00 |
|
|
liumengyi
|
f03eb244ff
|
* Fix bug of undefined variable.
|
2024-03-21 16:23:51 +08:00 |
|
|
caoyanyi
|
bd38379f8c
|
Merge branch 'release-20.0.stable'
|
2024-03-15 21:14:04 +08:00 |
|
|
tianshujie
|
2c47eb1939
|
* Fix bug #47035.
|
2024-03-15 16:54:21 +08:00 |
|
|
sunhao
|
6f11a685b9
|
* user: fix property undefined error.
|
2024-03-15 15:33:35 +08:00 |
|
|
caoyanyi
|
1de446f6ce
|
* Merge for release branch.
|
2024-03-15 14:59:57 +08:00 |
|
|
liumengyi
|
dbd4fe3ae8
|
* Fix bug #45859, set priList and severityList for bug in dtable.
|
2024-03-13 16:20:28 +08:00 |
|
|
liumengyi
|
9508b00996
|
- Remove render in the user::batchCreate.
|
2024-03-11 15:26:15 +08:00 |
|
|
caoyanyi
|
0eff74524b
|
Merge branch 'release-20.0.stable'
|
2024-03-07 14:56:52 +08:00 |
|
|
liumengyi
|
d35ce637eb
|
* Modify the style to my::profile.
|
2024-03-06 15:49:32 +08:00 |
|
|
liumengyi
|
4b027eab2e
|
* Modify style of user::profile.
|
2024-03-06 15:31:06 +08:00 |
|
|
liumengyi
|
92368620da
|
* Fix bug #46618.
|
2024-03-06 15:29:26 +08:00 |
|
|
caoyanyi
|
e5c314ef8d
|
* Fix bug #46382, adjust save template error.
|
2024-03-06 14:42:10 +08:00 |
|
|
tianshujie
|
c65fb5d5e7
|
* Fix bug #46597.
|
2024-03-06 14:42:08 +08:00 |
|
|
wangyuting
|
5a45f4d024
|
* Add ajaxprinttemplates function.
|
2024-03-06 14:37:52 +08:00 |
|
|
caoyanyi
|
c09751157d
|
* Fix bug #46382, adjust save template error.
|
2024-03-06 14:31:32 +08:00 |
|
|
tianshujie
|
cfe7491d83
|
* Fix bug #46597.
|
2024-03-05 15:48:28 +08:00 |
|
|
liumengyi
|
336db050a9
|
* Fix bug #46578, use config->user->list->custom to set custom columns in the batch ui.
|
2024-03-05 15:25:15 +08:00 |
|