Commit Graph
572 Commits
Author SHA1 Message Date
azalea 1759c94ca4 * [uitest] Init company data. 2024-10-17 15:13:07 +08:00
azalea 19e5be8087 * [uitest] Init company data. 2024-10-17 15:13:07 +08:00
azalea ece76b95d5 * [uitest] Init company data. 2024-10-17 15:13:07 +08:00
azalea 276c6df53e * [uitest] Init company data. 2024-10-17 15:13:07 +08:00
azalea 9c659a3b48 * [uitest] Adjust comment. 2024-10-17 15:13:07 +08:00
azalea c1d274f22d * [uitest] Adjust editcompany for edit company information. 2024-10-10 14:44:51 +08:00
azalea 7c4a1590e8 * [uitest] Add editcompany for edit company information. 2024-10-10 14:44:51 +08:00
azalea f869bec5a4 * [uitest] Ajuest editcompany testcase. 2024-10-10 14:44:51 +08:00
azalea 1982fefc86 * [uitest] Add editcompany testcase. 2024-10-10 14:44:51 +08:00
azalea 83cf6b8c6f * [uitest] Add editcompany page for edit company information. 2024-10-10 14:44:51 +08:00
tianshujie 73732758c2 * [bug#52541,done,0.5h] fix link param and check lock user judge. 2024-07-19 10:57:32 +08:00
wangyuting 45fc230a78 * [bug#51603,done,0.1h,0h] Fix usermap is not defined. 2024-06-26 09:38:18 +08:00
liumengyi 82f59a85bf * Fix bug #49140, add user::importLDAP to setting items. 2024-05-17 11:06:06 +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
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
liyang 354c300c86 * Modify unit test directory structure and data generation method. 2024-04-22 14:25:50 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
wangyuting 1a2f5802ed * Add build view productID. 2024-04-10 14:31:33 +08:00
王怡栋 c81d981591 * Fix bug #46932. 2024-03-20 08:35:41 +08:00
caoyanyi 1de446f6ce * Merge for release branch. 2024-03-15 14:59:57 +08:00
liumengyi d3292fb5e3 * Save user query session, it's used in user::export. 2024-03-01 15:20:40 +08:00
liumengyi 7d3ba58030 * Fix bug #44694, modify background color of dynamic. 2024-02-21 16:09:54 +08:00
daitingting 390afe0458 * Fix bug #43327. 2024-01-11 08:09:20 +00:00
liumengyi 59b15b763a * Fix bug #43656. 2024-01-10 16:46:48 +08:00
liumengyi f7a252277b * Fix bug #43244. 2024-01-09 13:53:17 +08:00
sunhao 073b61a7e0 * company: fix style of dynamic list. 2023-12-27 11:49:08 +08:00
sunhao ae6695ee7a * company: format code. 2023-12-26 15:58:27 +08:00
wangxuepeng c1394089da * Remove unuseless code. 2023-12-14 10:54:51 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
liugang 22bae254a4 * Move the getVisionList method from user/model.php to helper.class.php and rename it to getVisisons. 2023-12-04 16:15:42 +08:00
sunhao a829c4f0bb * zin: refactor --color-slate-* to --color-gray-*. 2023-11-27 14:27:42 +08:00
liugang 34e6c06707 * companyConfig: modify configuration items of user action list. 2023-11-27 10:43:25 +08:00
liugang 49ef12f750 * companyUI: pass the $deptID and $type parameters when create link of batch edit users. 2023-11-27 10:06:33 +08:00
liugang 494a11dd23 * company: post and load page with no-javascript. 2023-11-25 15:41:58 +08:00
liugang 7ab7b44365 * company: pass the $type parameter when create user. 2023-11-25 14:08:11 +08:00
wangxuepeng 16dd6387ff * Fixed the error of companyModel::getUsers. 2023-11-23 16:53:26 +08:00
wangxuepeng d454650289 * Optimize dynamic page opening speed. 2023-11-23 16:27:53 +08:00
tianshujie 72b7e178bf * Fix bug #40881. 2023-11-23 15:42:46 +08:00
wangyuting 40d8a4cbbe * Optimize dept model. 2023-11-23 13:54:31 +08:00
wangxuepeng caa5156900 * Fixed the unit test of companyModel::getUsers. 2023-11-23 13:29:07 +08:00
wangxuepeng 202d06c583 - Remove the useless unit test. 2023-11-23 13:29:07 +08:00
wangxuepeng e8accc04fc * Code formatter for company. 2023-11-23 11:07:04 +08:00
wangxuepeng ae3fa9da91 * Refactor custom::buildSearchForm. 2023-11-23 10:56:03 +08:00
wangxuepeng 28ec57c119 * Remove companyModel::getCompanyUserPairs. 2023-11-23 10:46:24 +08:00
wangxuepeng 6b4f1acb7d * Refactor companyModel::getByID. 2023-11-23 10:36:14 +08:00
wangxuepeng fe31fc31e5 * Refactor companyModel::getFirst. 2023-11-23 10:31:03 +08:00
wangxuepeng 668d08251e - Remove companyModel::getList. 2023-11-23 10:27:28 +08:00
wangxuepeng 6f86989f10 - Delete companyModel::setMenu. 2023-11-23 10:15:56 +08:00
wangxuepeng 50497766b9 * Refactor company::ajaxGetOutsideCompany. 2023-11-22 17:20:49 +08:00