 孙广明
|
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 |
|
|
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 |
|
|
孙广明
|
a46c17c8d0
|
Merge branch 'sprint/184_hufangzhou_19675' into 'master'
* Fix bug #19675.
See merge request easycorp/zentaopms!1822
|
2022-02-16 08:47:53 +00:00 |
|
|
hufangzhou
|
2edcb893be
|
* Adjust the code.
|
2022-02-16 16:47:02 +08:00 |
|
|
孙广明
|
c58a31c9fc
|
Merge branch 'sprint/leiyong_fix_bug' into 'master'
* Get top departments based on app visibility.
See merge request easycorp/zentaopms!1823
|
2022-02-16 08:40:17 +00:00 |
|
|
leiyong
|
70dbea3d2f
|
* Get top departments based on app visibility.
|
2022-02-16 16:32:19 +08:00 |
|
|
hufangzhou
|
d355e858b4
|
* Fix bug #19675.
|
2022-02-16 16:26:13 +08:00 |
|
|
孙广明
|
d4b0db46cf
|
Merge branch 'sprint/184_liumengyi_fixbug' into 'master'
* Fix bug #19308.
See merge request easycorp/zentaopms!1821
|
2022-02-16 07:27:57 +00: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 |
|
|
孙广明
|
7f50a2cbd9
|
* Fix code error.
|
2022-02-16 11:26:40 +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 |
|
|
孙广明
|
3332272ff9
|
Merge branch 'sprint/184_hufangzhou_19558' into 'master'
* Fix bug #19558.
See merge request easycorp/zentaopms!1815
|
2022-02-16 00:34:32 +00: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 |
|
|
孙广明
|
13614b0772
|
* Fix var name.
|
2022-02-15 17:06:11 +08:00 |
|
|
李玉春
|
0c55a20565
|
Merge branch 'devops_cyy_49125' into 'master'
* Modify page style.
See merge request easycorp/zentaopms!1812
|
2022-02-15 07:31:21 +00:00 |
|
|
caoyanyi
|
5c9b06bdfb
|
* Modify page style.
|
2022-02-15 15:27:16 +08:00 |
|
|
孙广明
|
57b2229ea3
|
Merge branch 'sprint/184_tianshujie_file' into 'master'
* Modify the path to get the file.
See merge request easycorp/zentaopms!1811
|
2022-02-15 07:19:01 +00:00 |
|
|
tianshujie
|
c44dfa1788
|
* Modify the path to get the file.
|
2022-02-15 15:16:14 +08:00 |
|