 yystopf
|
9979c87d0c
|
修复: 合并从develop
|
2022-05-24 17:27:24 +08:00 |
|
yystopf
|
8e8ec821f2
|
新增: 根据邮箱来获取用户
|
2022-05-24 17:26:10 +08:00 |
xiaoxiaoqiong
|
94166a363c
|
fixed 增加自动登录，gitea注册
|
2022-05-24 15:24:15 +08:00 |
|
xiaoxiaoqiong
|
ebe5fad7dd
|
fixed 增加自动登录，gitea注册
|
2022-05-24 14:33:23 +08:00 |
|
xiaoxiaoqiong
|
85a36ca2e7
|
fixed 增加自动登录，gitea注册
|
2022-05-24 14:14:57 +08:00 |
|
xiaoxiaoqiong
|
75cef14605
|
fixed 增加自动登录，gitea注册
|
2022-05-24 14:08:33 +08:00 |
|
xiaoxiaoqiong
|
93f8b659a1
|
fixed 增加自动登录，gitea注册
|
2022-05-24 14:00:15 +08:00 |
|
xiaoxiaoqiong
|
b45ee11239
|
fixed 增加自动登录，gitea注册
|
2022-05-24 13:46:58 +08:00 |
|
xiaoxiaoqiong
|
33fa55bcb6
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-05-24 11:49:01 +08:00 |
|
xiaoxiaoqiong
|
643a99fdf1
|
fixed 增加自动登录，gitea注册
|
2022-05-24 11:48:56 +08:00 |
|
yystopf
|
38c5432c2a
|
Merge branch 'develop' into standalone_develop
|
2022-05-24 11:46:26 +08:00 |
|
yystopf
|
5cf257c3cc
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
2022-05-24 11:45:53 +08:00 |
|
yystopf
|
aa18fe0ad4
|
修复: 转移项目时新接受者需要移除原来的权限角色
|
2022-05-24 11:44:05 +08:00 |
|
yystopf
|
1358c23ca6
|
fix: trasfer project member must remove old permission
|
2022-05-24 11:43:47 +08:00 |
|
yystopf
|
183eb15c7d
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
2022-05-24 11:03:59 +08:00 |
|
yystopf
|
fb43268444
|
fix: merge from develop
|
2022-05-24 11:03:54 +08:00 |
|
yystopf
|
c27cc063e6
|
add: new update user info simple and sync gitea
|
2022-05-24 10:59:52 +08:00 |
|
xiaoxiaoqiong
|
b673909f9e
|
fixed 增加自动登录，手机号先记录，后续用
|
2022-05-24 10:47:17 +08:00 |
|
xiaoxiaoqiong
|
ee3a14fa28
|
fixed 增加自动登录
|
2022-05-24 10:34:31 +08:00 |
|
xiaoxiaoqiong
|
26bfc2c0bf
|
fixed 增加自动登录
|
2022-05-24 10:33:21 +08:00 |
|
xiaoxiaoqiong
|
56721930a2
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-05-24 10:26:06 +08:00 |
|
xiaoxiaoqiong
|
2959414d56
|
fixed 增加自动登录
|
2022-05-24 10:25:58 +08:00 |
|
yystopf
|
6223cf41e2
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
2022-05-23 18:10:54 +08:00 |
|
yystopf
|
1d3f79e777
|
Merge branch 'develop' into standalone_develop
|
2022-05-23 18:10:47 +08:00 |
|
yystopf
|
b0092487e6
|
fix: is readme use regex
|
2022-05-23 18:10:41 +08:00 |
|
xiaoxiaoqiong
|
0ae3544235
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
# Conflicts:
# app/controllers/users_controller.rb
# app/helpers/application_helper.rb
|
2022-05-23 18:06:24 +08:00 |
|
xiaoxiaoqiong
|
05b3f2a2fb
|
fixed timego时间差
|
2022-05-23 18:05:13 +08:00 |
|
yystopf
|
97fe157279
|
Merge branch 'develop' into standalone_develop
|
2022-05-23 09:27:16 +08:00 |
|
yystopf
|
fbebd0a623
|
fix
|
2022-05-23 09:27:09 +08:00 |
|
yystopf
|
02681abaee
|
Merge branch 'develop' into standalone_develop
|
2022-05-21 16:46:14 +08:00 |
|
yystopf
|
fe23c2afbf
|
fix: replace content next if blank
|
2022-05-21 16:45:42 +08:00 |
|
yystopf
|
b06ad71082
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
2022-05-20 17:06:10 +08:00 |
|
yystopf
|
3212bc4842
|
fix: merge from develop
|
2022-05-20 17:06:00 +08:00 |
|
yystopf
|
779c86108a
|
fix: readme relative delay and replace_content
|
2022-05-20 17:00:02 +08:00 |
|
yystopf
|
e4779926bd
|
Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop
|
2022-05-20 14:46:33 +08:00 |
|
yystopf
|
803fdfc49e
|
fix: merge from develop
|
2022-05-20 11:44:56 +08:00 |
|
yystopf
|
83e43f0c97
|
add: new readme delay function
|
2022-05-20 11:43:22 +08:00 |
|
yystopf
|
ccec3494bc
|
merge from develop
|
2022-05-18 11:38:07 +08:00 |
|
yystopf
|
e237fd46f7
|
fix: not found user return 404
|
2022-05-18 11:37:23 +08:00 |
|
yystopf
|
6dc2f0b062
|
Merge branch 'develop' into standalone_develop
|
2022-05-18 11:03:47 +08:00 |
|
yystopf
|
ca3c564529
|
fix: not found user return 404
|
2022-05-18 11:03:39 +08:00 |
|
yystopf
|
f79e4f8e81
|
Merge branch 'develop' into standalone_develop
|
2022-05-18 10:11:22 +08:00 |
|
yystopf
|
9cd18397f7
|
fix: import user login length required
|
2022-05-18 10:11:09 +08:00 |
|
yystopf
|
bfd3298cd0
|
fix
|
2022-05-17 11:42:43 +08:00 |
|
yystopf
|
077926de18
|
fix
|
2022-05-17 11:39:57 +08:00 |
|
yystopf
|
4fade5d0b7
|
fix: project trace tasks name rule change
|
2022-05-17 11:34:08 +08:00 |
|
yystopf
|
f51ebaad67
|
fix
|
2022-05-16 17:08:52 +08:00 |
|
yystopf
|
8ae6a0deb2
|
fix: some feature about permission
|
2022-05-16 17:02:38 +08:00 |
|
yystopf
|
d9b3711e08
|
Merge branch 'develop' into standalone_develop
|
2022-05-16 16:59:36 +08:00 |
|
yystopf
|
77620f7735
|
add: download and import user template xlsx
|
2022-05-16 16:59:25 +08:00 |