Commit Graph

1427 Commits

Author SHA1 Message Date
xiaoxiaoqiong
e76822eb34 fixed ci报错200处理 2022-05-27 16:54:09 +08:00
2a387ad997 Merge branch 'develop' into standalone_develop 2022-05-27 10:48:38 +08:00
a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +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
b45ee11239 fixed 增加自动登录,gitea注册 2022-05-24 13:46:58 +08:00
xiaoxiaoqiong
643a99fdf1 fixed 增加自动登录,gitea注册 2022-05-24 11:48:56 +08:00
183eb15c7d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-24 11:03:59 +08:00
fb43268444 fix: merge from develop 2022-05-24 11:03:54 +08:00
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
2959414d56 fixed 增加自动登录 2022-05-24 10:25:58 +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
b06ad71082 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-20 17:06:10 +08:00
3212bc4842 fix: merge from develop 2022-05-20 17:06:00 +08:00
779c86108a fix: readme relative delay and replace_content 2022-05-20 17:00:02 +08:00
e4779926bd Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop 2022-05-20 14:46:33 +08:00
ccec3494bc merge from develop 2022-05-18 11:38:07 +08:00
e237fd46f7 fix: not found user return 404 2022-05-18 11:37:23 +08:00
6dc2f0b062 Merge branch 'develop' into standalone_develop 2022-05-18 11:03:47 +08:00
ca3c564529 fix: not found user return 404 2022-05-18 11:03:39 +08:00
077926de18 fix 2022-05-17 11:39:57 +08:00
4fade5d0b7 fix: project trace tasks name rule change 2022-05-17 11:34:08 +08:00
f51ebaad67 fix 2022-05-16 17:08:52 +08:00
8ae6a0deb2 fix: some feature about permission 2022-05-16 17:02:38 +08:00
d9b3711e08 Merge branch 'develop' into standalone_develop 2022-05-16 16:59:36 +08:00
77620f7735 add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
acbd0d376c fix: change trace user post valid 2022-05-16 14:26:21 +08:00
2f4ffe3d8e fix: change trace user post valid 2022-05-16 14:25:54 +08:00
5a728e7d4d fix: trace user exist and compact tasks create params 2022-05-16 09:58:47 +08:00
04a733d99f fix: check user trace tasks count 2022-05-13 16:57:41 +08:00
9e8c576ff6 fix: remove require manager operate 2022-05-13 15:38:04 +08:00
94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
2c7bb1b5cd fix: remove project tasks_count 2022-05-13 14:00:21 +08:00
7fcbbb7922 fix: remove project tasks_count 2022-05-13 13:53:25 +08:00
3d9fe5bba5 add: download pdf from trace server 2022-05-12 17:52:19 +08:00
4dccdfde97 fix 2022-05-12 17:15:19 +08:00
00fc83235f download file use redirect 2022-05-12 17:11:16 +08:00
5d771c824b add: operate permission and request timeout 2022-05-12 11:12:34 +08:00
3eccd6be64 add: user has trace user field 2022-05-12 09:45:37 +08:00
9b3336c0a0 fix: reload task need increment tasks count 2022-05-12 09:43:55 +08:00