gua2048
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,165 Commits 53 Branches 0 Tags 573 MiB
Commit Graph

3165 Commits

Author SHA1 Message Date
yystopf d4d00b30bf Merge branch 'standalone_develop' into pre_trustie_server 2022-05-25 11:47:55 +08:00
yystopf 19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
yystopf 2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
yystopf 4c066b30ef Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 18:10:28 +08:00
yystopf ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
yystopf e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
yystopf 18c4c6ae2f Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 17:38:21 +08:00
yystopf 9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong 774b1bc79e Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 15:24:43 +08:00
xiaoxiaoqiong 94166a363c fixed 增加自动登录，gitea注册 2022-05-24 15:24:15 +08:00
xiaoxiaoqiong 0219a1fdde Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:34:29 +08:00
xiaoxiaoqiong ebe5fad7dd fixed 增加自动登录，gitea注册 2022-05-24 14:33:23 +08:00
xiaoxiaoqiong b2e7491ade Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:15:21 +08:00
xiaoxiaoqiong 85a36ca2e7 fixed 增加自动登录，gitea注册 2022-05-24 14:14:57 +08:00
xiaoxiaoqiong b0f80012ab Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:08:58 +08:00
xiaoxiaoqiong 75cef14605 fixed 增加自动登录，gitea注册 2022-05-24 14:08:33 +08:00
xiaoxiaoqiong 0fc96026c8 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:01:01 +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 553d3a019f Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 11:50:30 +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 e8bfd0c955 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 11:10:13 +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 6f6fe61a9d Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 10:47:37 +08:00
xiaoxiaoqiong b673909f9e fixed 增加自动登录，手机号先记录，后续用 2022-05-24 10:47:17 +08:00
xiaoxiaoqiong bd4dbd577b Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 10:34:54 +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 eb2d976876 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 10:29:00 +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 008fdbaf5a Merge branch 'standalone_develop' into pre_trustie_server 2022-05-23 18:24:06 +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 25487368e5 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-21 17:06:41 +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