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

8300 Commits

Author SHA1 Message Date
cxt 3d1f7cc0a8 提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值 2016-03-14 15:02:37 +08:00
cxt 1aa5450e4a 题库支持按发布者、来源、类型的排序 2016-03-14 14:39:58 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
alan ce6d63ccaf 重构user.find 2016-03-14 10:24:50 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 19:31:22 +08:00
cxt 46d22980c9 Merge branch 'cxt_course' into develop 2016-03-11 19:31:06 +08:00
guange 45c51ef8db merge 2016-03-11 18:51:41 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt 1d93c6c56b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 16:18:10 +08:00
cxt e02bde6f65 作品列表支持按学生姓名和学号排序 2016-03-11 16:17:51 +08:00
huang 97a7694778 访问统计数--views 2016-03-11 15:58:16 +08:00
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 15:51:59 +08:00
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 15:49:54 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
alan 1f5c90185a 修复《顶部搜索“分析”报404错误》 2016-03-11 13:14:32 +08:00
cxt dcd13b9d6b 点击个人主页的课程和项目在新的tab页中打开 2016-03-11 11:34:16 +08:00
cxt 94c1e38066 分组作业动态中的“创建项目”更换颜色 2016-03-11 11:23:16 +08:00
cxt 2812fcd2fb 删除无用代码 2016-03-11 10:45:29 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
ouyangxuhua bc5ce1fd22 组织下的课程帖子链接参数正确传输 2016-03-11 09:31:36 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
ouyangxuhua eb3c0d9334 组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示 2016-03-10 17:33:22 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
huang 08cb7b642c 附件上传样式 2016-03-10 16:43:25 +08:00
huang 1644442d2e 修改附件描述样式 2016-03-10 16:41:56 +08:00
huang 627580a9ac 标签问题（未完） 2016-03-10 16:25:39 +08:00
cxt c255325300 添加分班 2016-03-10 15:47:03 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
huang 281d31980d Merge branch 'develop' into hjq_new_course 2016-03-10 15:02:34 +08:00
cxt 0fb808e2fd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 14:53:23 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt cd1409f950 还原学生分班 2016-03-10 14:51:31 +08:00
ouyangxuhua 6cf518e2e4 1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写 2016-03-10 14:38:33 +08:00
ouyangxuhua 680bdc3d34 组织下的链接改成https://www. 2016-03-10 14:12:50 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
cxt 8a4175dc02 点击学生作品列表中的编程作品，代码会跳到上一个作品的详情 2016-03-10 11:40:56 +08:00
cxt f8f36f9f29 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 11:15:43 +08:00
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分 2016-03-10 11:15:37 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
ouyangxuhua 16b0bf9c80 更新组织栏目优先级，如果输入不合法，则不作改变 2016-03-10 09:06:07 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang 3d2ba83c36 @消息问题修复 2016-03-09 17:22:16 +08:00
huang 5a4f422b1c 消息分页问题 2016-03-09 16:44:11 +08:00
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-09 15:29:06 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang b4800585e7 解决消息 信息500问题 2016-03-09 15:24:02 +08:00
huang 84d7049add fork弹出新页面，解决间接性500问题 2016-03-09 13:17:37 +08:00
ouyangxuhua 713c28c0b5 个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确 2016-03-09 10:25:57 +08:00
Tim d6d8e231e6 课程推荐在ie中显示bug 2016-03-09 09:46:07 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式 2016-03-08 16:44:03 +08:00
Tim 141c0be24f 上传资源弹窗样式调整 2016-03-08 15:50:01 +08:00
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式 2016-03-08 15:20:38 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
linchun 3c66a29767 完善课程资源列表，完成项目资源列表 2016-03-08 11:01:08 +08:00
cxt ca094a13b5 优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接 2016-03-08 10:16:55 +08:00
cxt f0e3fe8ff7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-08 09:13:27 +08:00
ouyangxuhua c3eb8e05cd 组织的私有资源，数量一致 2016-03-07 18:12:40 +08:00
ouyangxuhua d70df6a89d 公开组织的资源，非成员不能看到私有资源 2016-03-07 17:41:43 +08:00
cxt 64b6af6177 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-07 17:02:03 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
Tim 56372fbdd5 积分规则显示样式调整 2016-03-07 16:50:30 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop 2016-03-07 16:15:13 +08:00
cxt f8ce6d48d3 模拟答题的返回按钮应该回到课程作业列表 2016-03-07 14:31:58 +08:00
cxt e30c26aa09 课程报500 2016-03-07 13:56:28 +08:00
ouyangxuhua a0363b5511 组织资源发送后，发送次数动态增加 2016-03-07 12:57:24 +08:00
ouyangxuhua 319f286a65 解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适 2016-03-07 12:19:48 +08:00
cxt fcae91ecc1 “课程通知”改为“通知” 2016-03-07 11:27:47 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
huang 4f2937e1a2 英雄榜 2016-03-05 10:38:21 +08:00
huang a079a61c82 回复数 2016-03-05 04:29:10 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang e4d669251f 英雄榜得分 2016-03-04 21:13:24 +08:00
huang 4cf80fe441 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 21:11:07 +08:00
huang 6ce947667d 课程英雄榜提示 2016-03-04 21:10:45 +08:00
cxt 782bbc775b 公共资源库的统计 2016-03-04 21:04:21 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
huang 38fca02193 注释搜索 2016-03-04 18:36:42 +08:00
huang ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
cxt 3deaa492b2 编辑作业时作业描述被解析了 2016-03-04 18:11:23 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
cxt fd8b40a36e 对于编程作业，系统评分的前几名能否也显示出来 2016-03-04 16:53:36 +08:00
huang 91b8a81b9d 去掉全站搜索 2016-03-04 16:10:41 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt 947e6ea469 作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。 2016-03-04 16:00:20 +08:00
cxt ffac8164f1 管理员的课程和项目列表，按照时间倒排 2016-03-04 15:55:45 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt a5cb3d5e6a 新建作品时的输入框改为“请输入作品名称”、“请输入作品描述” 2016-03-04 15:14:38 +08:00
cxt d2920c64ea 题库作业发送到课程后增加提示 2016-03-04 15:12:03 +08:00
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程 2016-03-04 13:18:43 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
huang 50011985a9 课程资源库添加资源描述 2016-03-04 11:19:07 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
cxt 0cd536fcc9 题库增加发布者姓名搜索 2016-03-04 10:34:04 +08:00
huang 596d4e17e9 解决样式冲突 2016-03-04 09:57:54 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
huang 5ab9e3b5b7 资源搜索 
作业留言
 2016-03-04 09:29:20 +08:00
huang ba9b22fbe1 公共资源，删除、重命名 2016-03-03 23:56:06 +08:00
huang 3dacf900d5 修改导入公共、我的资源 2016-03-03 23:24:25 +08:00
huang ef57dc80d4 去掉项目名称 2016-03-03 18:03:30 +08:00
huang 5cf198c61a 课程教师、学生列表添加成员管理入口，项目成员列表入口 2016-03-03 17:59:36 +08:00
cxt 8e5abe997a 已禁用匿评的作业还显示匿评截止时间不合适 2016-03-03 17:39:08 +08:00
huang 8815e99db5 资源上传跳转问题 2016-03-03 17:25:52 +08:00
cxt 050257e885 作业添加挂起的状态 2016-03-03 17:24:07 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt 9b573248d8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_show_user_homework_form.html.erb
	app/views/users/_show_user_homeworks.html.erb
 2016-03-03 17:07:35 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
cxt d2cf95a32d 最近登录老师列表的超链接指向了其他用户 2016-03-03 15:43:36 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 22cbbc2476 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-02 18:41:46 +08:00
huang a0ef85f4da 导出样式 2016-03-02 18:41:20 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
Tim 486d791c72 资源名称颜色调整 2016-03-02 17:34:50 +08:00
huang c0077b7c9d 公共资源/我的资源JS实现 2016-03-02 16:54:07 +08:00
huang b3fea3e229 资源库代码封装 2016-03-02 11:30:19 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
Tim 11592bdbcc 导入题库题目弹框样式更改 2016-03-01 17:28:49 +08:00
cxt f6f84b564e 在线测验的选项和候选答案的正确显示 2016-03-01 15:18:38 +08:00
cxt 072300331b 编程测试集的输入输出添加序号 2016-02-29 17:05:11 +08:00
cxt 6ba91cb3fe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-29 08:53:31 +08:00
huang 81f54e44b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-26 19:25:36 +08:00
huang a10e973c75 版本库配置默认分支 2016-02-26 19:25:12 +08:00
cxt 7d66c06a56 复制学期多次点击“完成”会复制多个学期 2016-02-26 17:44:46 +08:00
ouyangxuhua 6e85b38b09 1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章 2016-02-26 17:11:18 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
ouyangxuhua 1951d50bf7 组织文章不显示回复框的问题 2016-02-26 16:37:13 +08:00
cxt 0b6521c921 禁用匿评的作业动态仍然显示缺评扣分 2016-02-26 16:37:02 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
Tim 100b002a1f 提交改动显示页面调整 2016-02-25 15:48:49 +08:00
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course 2016-02-25 11:19:20 +08:00
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/helpers/users_helper.rb
	app/views/users/_project_issue_detail.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
	db/schema.rb
 2016-02-25 11:17:54 +08:00
huang 8b839caa48 添加样式 2016-02-25 11:12:24 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 5e330de31a 学生看到的作业个数不包含未发布的作业 2016-02-24 16:20:59 +08:00
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-24 16:08:38 +08:00
ouyangxuhua 264c6679e0 Merge branch 'ouyangxuhua' into develop 2016-02-24 16:02:38 +08:00
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误；2.增加转发表 2016-02-24 16:01:32 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
cxt adf9465443 课程英雄榜的积分只显示一位小数 2016-02-24 10:49:48 +08:00
cxt 347efa275d Merge branch 'develop' into cxt_course 2016-02-24 09:50:53 +08:00
ouyangxuhua 035b22d6dd Merge branch 'ouyangxuhua' into develop 2016-02-23 16:49:12 +08:00
ouyangxuhua 2a26fd4e75 修改组织子域名的问题 2016-02-23 16:48:31 +08:00
ouyangxuhua c83562bfd7 组织资源过滤：如图资源数统计应该是不同过滤条件下各资源数的统计 2016-02-23 16:32:16 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
ouyangxuhua d818e1774b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-23 16:18:01 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
cxt 3540aa1952 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 15:51:38 +08:00
Tim 87f5f9c380 上传头像预览图片排版，课程关联组织取消按钮 2016-02-23 15:26:34 +08:00
cxt 070af9ad73 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 15:22:55 +08:00
cxt e4bf35a1b8 个人留言的回复不能自动刷新 2016-02-23 15:22:44 +08:00
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +08:00
ouyangxuhua 39c913f941 解决某些页面二级回复工具栏乱码问题 2016-02-23 14:52:15 +08:00
ouyangxuhua 62193ef7ff 组织页面右上角的退出、登陆、注册链接，使用类似https://www.trustie.net/域名 2016-02-23 14:12:55 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua 9c2d8f7ab6 组织二级回复中，工具栏图标乱码问题修复 2016-02-23 13:33:01 +08:00
ouyangxuhua c91ef44570 组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码 2016-02-23 12:52:04 +08:00
cxt b6bf78a5df 当天发布的资源显示未发布、日期选择器用中文 2016-02-23 11:35:07 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
huang 20b2430da9 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-22 18:11:49 +08:00
cxt d7500d1cc5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-22 18:10:31 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
ouyangxuhua 3e699ebd99 Merge branch 'ouyangxuhua' into develop 2016-02-22 17:40:16 +08:00
huang 78c70dce81 版本库用户名长度引起的错位 2016-02-22 15:52:16 +08:00
cxt 278139104b 允许老师修改开始学期 2016-02-22 15:09:07 +08:00
ouyangxuhua c1a84e2ce5 组织页面右上角的用户链接改成https://www.trustie.net的形式 2016-02-22 11:14:26 +08:00
huang efff99c05b Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:49:06 +08:00
huang 935ddc053a 解决项目500问题 2016-02-20 17:48:45 +08:00
cxt 7305b20ab0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:43:24 +08:00
cxt d84da7908d 学生查看问卷调查结果的提示 2016-02-20 17:43:15 +08:00
ouyangxuhua 9a72f5d0d7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-20 17:24:27 +08:00
ouyangxuhua 5893d7fc15 解决问题：组织资源栏目页面，点击展开更多报500 2016-02-20 17:24:08 +08:00
huang 59d45f2d52 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:18:49 +08:00
huang 6f9d4eccbe 解决合并引起的问题 2016-02-20 17:17:12 +08:00
Tim 954e61433b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:01:10 +08:00
Tim 55b13e7dde 历史版本样式更改 2016-02-20 17:00:21 +08:00
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2016-02-20 16:59:58 +08:00
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:58:20 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:49:19 +08:00
huang 75214f0211 新课导语修改：导语的时候显示trustie信息 2016-02-20 16:45:45 +08:00
huang 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:19:53 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
cxt 8138da71aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:18:37 +08:00
cxt e04e80d64d 跨越多个学期的课程学期的显示 2016-02-20 16:18:28 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
 2016-02-20 11:13:38 +08:00
ouyangxuhua 72c0173256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 11:06:37 +08:00
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
cxt 7f32b9fb40 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 10:51:33 +08:00
cxt 1e13279440 学生查看问卷调查结果 2016-02-20 10:51:26 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
huang aa22a253ba “发送至”弹框飘动问题 2016-02-20 09:45:37 +08:00
huang 1c4e3545c7 资源弹框剧中 2016-02-19 14:16:26 +08:00
huang db1bffd7db 资源弹空白框问题 2016-02-19 13:23:32 +08:00
guange a421e8c6fa 组织文章无法编辑问题 2016-02-18 14:29:46 +08:00
guange c7bfe8f20f 组织首页异常 2016-02-06 12:04:43 +08:00
guange 10eeeaa95c 弹出框居中 2016-02-03 23:30:07 +08:00
cxt 8b5896ae1c 弹框的拖动 2016-02-03 13:32:05 +08:00
cxt 89599d8679 编辑组织帖子 2016-02-03 13:04:48 +08:00
cxt 2cc24e2d4b 组织帖子的新建 2016-02-03 12:57:30 +08:00
ouyangxuhua 02f8007557 修改组织配置的样式；修改一个bug 2016-02-03 12:42:42 +08:00
cxt 0a0d67642a 导入作业 2016-02-03 12:17:45 +08:00
cxt e6d4d7d0cb 描述框的自动增高 2016-02-02 17:16:50 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-02 15:57:23 +08:00
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/user_import_homeworks.js.erb
	db/schema.rb
 2016-02-02 15:55:07 +08:00
ouyangxuhua 0b5aa4b81e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-02 15:53:14 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
ouyangxuhua d820977d5d Merge branch 'develop' into ouyang 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/courses/syllabus.html.erb
	app/views/messages/_org_subfield_show.html.erb
 2016-02-02 15:51:18 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
cxt ea8e73ad54 弹框的拖拽 2016-02-02 15:47:12 +08:00
Tim f3bcb3ca47 导入题库弹框位置调整 2016-02-02 15:23:23 +08:00
ouyangxuhua dab99eb044 回复框样式修改 2016-02-02 13:38:37 +08:00
guange f3a0e71cee issue中回复at列表不正常 2016-02-02 11:38:04 +08:00
Tim 105393548b 点击详情页面文本格式调整 2016-02-02 11:23:17 +08:00
Tim 619144224e 文本框格式问题 2016-02-02 10:08:04 +08:00
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
cxt 4d048ec596 课程推荐的课程列表中，为0的不显示 2016-02-01 11:12:04 +08:00
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-01 10:41:30 +08:00
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-01 10:14:04 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh 2016-01-29 21:16:27 +08:00
guange 63596c2ca5 留言应该为JournalsForMessage 2016-01-29 21:14:44 +08:00
ouyangxuhua 7bdec9c182 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 20:05:24 +08:00
ouyangxuhua 50bac16d7c 组织子域名申请信息提示 2016-01-29 20:05:04 +08:00
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 19:44:04 +08:00
cxt 82fb50ccd2 课程学生列表的作业积分不一致 2016-01-29 19:22:10 +08:00
ouyangxuhua 45bf2ef88a Merge branch 'develop' into dev_hjq 2016-01-29 19:00:15 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
ouyangxuhua 68bd109831 对子域名申请，增加是否批准的提示 2016-01-29 17:26:28 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 16:52:14 +08:00
ouyangxuhua 3aaa078a4b 组织动态添加项目动态 2016-01-29 16:26:00 +08:00
Tim 674a8e0035 单词折行问题 2016-01-29 16:16:02 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
 2016-01-29 15:44:26 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt a613b58b46 编程作业弹框的高度设置 2016-01-28 11:08:16 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua 4b95ee95c0 组织帖子栏目讨论区中的帖子，在登陆情况下就能发送；在组织栏目中，对帖子栏目讨论区增加编辑、删除、发送选项。 2016-01-27 16:12:34 +08:00
ouyangxuhua 38a87a04ba 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag，增加“双击可编辑”的tips 2016-01-27 15:50:31 +08:00
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突 2016-01-27 15:29:15 +08:00
guange d2c6d9272c 输出结果匹配\r问题 2016-01-27 11:35:27 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt af7ca36c92 学生加入课程或退出课程 2016-01-26 15:59:39 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
Tim 76063b0911 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_project_info.html.erb
 2016-01-26 15:08:38 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
Tim 821ade7985 作业列表优化，课程加入退出 2016-01-26 11:00:24 +08:00
ouyangxuhua f3dcd4ed09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-26 10:59:44 +08:00
ouyangxuhua 63d1d3a8e7 项目动态中，只要是项目成员就显示编辑issue多属性界面 2016-01-26 10:59:28 +08:00
ouyangxuhua dda64245b3 解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。 2016-01-26 10:35:54 +08:00
Tim 6a83a9b55c 问题跟踪样式更改 2016-01-25 15:43:37 +08:00
cxt b6e13340e5 个人留言的删除功能 2016-01-25 15:33:50 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim a2afec77e3 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-01-25 11:32:55 +08:00
Tim f099611d7a 问题跟踪样式更改 2016-01-25 11:25:43 +08:00
cxt 12f55f039c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-25 10:16:43 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
cxt d386b2ff84 留言页面的“展开更多” 2016-01-22 22:37:47 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
huang b3caa01540 修改课程作业链接 2016-01-22 20:45:25 +08:00
huang 655cc0d2db issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接，留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang 29c49fbb0c Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:03:13 +08:00
huang f2d93c0b72 修改issue编辑权限 2016-01-22 20:02:18 +08:00
ouyangxuhua 4b183c2928 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 19:50:01 +08:00
ouyangxuhua afad062b80 设置资源栏目、项目资源、课程资源的title,不显示Files 2016-01-22 19:49:05 +08:00
huang 007afa8c4f issue在动态中回复自动刷新 2016-01-22 19:34:02 +08:00
cxt c4a264f8a6 提交作品时的附件显示 2016-01-22 18:48:50 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00
huang faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
cxt 0b2184c3d9 组织栏目的通知附件显示 2016-01-22 17:16:24 +08:00
ouyangxuhua d4c3cb8777 Merge branch 'develop' into dev_hjq 2016-01-22 17:13:46 +08:00
ouyangxuhua 0a9ecac3db 帖子栏目讨论区链接问题修复 2016-01-22 17:12:59 +08:00
cxt e09f795171 附件的显示 2016-01-22 17:05:58 +08:00
ouyangxuhua b5bfa6d824 1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。 2016-01-22 16:56:36 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
ouyangxuhua b5159d54c8 博客按更新时间排序 2016-01-22 15:05:52 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
ouyangxuhua d7b17b455d Merge branch 'szzh' into develop 2016-01-22 10:27:32 +08:00
cxt 6789693fc7 已评分作品超过5个时，作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
huang 4f7d4bb4aa Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-01-22 09:58:08 +08:00
huang e871c6823f Merge branch 'develop' into hjq_new_course 2016-01-22 09:57:45 +08:00
huang 59aa1e9c6f issue截止修改 2016-01-22 09:55:58 +08:00
cxt fea4f79dc8 组织帖子栏目的通知增加点赞tip 2016-01-22 09:47:18 +08:00
ouyangxuhua 8ef3018adc issue局部刷新使用update,方式是put 2016-01-22 09:41:05 +08:00
huang 42cc8bc69e issue属性刷新 2016-01-22 09:30:52 +08:00
huang 448a412abf issue详情页面在 user动态、project动态中修改 2016-01-21 17:29:46 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
huang e2fc88e3d1 课程讨论区样式混乱的问题 2016-01-21 16:14:39 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后，跳转到个人首页 2016-01-21 16:11:06 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
huang 0ba724776e 项目版本库左侧添加提交次数统计 2016-01-21 16:06:50 +08:00
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
cxt 99cda66d00 编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送” 2016-01-21 15:02:12 +08:00
ouyangxuhua 6b44b93f0e 在通知详情页面，也有发送按钮 2016-01-21 14:54:20 +08:00
cxt 5672b029fe 导入作业加提示语 2016-01-21 14:50:16 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
cxt f15847371c 附件显示过长 2016-01-21 10:36:30 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
huang c7522067e6 修改base界面 2016-01-20 18:37:39 +08:00
huang 01016c67a9 issue属性局部刷新 2016-01-20 18:28:27 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +08:00
cxt 945ed84276 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 09:27:38 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-20 09:27:29 +08:00
ouyangxuhua 18e79ba9b3 未登陆情况下，可以看到组织文章列表及首页全部内容 2016-01-20 09:25:12 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
ouyangxuhua e70e1beb5d Merge branch 'szzh' into dev_hjq 2016-01-19 16:59:04 +08:00
ouyangxuhua 7acfc22ee1 未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常 2016-01-19 16:58:15 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt 6e582fa631 老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语 2016-01-19 09:55:28 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
cxt b4521d3582 课程/项目首页的更多默认收起 2016-01-18 16:18:40 +08:00
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
cxt 9cabb0248a 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
ouyangxuhua 5e102d24dd 解决个人博客报500的问题 2016-01-18 11:01:04 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织，栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
huang 8b815f95bb Merge branch 'develop' into hjq_new_course 2016-01-18 08:55:35 +08:00
huang b2746d0953 课程讨论区总数计入回复数 2016-01-15 16:30:17 +08:00
huang f52e74da61 修改issues总数读取方式 2016-01-15 16:11:26 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
ouyangxuhua b9359b1cee 显示url申请 2016-01-15 13:15:17 +08:00
huang b6ae14a1ce 课程更多字体12 2016-01-15 12:51:50 +08:00
huang 81b32ea643 点击铃铛弹出新tab页 2016-01-15 12:39:38 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 10:24:37 +08:00
ouyangxuhua 16a3a7d06d 隐藏url定制 2016-01-14 21:42:28 +08:00
ouyangxuhua 7ad377f458 修改一些bug 2016-01-14 21:29:43 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
ouyangxuhua 5097f19ec8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb
 2016-01-14 18:30:05 +08:00
ouyangxuhua 1c62edbed4 项目设为私有title更新 2016-01-14 18:26:36 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题 
项目得分添加讨论回复计算
 2016-01-14 18:25:42 +08:00
cxt 894c97304c 冲突 2016-01-14 18:24:07 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
cxt cef9fd96cd 组织帖子的动态点赞 2016-01-14 18:05:58 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh 
Conflicts:
	db/schema.rb
 2016-01-14 17:54:16 +08:00
ouyangxuhua 276b07df8a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 17:53:22 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
 2016-01-14 17:35:25 +08:00
huang a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +08:00