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

8723 Commits

Author SHA1 Message Date
huang f1c0347ee2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 15:12:40 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 5ae580aab0 添加用户连接 2016-05-13 15:10:34 +08:00
cxt 22523d25b8 贴吧发帖防止多次提交表单 2016-05-13 14:52:38 +08:00
huang 660cf7ef73 名师列表局部搜索 2016-05-13 14:52:33 +08:00
cxt 01287ff93c 学生打开新建的作业列表报500 2016-05-13 14:40:28 +08:00
cxt dc6c5fe18b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 14:33:16 +08:00
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
Tim 1833f15e19 课程资源库导入资源样式修改 2016-05-13 14:23:51 +08:00
huang 91f3fddb16 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:23:48 +08:00
huang 0feb1280fd 名师更多列表 
及相关入口路由
 2016-05-13 14:23:36 +08:00
Tim 4ea7d5ed57 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:08:48 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang e90da9d812 teachers页面 2016-05-13 14:00:05 +08:00
huang 3853d5b7ad 右三模式定制 2016-05-13 13:39:44 +08:00
huang 457bac0b9d 0 2016-05-13 11:30:49 +08:00
huang 7bd047f7e4 组织模式二中名师榜样式 2016-05-13 11:25:05 +08:00
huang f7a888ac3d 名师默认创建 2016-05-13 11:11:09 +08:00
cxt 979598f334 课程问答区帖子的发送防止连续提交 2016-05-13 11:06:47 +08:00
cxt 345e1c0a48 评分的回复连续点击多次防止提交多次表单 2016-05-13 10:57:45 +08:00
cxt f1821e54e1 通知和新闻详情页面的回复点击多次不会提交表单多次 2016-05-13 10:56:48 +08:00
huang 61803aa696 删除名师榜的时候局部刷新 2016-05-13 10:54:33 +08:00
huang e8d76f449f Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 10:50:47 +08:00
huang 1673ae451b 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
Linda aec7366594 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 10:31:12 +08:00
Linda a2418396dd 邦本库zip下载样式界面 2016-05-13 10:30:38 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
cxt f74e5eb6ae Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:49:13 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
Tim 2ac201ffdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:41:42 +08:00
Tim 565d5e3bcc 作业测验列表html代码重构，添加序号列 2016-05-12 17:41:27 +08:00
huang 2be8e64748 内容和查看更多重复问题 2016-05-12 16:00:23 +08:00
cxt d4c1f27533 私有作业请求分享时，强制要求写请求分享的说明文字 2016-05-12 15:29:20 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt ac5a9c87ac 消息通知中的“同意|拒绝”调整宽度 2016-05-12 14:59:12 +08:00
cxt ca5f03f2ea 作业回复的消息通知，评阅作品的消息通知修改 2016-05-12 14:13:34 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt f4b8f2c794 学生追加附件发送消息 2016-05-12 10:29:43 +08:00
cxt 9ec488684b 分享申请的消息更改 2016-05-12 09:30:06 +08:00
huang 3dde8bd25a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-11 16:21:17 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
Tim b649882a23 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-11 15:52:09 +08:00
Tim 7957beb64a 发送至按钮样式控制 2016-05-11 15:51:59 +08:00
cxt fdefbf3795 作品打分连续点击不会多次提交 2016-05-11 15:31:33 +08:00
cxt d232a5241e 新建课程报404 2016-05-11 11:47:16 +08:00
cxt 320c3881ef 多次点击发送按钮不应新建多个作业 2016-05-11 10:48:04 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
huang c28c947abc 项目动态中添加作者 2016-05-10 17:07:47 +08:00
huang a4a211448c Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-10 16:26:20 +08:00
huang f4b10d45d2 版本库鼠标经过的时候显示具体时间 2016-05-10 16:26:05 +08:00
Tim d7add63f56 二级栏目列表页回复不可点击 2016-05-10 16:03:50 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
huang cabac5914c 学生统计数 2016-05-10 13:41:21 +08:00
yuanke 629591ad00 课程、项目列表更新时间取动态表中的 2016-05-10 12:55:42 +08:00
cxt ba07e564db 老师评分的弹框 2016-05-10 11:51:41 +08:00
huang e99aa2f199 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-10 11:33:19 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
cxt 11017d72c5 老师对作品的评分可为空 2016-05-10 11:28:24 +08:00
Tim e8424d9b97 项目时间字体大小控制 2016-05-10 10:57:55 +08:00
Tim c8e0ffbdae 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00
huang ccc4ddc325 组织编辑问题 2016-05-10 10:18:47 +08:00
huang 5880a12290 sql查询 2016-05-10 10:00:28 +08:00
Tim 2461a5c918 组织门户二级目录位置重新设置 2016-05-09 19:40:53 +08:00
Tim c2e7a77150 组织门户二级菜单延迟隐藏 2016-05-09 19:23:33 +08:00
Tim b32693ca2a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-09 18:44:43 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
cxt f6d7df7393 管理员界面添加“分享作业申请”列表 2016-05-09 18:40:21 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
huang 7a0d86228a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 22:57:29 +08:00
huang 635d49cc25 course->课程动态 
project->项目动态
 2016-05-06 22:57:05 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
huang 96ce1d8d40 | 及更多问题 2016-05-06 22:35:17 +08:00
huang 6401afb850 二级目录排序同步 2016-05-06 22:30:44 +08:00
huang 9a80ff0597 右一添加“更多”链接 2016-05-06 22:21:52 +08:00
cxt 90809ea350 首页报500 2016-05-06 22:18:31 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang ece84e912d 鼠标经过显示标题 2016-05-06 21:32:37 +08:00
huang b7d87966dd 时间显示样式 2016-05-06 21:26:28 +08:00
huang 8323422f09 回复留言为空则不能提交 2016-05-06 21:19:35 +08:00
cxt 54cdd57f89 二级回复的内容与上边框的距离调整 2016-05-06 20:56:20 +08:00
huang d672c80edb 换行问题 2016-05-06 20:45:08 +08:00
huang cd0603f01b 模式二里面的链接问题 2016-05-06 20:36:06 +08:00
huang 967a76af67 图片变大的问题 2016-05-06 20:20:48 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang 86b0470b76 隐藏掉搜索功能 2016-05-06 19:02:43 +08:00
cxt 262fd8bb65 学生提交禁用匿评的作业时会弹出匿评关闭的提示 2016-05-06 18:54:51 +08:00
huang a267c75ec7 首页的隐藏可见 2016-05-06 18:50:57 +08:00
cxt c6c3625029 题目申请说明内容较长时，会导致被申请者收不到消息 2016-05-06 18:47:38 +08:00
huang 86ad0035b7 样式显示问题 2016-05-06 18:19:00 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
huang 6ba4b9dfa2 Merge branch 'yuanke' into develop 2016-05-06 18:07:24 +08:00
huang 67be99530c 左侧模式三样式修改 2016-05-06 18:06:25 +08:00