 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 |
|
yystopf
|
acbd0d376c
|
fix: change trace user post valid
|
2022-05-16 14:26:21 +08:00 |
|
yystopf
|
2f4ffe3d8e
|
fix: change trace user post valid
|
2022-05-16 14:25:54 +08:00 |
|
yystopf
|
a6efae8b10
|
fix
|
2022-05-16 10:48:23 +08:00 |
|
yystopf
|
5a728e7d4d
|
fix: trace user exist and compact tasks create params
|
2022-05-16 09:58:47 +08:00 |
|
yystopf
|
04a733d99f
|
fix: check user trace tasks count
|
2022-05-13 16:57:41 +08:00 |
|
yystopf
|
9e8c576ff6
|
fix: remove require manager operate
|
2022-05-13 15:38:04 +08:00 |
|
yystopf
|
94881dd72a
|
add: user trace tasks record
|
2022-05-13 14:31:59 +08:00 |
|
yystopf
|
2c7bb1b5cd
|
fix: remove project tasks_count
|
2022-05-13 14:00:21 +08:00 |
|
yystopf
|
7fcbbb7922
|
fix: remove project tasks_count
|
2022-05-13 13:53:25 +08:00 |
|
yystopf
|
3d9fe5bba5
|
add: download pdf from trace server
|
2022-05-12 17:52:19 +08:00 |
|
yystopf
|
4dccdfde97
|
fix
|
2022-05-12 17:15:19 +08:00 |
|
yystopf
|
00fc83235f
|
download file use redirect
|
2022-05-12 17:11:16 +08:00 |
|
yystopf
|
498ee26f59
|
fix
|
2022-05-12 11:14:17 +08:00 |
|
yystopf
|
5d771c824b
|
add: operate permission and request timeout
|
2022-05-12 11:12:34 +08:00 |
|
yystopf
|
3eccd6be64
|
add: user has trace user field
|
2022-05-12 09:45:37 +08:00 |
|
yystopf
|
9b3336c0a0
|
fix: reload task need increment tasks count
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
12c961d70d
|
fix
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
7750cbe272
|
add: project trace tasks count
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
1f13bba52e
|
add: trace user tasks_count
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
5dcee1b4dc
|
add: traces api document
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
cf09b28f5e
|
add: project menu services
|
2022-05-12 09:43:54 +08:00 |
|
yystopf
|
f31796f344
|
add: branch valid for tasks
|
2022-05-12 09:43:52 +08:00 |
|
yystopf
|
2d9bde134a
|
fix
|
2022-05-12 09:43:00 +08:00 |
|
yystopf
|
a0a7f908f4
|
rename namespace
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
17ccf3d576
|
rename namespace
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
72a32ed8c4
|
rename namespace
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
c64fa5135b
|
fix
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
12cc37443e
|
add: trace controller and router
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
f5efbcfc04
|
Merge branch 'develop' into standalone_develop
|
2022-05-07 14:06:58 +08:00 |
|
yystopf
|
50dc5cce5d
|
fix
|
2022-05-07 14:06:48 +08:00 |
|
yystopf
|
0afac46778
|
Merge branch 'develop' into standalone_develop
|
2022-05-07 11:58:13 +08:00 |
|
yystopf
|
a6cee63d17
|
fix: change owner must fix foreign_key
|
2022-05-07 11:57:58 +08:00 |
|
yystopf
|
20af4a7d82
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 17:25:52 +08:00 |
|
yystopf
|
000197b0d1
|
fix: issues and pull_request length calculate
|
2022-05-06 17:25:34 +08:00 |
|
yystopf
|
67b386d947
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 14:29:15 +08:00 |
|
yystopf
|
6aa3321d17
|
fix: pr title description validate
|
2022-05-06 14:29:05 +08:00 |
|
yystopf
|
9d8df2b4d9
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 09:57:23 +08:00 |
|
yystopf
|
d44308fc82
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
2022-05-06 09:56:38 +08:00 |
|
yystopf
|
ae7d0d1329
|
add: issues description and journals notes validate
|
2022-05-06 09:56:22 +08:00 |
|
xiaoxiaoqiong
|
55c74de8e4
|
fork_users加入组织
|
2022-05-05 10:41:02 +08:00 |
|
yystopf
|
52c94effdc
|
Merge branch 'develop' into standalone_develop
|
2022-05-05 10:18:19 +08:00 |
|
yystopf
|
7c88ea3d67
|
add: quit repo
|
2022-05-05 10:00:02 +08:00 |
|
yystopf
|
d799d329ff
|
add: compare add paginate
|
2022-04-28 18:54:56 +08:00 |
|
yystopf
|
f15cd44dff
|
add: compare add paginate
|
2022-04-28 18:53:33 +08:00 |
|
yystopf
|
91ea5ca96a
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 11:12:35 +08:00 |
|
yystopf
|
3abd6037d9
|
fix: show super description aways desplay
|
2022-04-28 11:12:16 +08:00 |
|
yystopf
|
11724bf63f
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 11:04:01 +08:00 |
|
yystopf
|
ec3a556a6f
|
fix: default value for show super description
|
2022-04-28 11:03:42 +08:00 |
|
yystopf
|
1d7c7eba24
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 10:54:02 +08:00 |
|
yystopf
|
396ac55429
|
add: user super description
|
2022-04-28 10:42:55 +08:00 |
|
yystopf
|
e1b4622ede
|
Merge branch 'develop' into standalone_develop
|
2022-04-26 17:17:05 +08:00 |
|
yystopf
|
088c617cc1
|
add: name query for branches
|
2022-04-26 17:15:59 +08:00 |
|
yystopf
|
246b484ad8
|
fix merge from develop
|
2022-04-18 14:14:48 +08:00 |
|
yystopf
|
fc3cf01d3f
|
add: get user image action
|
2022-04-18 13:49:08 +08:00 |
|
yystopf
|
345fd31834
|
Merge branch 'develop' into standalone_develop
|
2022-04-18 10:52:59 +08:00 |
|
yystopf
|
8f5bb0e2d9
|
fix: organization gitea_token read by associations
|
2022-04-18 10:52:48 +08:00 |
|
yystopf
|
7aea481ccf
|
add: glcc_apply_infomations admin navbar
|
2022-04-18 10:24:54 +08:00 |
|
yystopf
|
37317f82bf
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 16:09:08 +08:00 |
|
yystopf
|
2dfd69ae21
|
fix: response data result
|
2022-04-11 16:08:50 +08:00 |
|
yystopf
|
a132154136
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 15:48:54 +08:00 |
|
yystopf
|
720c073f32
|
fix
|
2022-04-11 15:48:47 +08:00 |
|
yystopf
|
185cb308ac
|
Merge branch 'develop' into standalone_develop
|
2022-04-11 15:30:44 +08:00 |
|
yystopf
|
0076468a15
|
fix: trace client request data
|
2022-04-11 15:30:28 +08:00 |
|
yystopf
|
910ae48556
|
fix: exception to ex
|
2022-04-11 10:50:18 +08:00 |
|
xiaoxiaoqiong
|
6e86f9d9f3
|
竞赛配置子赛项
|
2022-04-08 23:07:23 +08:00 |