forgeplus

Commit Graph

Select branches

Hide Pull Requests

bankmulan

dev_chain

dev_change_route

dev_devops

dev_edu_local

dev_educoder

dev_educoder_sync

dev_forum

dev_jk_server

dev_military

dev_military_import

dev_military_license

dev_military_server

dev_military_server_local

dev_ms_military

dev_notification_v2

dev_pull_request

dev_sync_project_educoder

dev_trustie

dev_trustie_forum

dev_trustie_server

dev_update_ruby_version

develop

devops-secret

educoder_server

featrue_api_performance

featrue_homepage

featrue_login_and_register

featrue_revert_system_notification_histories

feature/pull_conflict_files

feature_project_detail

glcc_news_develop

hh_dev_trustie_server

hh_develop

hh_develop_navbar

hh_educoder_server

hh_hotfix

hh_invite_code

hh_repeat_table

hotfix/undownload_archivezip

integrated_blockchain

jupyter

master

mulanoss_server

prdevelop

pre_trustie_forum

pre_trustie_server

staging

standalone

standalone_develop

sync_develop

trustie-secret

trustie_server

#1

#2

#3

#4

v1

v1.0.0

v3.0.0

v3.0.1

v3.0.2

v3.0.3

v3.0.3(standalone)

v3.0.4

v3.0.4(standalone)

v3.1.0

v3.1.0-standalone

v3.1.1

v3.1.1-standalone

v3.1.5

v3.2.0

v4.0.0

3a63a32fba Merge pull request 'change projedeID to sync' (#4) from bankmulan into mulanoss_server mulanoss_server gua2048 2022-07-13 11:14:29 +0800
f8d9aebfcb change projedeID to sync #4 bankmulan chenjing 2022-07-13 11:10:27 +0800
98cb154193 Merge pull request '修复同步问题' (#3) from bankmulan into mulanoss_server gua2048 2022-07-13 10:51:52 +0800
a82cf528a6 change synchronization_service #3 chenjing 2022-07-13 10:50:06 +0800
d957955789 fix service bug chenjing 2022-07-13 10:27:21 +0800
bcddb2a2f7 Merge pull request '修复 target bug' (#2) from bankmulan into mulanoss_server gua2048 2022-07-13 09:56:25 +0800
db185ba647 fix target_type error #2 chenjing 2022-07-13 09:54:16 +0800
4739c6f3aa Merge pull request 'add sync to smart.doaction when follow project' (#1) from bankmulan into mulanoss_server gua2048 2022-07-13 09:49:14 +0800
25f7b340d2 add sync to smart.doaction when follow project #1 chenjing 2022-07-13 09:41:57 +0800
aaeec77d23 add login by giteatoken chenjing 2022-06-23 16:15:03 +0800
8670bcf95c add smartdoaction to user platform chenjing 2022-05-25 17:40:40 +0800
eadc517a25 Merge pull request '同步develop最新代码' (#11) from yystopf/forgeplus:dev_educoder_sync into dev_educoder_sync dev_educoder_sync yystopf 2022-05-25 17:27:42 +0800
1652e615be 同步develop最新代码 yystopf 2022-05-25 17:25:21 +0800
6eaf491f70 Merge branch 'pre_trustie_server' into trustie_server trustie_server yystopf 2022-05-25 15:49:21 +0800
7ddb59800d 竞赛无赛区赛项配置 dev_jk_server xiaoxiaoqiong 2022-05-25 15:31:41 +0800
d4d00b30bf Merge branch 'standalone_develop' into pre_trustie_server pre_trustie_server yystopf 2022-05-25 11:47:55 +0800
19ec81e975 Merge branch 'develop' into standalone_develop standalone_develop yystopf 2022-05-25 11:47:44 +0800
2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 develop yystopf 2022-05-25 11:47:35 +0800
4c066b30ef Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 18:10:28 +0800
ad9bb8e542 修复: 合并从develop yystopf 2022-05-24 18:10:20 +0800
e36c7a4b6a 修复: 邮箱搜索不需要return 404 yystopf 2022-05-24 18:09:36 +0800
18c4c6ae2f Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 17:38:21 +0800
9979c87d0c 修复: 合并从develop yystopf 2022-05-24 17:27:24 +0800
8e8ec821f2 新增: 根据邮箱来获取用户 yystopf 2022-05-24 17:26:10 +0800
cedaeda60c 竞赛增加审核状态过滤 xiaoxiaoqiong 2022-05-24 15:47:46 +0800
774b1bc79e Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 15:24:43 +0800
94166a363c fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 15:24:15 +0800
0219a1fdde Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:34:29 +0800
ebe5fad7dd fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:33:23 +0800
b2e7491ade Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:15:21 +0800
85a36ca2e7 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:14:57 +0800
b0f80012ab Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:08:58 +0800
75cef14605 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:08:33 +0800
0fc96026c8 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:01:01 +0800
93f8b659a1 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:00:15 +0800
b45ee11239 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 13:46:58 +0800
553d3a019f Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 11:50:30 +0800
33fa55bcb6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-24 11:49:01 +0800
643a99fdf1 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 11:48:56 +0800
38c5432c2a Merge branch 'develop' into standalone_develop yystopf 2022-05-24 11:46:26 +0800
5cf257c3cc Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop yystopf 2022-05-24 11:45:53 +0800
aa18fe0ad4 修复: 转移项目时新接受者需要移除原来的权限角色 yystopf 2022-05-24 11:43:47 +0800
1358c23ca6 fix: trasfer project member must remove old permission yystopf 2022-05-24 11:43:47 +0800
e8bfd0c955 Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 11:10:13 +0800
183eb15c7d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop yystopf 2022-05-24 11:03:59 +0800
fb43268444 fix: merge from develop yystopf 2022-05-24 11:03:54 +0800
c27cc063e6 add: new update user info simple and sync gitea yystopf 2022-05-24 10:59:52 +0800
6f6fe61a9d Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:47:37 +0800
b673909f9e fixed 增加自动登录，手机号先记录，后续用 xiaoxiaoqiong 2022-05-24 10:47:17 +0800
bd4dbd577b Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:34:54 +0800
ee3a14fa28 fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:34:31 +0800
26bfc2c0bf fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:33:21 +0800
eb2d976876 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:29:00 +0800
56721930a2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-24 10:26:06 +0800
2959414d56 fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:25:58 +0800
319e6ea084 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-23 18:24:17 +0800
008fdbaf5a Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-23 18:24:06 +0800
6223cf41e2 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop yystopf 2022-05-23 18:10:54 +0800
1d3f79e777 Merge branch 'develop' into standalone_develop yystopf 2022-05-23 18:10:47 +0800
b0092487e6 fix: is readme use regex yystopf 2022-05-23 18:10:41 +0800
0ae3544235 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-23 18:06:24 +0800
05b3f2a2fb fixed timego时间差 xiaoxiaoqiong 2022-05-23 18:05:13 +0800
555df176cc 增加打分重复三元组数量 xiaoxiaoqiong 2022-05-23 15:09:29 +0800
97fe157279 Merge branch 'develop' into standalone_develop yystopf 2022-05-23 09:27:16 +0800
fbebd0a623 fix yystopf 2022-05-23 09:27:09 +0800
a14a646768 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-21 17:06:59 +0800
25487368e5 Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-21 17:06:41 +0800
02681abaee Merge branch 'develop' into standalone_develop yystopf 2022-05-21 16:46:14 +0800
fe23c2afbf fix: replace content next if blank yystopf 2022-05-21 16:45:42 +0800
2fa0df3ae3 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-20 17:28:48 +0800
dc0d31330a Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-20 17:28:25 +0800
b06ad71082 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop yystopf 2022-05-20 17:06:10 +0800
3212bc4842 fix: merge from develop yystopf 2022-05-20 17:06:00 +0800
779c86108a fix: readme relative delay and replace_content yystopf 2022-05-20 17:00:02 +0800
e4779926bd Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop yystopf 2022-05-20 14:46:33 +0800
803fdfc49e fix: merge from develop yystopf 2022-05-20 11:44:56 +0800
83e43f0c97 add: new readme delay function yystopf 2022-05-20 11:43:22 +0800
20f892a4f0 成员分成多个单元格 xiaoxiaoqiong 2022-05-20 09:54:12 +0800
f77dcd3b30 成员分成多个单元格 xiaoxiaoqiong 2022-05-20 09:54:01 +0800
701c05c39e 成员分成多个单元格 xiaoxiaoqiong 2022-05-20 09:41:05 +0800
853c33cb24 成员分成多个单元格 xiaoxiaoqiong 2022-05-20 09:36:46 +0800
0bd8c19a87 成员分成多个单元格 xiaoxiaoqiong 2022-05-19 18:29:21 +0800
c2171eab9b 成员分成多个单元格 xiaoxiaoqiong 2022-05-19 18:21:44 +0800
72fb2738db 竞赛配置加映射关系字段，增加报名字段 xiaoxiaoqiong 2022-05-19 17:46:44 +0800
1cb406e1e8 竞赛配置加映射关系字段，增加报名字段 xiaoxiaoqiong 2022-05-19 17:44:36 +0800
5b33da0aa5 竞赛配置加映射关系字段，增加报名字段 xiaoxiaoqiong 2022-05-19 17:41:49 +0800
e545424b7d fix: project count use count yystopf 2022-05-19 15:54:38 +0800
ca78b04f6e 竞赛打分保留4位小数 xiaoxiaoqiong 2022-05-18 11:48:02 +0800
f93c1dff0b 竞赛打分保留4位小数 xiaoxiaoqiong 2022-05-18 11:42:53 +0800
ccec3494bc merge from develop yystopf 2022-05-18 11:38:07 +0800
e237fd46f7 fix: not found user return 404 yystopf 2022-05-18 11:37:23 +0800
6dc2f0b062 Merge branch 'develop' into standalone_develop yystopf 2022-05-18 11:03:47 +0800
ca3c564529 fix: not found user return 404 yystopf 2022-05-18 11:03:39 +0800
ef33193f01 增加api请求时间 xiaoxiaoqiong 2022-05-18 10:47:44 +0800
f79e4f8e81 Merge branch 'develop' into standalone_develop yystopf 2022-05-18 10:11:22 +0800
b648774b42 增加api请求时间 xiaoxiaoqiong 2022-05-18 10:11:12 +0800
9cd18397f7 fix: import user login length required yystopf 2022-05-18 10:11:09 +0800
0ffb919242 增加api请求时间 xiaoxiaoqiong 2022-05-18 10:10:49 +0800
7574071445 fix educoder to Gitlink::utils xiaoxiaoqiong 2022-05-17 15:41:39 +0800
6d4fb8df34 js zip xiaoxiaoqiong 2022-05-17 14:45:45 +0800