380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jasder	0a8732e7f1	FIX build	2020-04-24 18:13:46 +08:00
Jasder	6080bd7ed1	FIX build	2020-04-24 14:26:11 +08:00
sylor_huang@126.com	0532907f20	修改合并请求的样式	2020-04-24 12:13:19 +08:00
sylor_huang@126.com	258e2605ae	修改冲突	2020-04-24 12:03:41 +08:00
sylor_huang@126.com	e3d9e03404	修改前端样式及后端的部分代码	2020-04-24 11:40:02 +08:00
Jasder	75c93bede8	FIX build	2020-04-24 10:53:01 +08:00
Jasder	a510fb94d4	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-24 10:15:08 +08:00
Jasder	260e6f8932	FIX 更改云上实验室主站配置	2020-04-24 10:15:02 +08:00
sylor_huang@126.com	08820588ed	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-24 09:46:07 +08:00
sylor_huang@126.com	98a055db69	修改附件及搜索协作者的bug	2020-04-24 09:45:42 +08:00
Jasder	cda614e9df	FIX build	2020-04-24 09:38:38 +08:00
Jasder	1b33e2978e	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-23 23:03:12 +08:00
Jasder	9a39f2ad7a	FIX gitea create file bug	2020-04-23 23:02:57 +08:00
Jasder	495a8dd48e	FIX coder review	2020-04-23 23:02:37 +08:00
sylor_huang@126.com	de55e2f0c2	恢复readme的样式	2020-04-23 18:49:58 +08:00
sylor_huang@126.com	6e88ea4cc3	修改用户的链接	2020-04-23 16:27:19 +08:00
sylor_huang@126.com	1e1e13898b	修改项目列表的筛选	2020-04-23 14:32:56 +08:00
sylor_huang@126.com	02df9fbe0f	项目首页的排序修改	2020-04-23 14:28:04 +08:00
sylor_huang@126.com	734727eb09	修改分支切换的问题	2020-04-23 14:21:29 +08:00
sylor_huang@126.com	77c9b8805f	修改项目首页的筛选	2020-04-23 14:16:00 +08:00
sylor_huang@126.com	6a04bb18ab	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-23 12:07:57 +08:00
sylor_huang@126.com	937cb04d4f	创建文件的修改及其他后端bug	2020-04-23 12:07:46 +08:00
Jasder	a6ee3cdc8d	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-23 11:21:29 +08:00
Jasder	c5c6d38497	FIX code review	2020-04-23 11:21:20 +08:00
sylor_huang@126.com	279521289e	增加weap_setting	2020-04-23 11:13:24 +08:00
sylor_huang@126.com	620c8754d4	精简model/controllers/views	2020-04-23 11:08:29 +08:00
Jasder	4f343c7967	ADD set sso autologin cookie	2020-04-23 09:14:12 +08:00
Jasder	75f5b3827c	FIX bug	2020-04-22 21:45:27 +08:00
Jasder	4a182829a0	FIX 去掉user中无关的model关联关系	2020-04-22 21:32:42 +08:00
Jasder	a4b8ffb89b	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-22 21:26:22 +08:00
Jasder	1c1586e5dd	FIX 去掉user中无关的model关联关系	2020-04-22 21:26:14 +08:00
sylor_huang@126.com	c33c46ac2c	创建文件的权限	2020-04-22 19:05:38 +08:00
sylor_huang@126.com	f74e448f09	修改前端的问题	2020-04-22 18:52:43 +08:00
sylor_huang@126.com	64a46cce6d	前端样式修改	2020-04-22 17:47:51 +08:00
sylor_huang@126.com	71cc0c3b64	前端的部分样式修改	2020-04-22 17:28:44 +08:00
sylor_huang@126.com	d4b6b5f802	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-22 17:17:04 +08:00
sylor_huang@126.com	c0aff6e456	修改version的issues数量	2020-04-22 17:16:50 +08:00
Jasder	3e89791255	Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop	2020-04-22 17:13:14 +08:00
Jasder	45b2e5bf96	ADD sync users salt column	2020-04-22 17:13:08 +08:00
sylor_huang@126.com	0736d93b95	修改sync_version_issues并添加verison.id_index	2020-04-22 16:34:03 +08:00
sylor_huang@126.com	87f329d34d	修改sync_version_issues	2020-04-22 16:16:52 +08:00
sylor_huang@126.com	028876727d	修改sync——version_issues	2020-04-22 16:08:22 +08:00
sylor_huang@126.com	df9bdf50b3	同步version的issues数量	2020-04-22 16:02:01 +08:00
Jasder	3b6cbacbd1	ADD 其他平台(如trusitie平台)登录后将用户密码同步到gitea平台对应的用户	2020-04-22 15:59:40 +08:00
Jasder	3dbdb5ead4	ADD 用户登录时同步修改gitea平台对应用户的密码	2020-04-22 15:41:47 +08:00
Jasder	2fd4539391	FIX 完善同步修改用户信息api	2020-04-22 15:40:15 +08:00
Jasder	e6396bdefd	FIX 完善gitea平台修改用户信息接口	2020-04-22 15:39:34 +08:00
Jasder	ae2c6627a9	FIX add is_sync_pwd column to users table	2020-04-22 15:38:57 +08:00
sylor_huang@126.com	2738efb04d	修改commits的错误提示	2020-04-22 15:14:52 +08:00
sylor_huang@126.com	f9f5b9fdb7	测试commits报错	2020-04-22 15:11:54 +08:00