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

5311 Commits

Author SHA1 Message Date
cxt c4927070a0 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 16:05:12 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
huang 0d00b6ca74 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-22 15:17:54 +08:00
huang 037e717937 竞赛邀请码 竞赛settings（部分） 2016-12-22 15:17:02 +08:00
cxt cf8725f2ee Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 15:08:49 +08:00
cxt 4c5a2aa40b 加入竞赛 2016-12-22 15:08:15 +08:00
huang 01d9fbbef3 组织base框架 2016-12-22 14:47:42 +08:00
cxt fddcbe2a56 新建竞赛 2016-12-22 11:17:13 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
guange 34f8450885 ids为空时不需要执行 2016-12-18 18:29:24 +08:00
guange 6ef7a15a5b 设置只读不需要放到delayed_job 2016-12-18 12:28:56 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
 2016-12-17 10:25:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-12-16 16:56:21 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
cxt 8e20dd1a5f issue详情页面的回复调整 2016-12-16 16:30:08 +08:00
黄井泉 48774d7ab7 Merge branch 'develop' into 'develop' 
个人主页

个人主页

See merge request !61
 2016-12-16 16:29:39 +08:00
黄井泉 85d01a7392 Merge branch 'guange_dev' into 'develop' 
去除个人信息编辑中的邮箱



See merge request !56
 2016-12-16 16:27:28 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
huang 4c340a5822 个人主页申请类消息统计 2016-12-16 16:03:59 +08:00
daiao ce9f9ff209 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 15:32:36 +08:00
daiao 27597cf6ed 个人主页 2016-12-16 15:32:30 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
daiao c42fd235e8 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:51:10 +08:00
cxt 0fe7b96473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:41:37 +08:00
cxt 271cee79d1 待匿评的作业 2016-12-16 14:38:27 +08:00
huang a148f3c157 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:06:17 +08:00
cxt 6dfebd447c 导入的试卷进入查看页报500 2016-12-16 14:05:14 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang c0391b967f 注册用户发送留言 、留言页面代码优化 2016-12-16 11:42:52 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
huang 6e83d41ea4 pull request留言权限控制，非项目成员不能提交评论 2016-12-15 17:12:41 +08:00
huang 5527adb795 版本406异常处理，pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
cxt d70b779c92 匿评申诉：评分设置 2016-12-15 10:19:16 +08:00
huang 79fc4b7752 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 
Conflicts:
	Gemfile
	app/controllers/pull_requests_controller.rb
 2016-12-15 09:26:24 +08:00
guange 6d272d2034 解决win10浏览器乱码问题 2016-12-15 09:19:15 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 58a45e8f16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-14 15:21:56 +08:00
cxt 30dccdec90 个人首页的待匿评作品、待完成问卷 2016-12-13 13:57:25 +08:00
cxt eaaca22e4d 老师给未提交的作品评语时不应变为已提交 2016-12-13 09:49:11 +08:00