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

18145 Commits

Author SHA1 Message Date
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt ef78de1a9c 班级分组作业：评分设置中勾选启用匿评申诉，点击确定按钮报500 2016-12-17 14:50:40 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt f7f1c68576 匿评申诉的错别字、匿评申诉：评阅人、老师或助教点击收到的申诉消息返回对应的作品列表，建议定位到对应的作品 2016-12-17 14:10:51 +08:00
cxt d9dcb3b291 “我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面 2016-12-17 10:41:30 +08:00
陈晓婷 feca94ffc0 Merge branch 'cxt_course' into 'develop' 
上线bug修复



See merge request !70
 2016-12-17 10:35:56 +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
陈晓婷 fd889805ec Merge branch 'develop' into 'develop' 
个人主页样式调整

个人主页样式调整

See merge request !69
 2016-12-17 10:22:27 +08:00
cxt d6c51cce2a 首页：如图关注列表中添加关注、取消关注后关注数统计未自动刷新 2016-12-17 10:20:08 +08:00
daiao b76dd30b6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 10:17:34 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt e29eb67f68 课程列表中删除课程确认弹框中“关闭”改为“取消” 2016-12-17 10:07:51 +08:00
cxt d876962f05 课程社区和项目社区的左侧列表无法收回 2016-12-17 09:53:23 +08:00
cxt 16fe5f58a1 详细列表的样式调整 2016-12-17 09:38:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
huang ea3b71df8d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 21:01:27 +08:00
huang de86584850 个人主页 我的issue 分页不能点的问题 2016-12-16 20:58:53 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 0c8774416e 个人主页样式调整 2016-12-16 20:50:48 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
cxt 48045cf85b 首页消息列表样式调整 2016-12-16 19:55:38 +08:00
黄井泉 7d31f5c7d4 Merge branch 'develop' into 'develop' 
个人主页 系统消息显示30天前



See merge request !66
 2016-12-16 19:40:51 +08:00
huang 611494ec93 系统消息只显示30天前的 2016-12-16 19:36:37 +08:00
huang 7a28564239 项目404问题 2016-12-16 19:09:03 +08:00
cxt 7777e63647 首页消息列表样式修改 2016-12-16 19:08:54 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
黄井泉 f833c38e0a Merge branch 'cxt_course' into 'develop' 
本周上线任务



See merge request !65
 2016-12-16 16:58:56 +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
黄井泉 13073dca28 Merge branch 'develop' into 'develop' 
个人主页样式调整

个人主页样式调整

See merge request !63
 2016-12-16 16:45:50 +08:00
daiao 4642e0cd11 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:42:13 +08:00
daiao e773ba2aa8 个人主页样式调整 2016-12-16 16:41:55 +08:00
黄井泉 cebb9dd2eb Merge branch 'develop' into 'develop' 
项目模块的一些修改



See merge request !62
 2016-12-16 16:33:41 +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
daiao 122d3964ed 个人主页样式调整 2016-12-16 16:25:18 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
daiao db3d403ec9 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 16:12:30 +08:00
cxt 552b6429ef 消息列表的样式调整 2016-12-16 16:11:19 +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