 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 |
|
|
李玉春
|
2ee8b7ccbc
|
Merge branch 'devops_cyy_bug' into 'master'
修复未增加权限功能
See merge request easycorp/zentaopms!1884
|
2022-02-22 07:51:13 +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 |
|
|
李玉春
|
7153e8f629
|
Merge branch 'devops_cyy' into 'master'
修改代码对比默认值
See merge request easycorp/zentaopms!1875
|
2022-02-22 05:49:38 +00:00 |
|
|
caoyanyi
|
e7ec73e841
|
* Modify diff version.
|
2022-02-22 10:57:01 +08:00 |
|
|
孙广明
|
80b69c57b9
|
Merge branch 'devops22_liyuchun' into 'master'
* Fix error.
See merge request easycorp/zentaopms!1872
|
2022-02-22 01:24:28 +00:00 |
|
|
liyuchun
|
b8f8447653
|
* Fix error.
|
2022-02-22 09:14:59 +08:00 |
|
|
李玉春
|
af67d79792
|
Merge branch 'devops22_zenggang' into 'master'
任务49221
See merge request easycorp/zentaopms!1867
|
2022-02-21 09:15:26 +00:00 |
|
|
李玉春
|
1d1ff7cd06
|
Merge branch 'sprint/scx_editlang' into 'master'
*Edit lang.
See merge request easycorp/zentaopms!1870
|
2022-02-21 09:09:39 +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 |
|
|
李玉春
|
a3f127eaea
|
Merge branch 'devops_cyy_version' into 'master'
修改分支版本判断
See merge request easycorp/zentaopms!1864
|
2022-02-21 07:30:50 +00:00 |
|
|
liyuchun
|
92294da65b
|
* Finish task #49226.
|
2022-02-21 15:27:51 +08:00 |
|
|
caoyanyi
|
ab72f3d32d
|
* Modify version check.
|
2022-02-21 14:51:30 +08:00 |
|
|
李玉春
|
cfddb1beb4
|
Merge branch 'devops_cyy_lang' into 'master'
新增gitlab合并状态语言项
See merge request easycorp/zentaopms!1859
|
2022-02-21 06:05:37 +00:00 |
|
|
caoyanyi
|
2f6f1aaf89
|
* Modify duplicate files.
|
2022-02-21 14:01:21 +08:00 |
|
|
caoyanyi
|
8baa82ed3d
|
* Modify version check.
|
2022-02-21 13:11:00 +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
zentaopms_16.4
|
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 |
|
|
孙广明
|
ab5a0b63a8
|
Merge branch 'sprint/scx_deleteLang' into 'master'
*Delete and Add langs.
See merge request easycorp/zentaopms!1852
|
2022-02-18 07:39:24 +00:00 |
|
|
songchenxuan
|
73faff3b7d
|
*Delete and Add langs.
|
2022-02-18 15:33:58 +08:00 |
|
|
李玉春
|
f1d25eefad
|
Merge branch 'devops22_zenggang' into 'master'
修复diff为空时报错提示
See merge request easycorp/zentaopms!1848
|
2022-02-18 06:43:58 +00:00 |
|
|
孙广明
|
5476f33bc2
|
Merge branch 'sprint/scx_deletelang' into 'master'
*Delete lang.
See merge request easycorp/zentaopms!1850
|
2022-02-18 06:25:08 +00:00 |
|
|
songchenxuan
|
490c5e397e
|
*Delete lang.
|
2022-02-18 14:17:48 +08:00 |
|
|
zenggang
|
82c5c2472f
|
* Fix diff empty error
|
2022-02-18 03:26:13 +00:00 |
|
|
李玉春
|
ef212d58f7
|
Merge branch 'sprint/sunhao/new_icons' into 'master'
* add new icons: "redo", "undo", "info-sign", update icons: "back".
See merge request easycorp/zentaopms!1846
|
2022-02-18 02:06:45 +00:00 |
|
|
Hao Sun
|
45b38cbe0c
|
* add new icons: "redo", "undo", "info-sign", update icons: "back".
|
2022-02-18 09:37:45 +08:00 |
|
|
王怡栋
|
e92c59a278
|
Merge branch 'sgm_fixbug' into 'master'
* Fix export story bug.
See merge request easycorp/zentaopms!1837
|
2022-02-17 06:43:18 +00:00 |
|
|
孙广明
|
e8939e9826
|
* Fix export story bug.
|
2022-02-17 14:41:09 +08:00 |
|
|
王怡栋
|
58793d49f4
|
Merge branch 'sgm_jira' into 'master'
* Fix details.
See merge request easycorp/zentaopms!1834
|
2022-02-17 05:35:29 +00:00 |
|
|
孙广明
|
be4313a9df
|
* Fix details.
|
2022-02-17 13:27:37 +08:00 |
|
|
王怡栋
|
5893feb78b
|
Merge branch 'sgm_jira' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1827
|
2022-02-17 01:56:58 +00:00 |
|
|
孙广明
|
e822c5a9a4
|
* Fix bug.
|
2022-02-17 09:55:06 +08:00 |
|
|
孙广明
|
3a7b45bf42
|
Merge branch 'sprint/leiyong_fix_bug' into 'master'
* Revert to the previous version.
See merge request easycorp/zentaopms!1826
|
2022-02-17 00:51:46 +00:00 |
|
|
孙广明
|
f7ca10908a
|
Merge branch 'sprint/184_hufangzhou_makefile' into 'master'
* Add the course directory.
See merge request easycorp/zentaopms!1825
|
2022-02-17 00:48:03 +00:00 |
|
|
hufangzhou
|
78126116fb
|
* Add the course directory.
|
2022-02-17 08:47:16 +08:00 |
|
|
leiyong
|
a2977f51ce
|
* Revert to the previous version.
|
2022-02-17 08:47:01 +08:00 |
|
|
李玉春
|
6e2875a092
|
Merge branch 'sgm_jira' into 'master'
* Fix details.
See merge request easycorp/zentaopms!1824
|
2022-02-17 00:29:51 +00:00 |
|
|
孙广明
|
27f4d92a50
|
* Fix details.
|
2022-02-17 08:15:40 +08:00 |
|