xiaoxiaoqiong
|
774b1bc79e
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
94166a363c
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
0219a1fdde
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
ebe5fad7dd
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
b2e7491ade
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
85a36ca2e7
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
b0f80012ab
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
75cef14605
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
0fc96026c8
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
93f8b659a1
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
b45ee11239
|
fixed 增加自动登录,gitea注册
|
4 years ago |
xiaoxiaoqiong
|
553d3a019f
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
33fa55bcb6
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
4 years ago |
xiaoxiaoqiong
|
643a99fdf1
|
fixed 增加自动登录,gitea注册
|
4 years ago |
yystopf
|
38c5432c2a
|
Merge branch 'develop' into standalone_develop
|
4 years ago |
yystopf
|
5cf257c3cc
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
4 years ago |
yystopf
|
aa18fe0ad4
|
修复: 转移项目时新接受者需要移除原来的权限角色
|
4 years ago |
yystopf
|
1358c23ca6
|
fix: trasfer project member must remove old permission
|
4 years ago |
yystopf
|
e8bfd0c955
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
yystopf
|
183eb15c7d
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
4 years ago |
yystopf
|
fb43268444
|
fix: merge from develop
|
4 years ago |
yystopf
|
c27cc063e6
|
add: new update user info simple and sync gitea
|
4 years ago |
xiaoxiaoqiong
|
6f6fe61a9d
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
b673909f9e
|
fixed 增加自动登录,手机号先记录,后续用
|
4 years ago |
xiaoxiaoqiong
|
bd4dbd577b
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
ee3a14fa28
|
fixed 增加自动登录
|
4 years ago |
xiaoxiaoqiong
|
26bfc2c0bf
|
fixed 增加自动登录
|
4 years ago |
xiaoxiaoqiong
|
eb2d976876
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
xiaoxiaoqiong
|
56721930a2
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
4 years ago |
xiaoxiaoqiong
|
2959414d56
|
fixed 增加自动登录
|
4 years ago |
yystopf
|
008fdbaf5a
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
yystopf
|
6223cf41e2
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
4 years ago |
yystopf
|
1d3f79e777
|
Merge branch 'develop' into standalone_develop
|
4 years ago |
yystopf
|
b0092487e6
|
fix: is readme use regex
|
4 years ago |
xiaoxiaoqiong
|
0ae3544235
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
# Conflicts:
# app/controllers/users_controller.rb
# app/helpers/application_helper.rb
|
4 years ago |
xiaoxiaoqiong
|
05b3f2a2fb
|
fixed timego时间差
|
4 years ago |
yystopf
|
97fe157279
|
Merge branch 'develop' into standalone_develop
|
4 years ago |
yystopf
|
fbebd0a623
|
fix
|
4 years ago |
yystopf
|
25487368e5
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
yystopf
|
02681abaee
|
Merge branch 'develop' into standalone_develop
|
4 years ago |
yystopf
|
fe23c2afbf
|
fix: replace content next if blank
|
4 years ago |
yystopf
|
dc0d31330a
|
Merge branch 'standalone_develop' into pre_trustie_server
|
4 years ago |
yystopf
|
b06ad71082
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
4 years ago |
yystopf
|
3212bc4842
|
fix: merge from develop
|
4 years ago |
yystopf
|
779c86108a
|
fix: readme relative delay and replace_content
|
4 years ago |
yystopf
|
e4779926bd
|
Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop
|
4 years ago |
yystopf
|
803fdfc49e
|
fix: merge from develop
|
4 years ago |
yystopf
|
83e43f0c97
|
add: new readme delay function
|
4 years ago |
yystopf
|
ccec3494bc
|
merge from develop
|
4 years ago |
yystopf
|
e237fd46f7
|
fix: not found user return 404
|
4 years ago |