Commit Graph
1202 Commits
Author SHA1 Message Date
李玉春 6729298c92 Merge branch 'bugfix_cyy' into 'master'
Modify app language and API

See merge request easycorp/zentaopms!2488
2022-03-24 00:29:54 +00:00
caoyanyi b7b3a26e33 * Add app language. 2022-03-23 16:26:51 +08:00
王怡栋 fb917029b7 Merge branch 'fixbug' into 'master'
* Fix bug #21032.

See merge request easycorp/zentaopms!2478
2022-03-23 08:17:24 +00:00
tanghucheng c9fc9cfc65 * Fix bug #21032. 2022-03-23 14:28:33 +08:00
孙广明 0c79df3fb6 Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug

See merge request easycorp/zentaopms!2461
2022-03-23 00:53:36 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
王怡栋 7e0a6e8b11 * fix bug #19267. 2022-03-17 09:41:28 +08:00
王怡栋 69d7749489 * code for welcome block. 2022-03-16 16:35:33 +08:00
tianshujie 305ec3c69a * Modify code location. 2022-03-15 09:57:56 +08:00
tianshujie ffe15a3b23 * Fix bug #20751. 2022-03-15 09:54:53 +08:00
tianshujie ff24c06fc9 * Modify the code judgment logic. 2022-03-15 09:41:54 +08:00
tianshujie 91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
sunjun 395314f726 fixbug #50432 2022-03-14 11:31:09 +08:00
sunjun d4b8dfef02 fix bug #50432 2022-03-11 15:09:59 +08:00
sunjun 0b0a1011e9 fix bug #50432 2022-03-11 15:02:14 +08:00
sunjun bbd2ccff01 bug优化 2022-03-11 14:25:56 +08:00
sunjun 00aaefa61c 地盘里看板项目icon显示看板 2022-03-11 13:35:03 +08:00
王怡栋 1e7e9f961b * fix bug #20675. 2022-03-11 13:16:27 +08:00
tianshujie a1bd5d6d48 * Finish task #50329. 2022-03-07 14:29:01 +08:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan a2a4ec8d6f *Translate. 2022-02-25 11:16:41 +08:00
tianshujie 9f76842034 * Modify the code format. 2022-02-24 17:03:19 +08:00
tianshujie 34752d2c04 * Modify version judgment logic. 2022-02-24 16:49:56 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
tanghucheng 6b2bc49830 * Finish task #49409. 2022-02-22 16:59:09 +08:00
zhujinyong 1f8e1b0021 * Fix return print() -> return. 2022-02-22 09:35:25 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
王怡栋 3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +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
hufangzhou 2edcb893be * Adjust the code. 2022-02-16 16:47:02 +08:00
周旭东 27fcc308e1 Update sprintblock.html.php 2022-02-15 05:14:07 +00:00
zhouxudong a0aa2260d6 *Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555. 2022-02-15 11:19:34 +08:00
zhouxudong c7211f7164 *Fix bug #13636. 2022-02-14 16:50:33 +08:00
tanghucheng 41e0b66473 * finish task #49013. 2022-02-14 13:17:56 +08:00
zhouxudong e02d0152fe *Fix bug #13636. 2022-02-07 14:30:21 +08:00
tanghucheng 02281ff345 * Adjust for index block. 2022-01-26 17:22:36 +08:00
tanghucheng 2e2dc5581b * fix project index and global create card. 2022-01-24 16:48:06 +08:00
孙广明 a2477a59bf * Delete unused lang. 2022-01-21 14:33:58 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
liyuchun 5724bd4fc5 * Fix bug #18435,#18437. 2022-01-17 13:37:11 +08:00
朱金勇 dce7ddc20c Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu

See merge request easycorp/zentaopms!1426
2022-01-17 02:35:38 +00:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
liumengyi 582ddf2a06 * Fix bug #18436.Finish task #47361. 2022-01-14 10:14:40 +08:00
xieqiyu d4365afb0b * Add project test case. 2022-01-14 08:32:53 +08:00
zhouxudong 919a355220 *Code for language. 2022-01-12 11:38:39 +08:00
zhouxudong 96fdc4465a *Fix bug #17388. 2022-01-12 09:10:47 +08:00
zhouxudong 0f958a378d *Fix bug #17388. 2022-01-12 09:07:01 +08:00