jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,232 Commits 98 Branches 0 Tags 0 B
Commit Graph

18232 Commits

Author SHA1 Message Date
guange 474b516653 微信at弹出框样式问题解决，在fixed下加一层inner设为overflow-y解决 2016-12-31 11:30:49 +08:00
guange d015c7a968 加入，您可以@别人啦~ 2016-12-27 22:07:11 +08:00
guange 5d4a3d8235 ids为空时不需要执行 2016-12-27 21:44:10 +08:00
daiao 2032ce8a3c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-27 17:01:18 +08:00
黄井泉 04ce4107bb Merge branch 'develop' into 'develop' 
在同一项目内的里程碑，不能重名

在同一项目内的里程碑，不能重名

See merge request !90
 2016-12-27 17:00:25 +08:00
daiao 7c44a14fb5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-27 16:56:54 +08:00
daiao 50fb461f20 新建里程碑在项目内不能重名 2016-12-27 16:54:53 +08:00
cxt b10720520b Merge branch 'cxt_course' into develop 2016-12-27 16:38:26 +08:00
cxt 2b2498d66a 课程列表的班级收藏 2016-12-27 16:36:35 +08:00
黄井泉 8e2353d61e Merge branch 'develop' into 'develop' 
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

See merge request !88
 2016-12-27 16:27:19 +08:00
黄井泉 e5b9f0df46 Merge branch 'develop' into 'develop' 
竞赛发布通知字段过长400问题



See merge request !89
 2016-12-27 16:21:45 +08:00
daiao cfa81fc79d 新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题 2016-12-27 16:18:23 +08:00
cxt f1a4cac61c Merge branch 'develop' into cxt_course 2016-12-27 14:20:37 +08:00
huang 4f6e9b2c3b 竞赛通知新建路由更改 2016-12-27 14:13:51 +08:00
huang a354699b42 邮件国际化丢失等问题 2016-12-27 13:02:22 +08:00
huang e614a2d111 修复500问题 2016-12-27 12:33:08 +08:00
huang 8126353b43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-12-27 12:29:43 +08:00
daiao a668ed7a81 待审批申请，被其他管理员审批的历史数据依旧还存在的问题 2016-12-27 09:07:16 +08:00
huang d10a51df1b 部分用户主页 点击课程后500问题 2016-12-26 16:45:56 +08:00
huang 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +08:00
cxt 5cf5c5f421 通知详情不能编辑和删除 2016-12-24 21:00:42 +08:00
cxt 4067a9c4a7 title修改、通知的编辑删除、附件下载 2016-12-24 20:22:09 +08:00
cxt 631bcd508f 竞赛通知要可以编辑和删除 2016-12-24 19:34:03 +08:00
cxt cbefe70e00 bug修复 2016-12-24 19:12:33 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
daiao e86bd6728e Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/users/_user_activities.html.erb
	db/schema.rb
 2016-12-24 16:48:48 +08:00
cxt de9f5131b6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-24 16:30:30 +08:00
daiao 84d5b5bc4a 竞赛列表 2016-12-24 16:29:53 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
huang a3dc06a4f7 新注册用户更改用户的时候用户名参数为空的问题处理 2016-12-24 12:05:48 +08:00
huang 4336d28dda gitlab同步修改用户 2016-12-24 11:57:10 +08:00
huang 87c134c007 登录名能修改 2016-12-24 11:16:33 +08:00
cxt 44b3f6019c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 21:44:20 +08:00
cxt 86bd5b97b1 竞赛头部调整 2016-12-23 21:44:03 +08:00
黄井泉 117de45d5c Merge branch 'develop' into 'develop' 
issue动态样式调整

issue动态样式调整

See merge request !87
 2016-12-23 21:36:43 +08:00
daiao 840bbb134a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 21:34:47 +08:00
daiao 110bbd6c3b issue 动态样式宽度 2016-12-23 21:34:21 +08:00
huang 41312d82c5 竞赛动态中通知回复及删除局部刷新 2016-12-23 21:23:07 +08:00
黄井泉 1069161230 Merge branch 'develop' into 'develop' 
动态内容调整

动态内容调整

See merge request !86
 2016-12-23 21:17:22 +08:00
huang b563b170bd 竞赛动态新闻 2016-12-23 21:13:40 +08:00
daiao dbd8802b9c 项目动态内容样式调整，重发邮件调整 2016-12-23 21:11:39 +08:00
黄井泉 afd5205645 Merge branch 'develop' into 'develop' 
邮件激活，关联Commit样式等

邮件激活，关联Commit样式等

See merge request !85
 2016-12-23 20:37:53 +08:00
daiao 7b18f22528 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 20:34:54 +08:00
daiao 0ce62b9e8c 关联commit数据为空时，显示调整 2016-12-23 20:34:23 +08:00
huang 69bacc1f6e base添加竞赛入口 2016-12-23 20:27:16 +08:00
huang 854de1fae6 新建竞赛通知发送消息， 及竞赛通知删除 2016-12-23 20:19:17 +08:00
huang 2c97f12538 竞赛编辑功能 2016-12-23 19:56:00 +08:00
huang bc5846c2d6 竞赛通知 详情页面完成 2016-12-23 19:48:39 +08:00
huang 43bb3fe4eb 完成竞赛通知 列表页面 2016-12-23 19:35:02 +08:00
huang c98a8b5113 竞赛通知新建 2016-12-23 19:08:13 +08:00