xiaoshui
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,107 Commits 7 Branches 16 Tags 797 MiB
Commit Graph

3107 Commits

Author SHA1 Message Date
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 0e4c0a46c2 fix 2022-05-13 13:56:12 +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