Commit Graph
28922 Commits
Author SHA1 Message Date
caoyanyi 8d8b842ab6 * Add default value. 2022-02-23 15:00:17 +08:00
caoyanyi 61b82356ae * Modify post param. 2022-02-23 13:09:40 +08:00
孙广明 6d0529f2ad Merge branch 'devops22_liyuchun' into 'master'
* Fix bug #19866.

See merge request easycorp/zentaopms!1902
2022-02-23 02:49:57 +00:00
liyuchun 0e4d44edf7 * Fix bug #19866. 2022-02-23 09:57:23 +08:00
孙广明 efa2d927ed Merge branch 'devops22_liyuchun' into 'master'
* Fix bug #19869,19876.

See merge request easycorp/zentaopms!1890
2022-02-23 00:14:30 +00:00
李玉春 c061644661 Merge branch 'sprint/scx_checkapilang' into 'master'
*Check api lang.

See merge request easycorp/zentaopms!1879
2022-02-22 09:23:22 +00:00
liyuchun 89c52df9b7 * Fix bug #19869,19876. 2022-02-22 17:21:35 +08:00
李玉春 462451b8fb Merge branch 'devops22_19819' into 'master'
修复bug 19819

See merge request easycorp/zentaopms!1883
2022-02-22 08:12:24 +00:00
zenggang 438641dee0 * Adjust code 2022-02-22 08:03:31 +00:00
孙广明 812a91a689 Merge branch 'sprint/scx_international_privilage' into 'master'
*Privilage css.

See merge request easycorp/zentaopms!1881
2022-02-22 07:55:17 +00:00
孙广明 928e2aa3ed Merge branch 'devops22_liyuchun' into 'master'
* Fix bug #19853.

See merge request easycorp/zentaopms!1885
2022-02-22 07:54:03 +00:00
liyuchun 0947d84471 * Fix bug #19853. 2022-02-22 15:49:56 +08:00
caoyanyi 04f2ae78e2 * Add route auth check. 2022-02-22 15:44:26 +08:00
zenggang 894689a7e3 * Fix bug#19819 2022-02-22 07:31:02 +00:00
songchenxuan f8bd597b39 *Privilage css. 2022-02-22 14:37:38 +08:00
songchenxuan 50d78a0fa0 *Check api lang. 2022-02-22 14:20:41 +08:00
caoyanyi e7ec73e841 * Modify diff version. 2022-02-22 10:57:01 +08:00
李玉春 af67d79792 Merge branch 'devops22_zenggang' into 'master'
任务49221

See merge request easycorp/zentaopms!1867
2022-02-21 09:15:26 +00:00
songchenxuan af5e92b4eb *Edit lang. 2022-02-21 17:04:03 +08:00
zenggang 1c503bcf58 * Finish task#49221 2022-02-21 08:33:58 +00:00
王怡栋 07f8b9c797 Merge branch 'devops22_liyuchun' into 'master'
Finish task #49226.

See merge request easycorp/zentaopms!1866
2022-02-21 08:08:32 +00:00
liyuchun 92294da65b * Finish task #49226. 2022-02-21 15:27:51 +08:00
caoyanyi 9392f31b0a * Add language for gitlab merge status. 2022-02-21 09:47:23 +08:00
孙广明 562b983c69 Merge branch 'sprint/liumengyi_modify' into 'master'
* Modify getUserSuspendTasks.

See merge request easycorp/zentaopms!1854
2022-02-18 07:56:40 +00:00
孙广明 3f41b44315 Merge branch 'tianshujie_course' into 'master'
* Fix playback video issue.

See merge request easycorp/zentaopms!1853
2022-02-18 07:52:37 +00:00
liumengyi fe8f6bb4dd * Modify getUserSuspendTasks. 2022-02-18 15:52:25 +08:00
tianshujie 201aaf76c2 * Fix playback video issue. 2022-02-18 15:48:37 +08:00
songchenxuan 73faff3b7d *Delete and Add langs. 2022-02-18 15:33:58 +08:00
songchenxuan 490c5e397e *Delete lang. 2022-02-18 14:17:48 +08:00
孙广明 e8939e9826 * Fix export story bug. 2022-02-17 14:41:09 +08:00
孙广明 be4313a9df * Fix details. 2022-02-17 13:27:37 +08:00
孙广明 e822c5a9a4 * Fix bug. 2022-02-17 09:55:06 +08:00
孙广明 27f4d92a50 * Fix details. 2022-02-17 08:15:40 +08:00
hufangzhou 2edcb893be * Adjust the code. 2022-02-16 16:47:02 +08:00
hufangzhou d355e858b4 * Fix bug #19675. 2022-02-16 16:26:13 +08:00
liumengyi 5e645da507 * Fix bug #19308. 2022-02-16 14:55:21 +08:00
孙广明 e9a29f39fc * Fix details. 2022-02-16 13:05:56 +08:00
孙广明 b963b38547 * Fix details. 2022-02-16 10:09:34 +08:00
孙广明 127da2bfc6 * Add finished notice. 2022-02-16 10:04:55 +08:00
孙广明 7cfb1c2e9c Merge branch 'tianshujie_19306' into 'master'
* Fix bug #19306.

See merge request easycorp/zentaopms!1819
2022-02-16 01:58:28 +00:00
tianshujie e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
朱金勇 c9b8ad34a6 Merge branch 'sprint/scx_editorlang' into 'master'
*Translate lang.

See merge request easycorp/zentaopms!1818
2022-02-16 01:42:30 +00:00
孙广明 b44ac97ace Merge branch 'sprint/184_hufangzhou_19649' into 'master'
* Fix bug #19649.

See merge request easycorp/zentaopms!1817
2022-02-16 01:41:32 +00:00
songchenxuan b7eacca5eb *Translate lang. 2022-02-16 09:37:37 +08:00
孙广明 abb38d4709 * Fix details. 2022-02-16 09:36:21 +08:00
hufangzhou f9cc2702f9 * Fix bug #19649. 2022-02-16 09:24:11 +08:00
hufangzhou 92b25b7d4e * Adjust the directory path to full path. 2022-02-15 17:26:04 +08:00
hufangzhou a67e9ce403 * Adjust the file path to full path. 2022-02-15 17:21:27 +08:00
hufangzhou f0ba4e7987 * Fix bug #19558. 2022-02-15 17:12:01 +08:00
王怡栋 4987c816df Merge branch 'sgm_jira' into 'master'
* Fix var name.

See merge request easycorp/zentaopms!1814
2022-02-15 09:10:49 +00:00