|
|
121e04f751
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-21 16:59:55 +08:00 |
|
|
|
246b484ad8
|
fix merge from develop
|
2022-04-18 14:14:48 +08:00 |
|
|
|
fc3cf01d3f
|
add: get user image action
|
2022-04-18 13:49:08 +08:00 |
|
|
|
345fd31834
|
Merge branch 'develop' into standalone_develop
|
2022-04-18 10:52:59 +08:00 |
|
|
|
8f5bb0e2d9
|
fix: organization gitea_token read by associations
|
2022-04-18 10:52:48 +08:00 |
|
|
|
7aea481ccf
|
add: glcc_apply_infomations admin navbar
|
2022-04-18 10:24:54 +08:00 |
|
|
|
37317f82bf
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 16:09:08 +08:00 |
|
|
|
2dfd69ae21
|
fix: response data result
|
2022-04-11 16:08:50 +08:00 |
|
|
|
a132154136
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 15:48:54 +08:00 |
|
|
|
720c073f32
|
fix
|
2022-04-11 15:48:47 +08:00 |
|
|
|
185cb308ac
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 15:30:44 +08:00 |
|
|
|
0076468a15
|
fix: trace client request data
|
2022-04-11 15:30:28 +08:00 |
|
|
|
910ae48556
|
fix: exception to ex
|
2022-04-11 10:50:18 +08:00 |
|
xiaoxiaoqiong
|
6e86f9d9f3
|
竞赛配置子赛项
|
2022-04-08 23:07:23 +08:00 |
|
xiaoxiaoqiong
|
e97e7aa550
|
竞赛配置子赛项
|
2022-04-08 21:59:35 +08:00 |
|
xiaoxiaoqiong
|
ffb3b26d3c
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 18:51:16 +08:00 |
|
xiaoxiaoqiong
|
6d280ed8f2
|
竞赛配置子赛项
|
2022-04-08 18:51:01 +08:00 |
|
xiaoxiaoqiong
|
47b3816e4f
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 18:46:46 +08:00 |
|
xiaoxiaoqiong
|
3f85f88c92
|
竞赛配置子赛项
|
2022-04-08 18:46:14 +08:00 |
|
xiaoxiaoqiong
|
1477811782
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 18:41:17 +08:00 |
|
xiaoxiaoqiong
|
f60cd409b6
|
竞赛配置子赛项
|
2022-04-08 18:40:52 +08:00 |
|
xiaoxiaoqiong
|
04b2a9b358
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 17:45:38 +08:00 |
|
xiaoxiaoqiong
|
9d46f2743d
|
竞赛配置子赛项
|
2022-04-08 17:45:15 +08:00 |
|
xiaoxiaoqiong
|
000a4f8019
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 17:39:47 +08:00 |
|
xiaoxiaoqiong
|
aaf2b43986
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-04-08 17:38:59 +08:00 |
|
xiaoxiaoqiong
|
75a9a65b9b
|
竞赛配置子赛项
|
2022-04-08 17:38:26 +08:00 |
|
|
|
49afc0e20a
|
Merge branch 'develop' into pre_trustie_server
|
2022-04-08 16:39:19 +08:00 |
|
|
|
17f2436118
|
Merge branch 'develop' into standalone_develop
|
2022-04-08 15:03:52 +08:00 |
|
|
|
eac7331070
|
fix: settings need prefix
|
2022-04-08 15:03:40 +08:00 |
|
|
|
2243697184
|
Merge branch 'develop' into standalone_develop
|
2022-04-08 14:53:06 +08:00 |
|
|
|
551f333261
|
fix
|
2022-04-08 14:52:56 +08:00 |
|
|
|
18cf1d3ecb
|
Merge branch 'glcc_news_develop' into standalone_develop
|
2022-04-08 13:23:49 +08:00 |
|
|
|
7c1160b247
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-08 11:59:51 +08:00 |
|
|
|
4cefaa7e92
|
Merge branch 'develop' into standalone_develop
|
2022-04-08 11:59:25 +08:00 |
|
|
|
dec264d169
|
fix: sync user pwd
|
2022-04-07 16:28:40 +08:00 |
|
|
|
8aa935ad5c
|
add: glcc news management and api data
|
2022-04-07 16:13:32 +08:00 |
|
xiaoxiaoqiong
|
f082819496
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-06 20:32:31 +08:00 |
|
xiaoxiaoqiong
|
4bdff8313a
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-04-06 20:32:06 +08:00 |
|
xiaoxiaoqiong
|
c4f91fb054
|
搜索用户增加email和单位
|
2022-04-06 20:32:02 +08:00 |
|
|
|
a33be8850e
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-06 17:05:05 +08:00 |
|
|
|
fde01e62ef
|
Merge branch 'develop' into standalone_develop
|
2022-04-06 17:04:52 +08:00 |
|
|
|
7055974443
|
fix
|
2022-04-06 17:04:31 +08:00 |
|
xiaoxiaoqiong
|
e0022647ed
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-04-06 14:35:11 +08:00 |
|
xiaoxiaoqiong
|
1f6ac05bad
|
允许非登录搜索用户
|
2022-04-06 14:33:47 +08:00 |
|
|
|
70dd2768e5
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-03-31 18:30:00 +08:00 |
|
|
|
c5dd099169
|
Merge branch 'develop' into standalone_develop
|
2022-03-31 16:18:25 +08:00 |
|
|
|
3536918938
|
fix
|
2022-03-31 16:18:16 +08:00 |
|
|
|
d56da6d020
|
Merge branch 'develop' into standalone_develop
|
2022-03-31 16:08:43 +08:00 |
|
|
|
56278b84f2
|
Merge pull request '导航增加动态用户数据获取' (#3) from hh_develop_navbar into develop
|
2022-03-31 16:08:36 +08:00 |
|
|
|
882a50cf56
|
add: setting navbar varible
|
2022-03-31 16:04:48 +08:00 |
|
