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

732 Commits

Author SHA1 Message Date
daiao 4646d13234 1.修改资源课程名称，竟可能显示全。 
2.班级动态下，去掉“班级动态>”
 2016-07-25 18:54:44 +08:00
cxt 1e0ed2bfba 新建课程和班级时的占位符需要更改 2016-07-25 14:54:57 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +08:00
cxt dc9c0f924b 教师列表和学生列表的样式 2016-07-22 18:39:50 +08:00
cxt 48d5b89338 课程推荐为0的不显示 2016-07-22 18:26:48 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
cxt 808b553e43 班级动态只有10条，底部却显示“点击展开更多” 2016-07-22 16:50:32 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
cxt 7ea5d7d934 新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
daiao 304f18ac5e 修复课程中，对动态进行筛选的页面呈现方式 2016-07-12 15:05:42 +08:00
cxt 955c258856 复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程 2016-07-12 10:35:52 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
daiao 670b443cc4 Merge branch 'develop' into daiao_dev 2016-07-11 10:38:46 +08:00
daiao 41fc812ca4 修复班级配置--添加成员：用户名称太长的问题 2016-07-07 17:34:38 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
Tim b91d6a3273 班级动态筛选框样式调整 2016-07-05 16:31:36 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
cxt eff4780ea9 去掉班级配置页面的自动填充 2016-07-05 14:29:42 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
yuanke 70e26927cb 班级中的课程字样改为班级 2016-07-01 20:38:33 +08:00
cxt 8b87c141cc bug修复 2016-07-01 17:47:35 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
cxt f984a01cdc 跳转协议问题 2016-06-24 18:50:47 +08:00
cxt 8d5501615c 加入课程的样式调整 2016-06-24 18:09:18 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
cxt 1b12c56960 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 16:53:36 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
Tim fd765b1d73 设置课程大纲弹框js控制 2016-06-21 15:17:24 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-06-17 14:36:12 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
cxt 439841fbd7 从课程动态页面打开的匿评设置日期选择界面显示为英文，从作业页面打开的匿评设置日期选择界面为中文，应该统一为中文 2016-06-16 16:10:42 +08:00
cxt 00528bec60 学生列表没有分班就不显示分班列 2016-06-12 14:50:47 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名 2016-06-01 15:35:26 +08:00
cxt fa73171818 点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列 2016-06-01 14:58:59 +08:00
cxt f024764e29 课内学生看到的学生列表中学生“姓名”不应显示昵称 2016-05-30 14:59:05 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
cxt 3b33732e6f 学生列表的姓名、学号、分班和加入时间做成不可点击的 2016-05-27 14:15:26 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能 
2.所有自动识别URL区域的链接颜色都改为#15bccf
 2016-05-24 09:11:50 +08:00
cxt 6479ace5e1 作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制 2016-05-20 16:19:10 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
cxt 5204e01ee8 课程留言回复的还原 2016-05-13 18:12:06 +08:00
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
cxt d232a5241e 新建课程报404 2016-05-11 11:47:16 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
cxt 55718f2d44 设置课程大纲时若博客标题太长以省略号结束 2016-05-05 11:34:31 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
cxt 3b4f6f4846 添加分班和修改分班名称时刷新学生列表 2016-04-14 17:24:56 +08:00
cxt 4e4eb7b759 学生作业积分默认显示两位小数 2016-04-14 14:50:33 +08:00
yuanke 36f3d61915 Merge branch 'yuanke' into develop 2016-04-14 14:36:30 +08:00
yuanke 25fd655a56 修改转不到查重结果页面的BUG 2016-04-14 14:35:50 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
cxt d967a31ec9 课程报500 2016-03-18 16:07:34 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
cxt e167a28d49 课程推荐的作业统计 2016-03-18 14:59:34 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00