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

8772 Commits

Author SHA1 Message Date
huang aee695e94d 组织动态添加poll、 2016-04-01 11:48:13 +08:00
huang 25da925497 课程列表显示内容统一 2016-04-01 11:38:20 +08:00
huang 638280a07e 样式问题 2016-04-01 10:31:16 +08:00
huang 8f4ff2bf91 列表样式问题 2016-04-01 10:20:31 +08:00
huang 92a08dc606 作业500问题 
admin组织编辑500问题
 2016-04-01 09:37:31 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
huang 5ce14991cf 新闻链接问题 2016-03-31 21:32:19 +08:00
huang 12c3de6dc9 500问题 2016-03-31 21:14:07 +08:00
huang d71035159a 修改more链接 2016-03-31 20:54:01 +08:00
huang ba658e44c0 组织more权限 2016-03-31 20:46:55 +08:00
huang 5866dfb7ff 登录 
没内容more
logo不加链接
 2016-03-31 20:12:20 +08:00
huang 865f274c61 修改登录 2016-03-31 19:56:29 +08:00
huang 230dab6d9d 栏目样式 2016-03-31 19:42:05 +08:00
huang 1fdd562bd3 修改组织一些功能jibug 2016-03-31 19:33:43 +08:00
huang 756a2db4aa 组织配置样式问题 
链接more空白问题
 2016-03-31 19:04:31 +08:00
huang 67d1798163 修改news500问题 2016-03-31 18:11:29 +08:00
huang 7490c7f90d 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang 6af8c48d3b Merge branch 'hjq_beidou' into develop 2016-03-31 17:06:30 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
linchun 2af261056c h回复改过的分页错误代码，修改有误 2016-03-31 15:33:48 +08:00
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-31 15:25:24 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
linchun 914117230e 解决管理员界面用户列表报500错误的bug，，分页错误 2016-03-31 15:15:11 +08:00
huang cf946687d0 类型 2016-03-31 14:02:35 +08:00
huang 3465a39285 添加配置 
隐藏不显示
 2016-03-31 13:07:12 +08:00
cxt 37e3377fd3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new 2016-03-31 09:44:35 +08:00
cxt 6a5b79cf6d 管理员的作业页面报500 2016-03-31 09:44:21 +08:00
huang da1438b04e Merge branch 'hjq_beidou' into develop 2016-03-30 19:34:03 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang b64e8a5f9e 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
huang bded9f2e98 图片自动获取功能 2016-03-30 18:35:47 +08:00
huang 0244008b32 一些链接和样式 2016-03-30 17:33:22 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列 2016-03-30 14:17:12 +08:00
huang f2106d0045 more链接添加，区分两种模式 2016-03-29 20:33:16 +08:00
huang a26cf19b86 配置中配置模式 2016-03-29 20:14:07 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
cxt c59ee4b35c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 18:25:16 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
cxt 668a724064 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new 2016-03-29 18:22:51 +08:00
cxt 69373468ae 作品详情打不开 2016-03-29 18:22:41 +08:00
alan 9452254b62 去掉缓存机制 2016-03-29 17:39:20 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
alan e4fc9f39e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 16:43:52 +08:00
yuanke be1351a4d8 Merge branch 'yuanke' into develop 2016-03-29 15:56:02 +08:00
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG 2016-03-29 15:54:44 +08:00
alan 03d855f5d5 修改资源区分页问题 2016-03-29 15:46:13 +08:00
ouyangxuhua 7f0959c972 题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式 2016-03-29 15:25:22 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
cxt 3a4265a0dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 12:49:19 +08:00
cxt 8d6093f1b9 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.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-03-29 12:42:12 +08:00
ouyangxuhua 56f8d4854b 恢复代码 2016-03-29 12:38:02 +08:00
alan e9069f0225 fix merge bug 2016-03-29 12:29:23 +08:00
alan eb1c6ccf85 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.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-03-29 11:36:49 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
ouyangxuhua 598f69abb0 组织显示模式暂时隐藏 2016-03-29 09:35:07 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
cxt 8e7d25a483 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-28 17:20:52 +08:00
cxt f46985c8bc 作品点赞报500 2016-03-28 17:20:46 +08:00
huang 64f13a04cc 动态500问题 2016-03-28 17:09:42 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 74a4e80795 Merge branch 'ouyangxuhua' into hjq_beidou 2016-03-28 15:11:37 +08:00
huang 9fc227d619 资源库问题 2016-03-28 14:50:26 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
ouyangxuhua 67ff9fb6e2 组织显示模式功能 2016-03-28 13:03:13 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
yuanke 2ceef7d3e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 21:12:22 +08:00
yuanke ef49715b08 编程测试加个results为空判断 2016-03-25 21:11:13 +08:00
yuanke a58ba8080c 编程作业加个日志 2016-03-25 21:06:25 +08:00
huang c7c96e0c6a 公共资源附件名编辑问题 2016-03-25 20:37:32 +08:00
huang fc006d64bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:45 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
cxt 0d5bad1ddd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:00 +08:00
cxt 35faa12d4d 组织编辑文章无法提交 2016-03-25 20:10:53 +08:00
ouyangxuhua f0d6bb7fae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:08:20 +08:00
ouyangxuhua 26b81fb8b3 组织文章列表回复问题解决 2016-03-25 20:07:55 +08:00
huang 777e585d4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:21:07 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
ouyangxuhua 00d2542964 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:09:48 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
alan e764075bd6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:36:53 +08:00
alan 16831e19d9 merge 晓婷的课程留言 2016-03-25 17:34:32 +08:00
ouyangxuhua 2261081dc2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:17:15 +08:00
alan 6862480632 修改当用户没有项目时，报错 2016-03-25 17:16:45 +08:00
ouyangxuhua cca2527401 组织栏目新建文章样式调整 2016-03-25 17:16:36 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
yuanke 4c47dae88b Merge branch 'develop' into yuanke 2016-03-25 16:38:21 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +08:00
alan 3b48b3add7 refactor cache 2016-03-25 16:26:33 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
alan 4f5e083707 优化个人主页，缓存设置 2016-03-25 16:06:14 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
huang e02ad85bbb 项目动态关联优化（主要优化查询次数） 2016-03-25 15:58:17 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
ouyangxuhua 9f8ad41533 Merge branch 'ouyangxuhua' into develop 2016-03-25 15:42:37 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
alan aeb694a68e 修改《删除blog_comment时删除user_activities内容》 2016-03-25 13:57:00 +08:00
ouyangxuhua 7b24b053a5 Merge branch 'develop' into ouyang 2016-03-25 12:35:13 +08:00
ouyangxuhua 5cc31fb511 组织资源栏目排序，带过滤条件，如tag类型、搜索条件等 2016-03-25 12:30:33 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
alan 04b4823ac2 user_activities 加cache 2016-03-25 10:27:28 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 9cbe719c5e 项目动态表添加索引 2016-03-24 16:44:54 +08:00
huang 88185b1f34 点击作品消息，作品展开 2016-03-24 15:04:50 +08:00
huang 77419dc2d4 Merge branch 'develop' into hjq_new_course 2016-03-24 14:00:45 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
alan a0e11a787f 修改个人主页不能展开更多 2016-03-24 13:57:01 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
alan 0d049bbe1f refactor new_base_user 2016-03-24 10:07:39 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
cxt fe35bb3b44 学生打开作品列表报500 2016-03-23 14:42:27 +08:00
ouyangxuhua 6b3e9ba4b3 新建组织时，点击私有或者公开选项，允许游客下载选项及时响应 2016-03-23 14:29:30 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
cxt f90b25b230 作业附件的用户名省略号太早 2016-03-22 15:50:06 +08:00
ouyangxuhua fcb189d874 编辑组织栏目的顺序时，不需要弹窗 2016-03-22 14:10:36 +08:00
ouyangxuhua 675b1ad403 1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。 2016-03-22 13:51:19 +08:00
huang e20fe85ddf 消息去掉tip 2016-03-21 18:16:50 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
ouyangxuhua 4fa1288411 添加组织栏目后，栏目子域名输入框设置为空 2016-03-21 12:29:25 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
cxt 74e77bf347 题库的来源排序不可用 
题库的分布时间排序
 2016-03-18 16:23:24 +08:00
cxt fdcd44e240 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:07:43 +08:00
cxt d967a31ec9 课程报500 2016-03-18 16:07:34 +08:00
alan 7d4e0c5d8a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:00:00 +08:00
alan 20cdec0cab Merge branch 'alan_develop' into develop 2016-03-18 15:59:21 +08:00
alan 66d2558f87 修复《issue具体页面样式》 2016-03-18 15:58:23 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
huang 0413eb1c02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:23:53 +08:00
alan 2b07671d95 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:21:01 +08:00
huang 8b09be83e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:18:31 +08:00
huang fc6210eada 资源导入，搜索条件中导入400问题 2016-03-18 15:17:49 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
cxt e167a28d49 课程推荐的作业统计 2016-03-18 14:59:34 +08:00
ouyangxuhua c64910d343 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt a482b76207 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt dc4a7ee2e6 Merge branch 'cxt_course' into develop 2016-03-18 14:53:43 +08:00
cxt e34f2e45db 管理员界面的课程列表和项目列表分页 2016-03-18 14:53:06 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
cxt b1f3395bd1 修改作品描述框和名称框的提示文字 2016-03-18 14:45:42 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
linchun 66a7827eb2 组织列表增加分页功能，学校列表调整分页 2016-03-18 12:55:55 +08:00
linchun f8a88767c0 管理员用户列表增加单位信息 2016-03-18 12:44:16 +08:00
huang 2fe1100da6 去掉课程使者帖子中时间 2016-03-18 12:34:41 +08:00
huang 888c024e9e 资源库ajax局部刷新 2016-03-18 12:23:59 +08:00
huang 4876e6669a 课程附件局部刷新 2016-03-18 11:04:43 +08:00
cxt 119b12349b 作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交 2016-03-18 10:56:35 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
alan 6f5a4d429d 修改《issue详情页面样式乱了》 2016-03-17 21:17:30 +08:00
cxt 2466184d8a 编辑作业的时候，还要选择作业发布的课程不合理，影响体验 
编辑作业时layout根据来源而不同
 2016-03-17 17:34:29 +08:00
ouyangxuhua 34d1aef256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 17:09:04 +08:00
ouyangxuhua 282a720916 私有组织下的资源栏目，没有发送文件功能 2016-03-17 17:08:42 +08:00
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:37:24 +08:00
huang cefa6efc1b 项目动态中加入附件 2016-03-17 16:36:57 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 368c70b14d Merge branch 'cxt_course' into develop 2016-03-17 16:23:38 +08:00
cxt 1489c8d924 课程简介没有内容就不要显示 2016-03-17 16:22:29 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
cxt 602864bd71 个人主页课程列表: 1、增加学期信息 2、排序不对 2016-03-17 16:17:33 +08:00
cxt 10da3e1e53 题库样式调整 2016-03-17 16:11:04 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
cxt 0f80f0e377 作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了 2016-03-17 15:54:10 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
cxt a1f393c117 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:21:09 +08:00
cxt 2eefdcd0ee 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:17:00 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 8e41b19563 消息列表取消tip 2016-03-17 15:09:08 +08:00
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
huang ee40255d7e 资源库bytes改成b 2016-03-17 14:09:13 +08:00
huang 0d1fc409d1 版本库提示同一高度 2016-03-17 13:58:55 +08:00
huang ab3fc0fb2c 成员提供真实姓名 2016-03-17 13:02:32 +08:00
huang c8eb2d9c95 项目、组织添加资源历史版本下载 2016-03-17 12:49:00 +08:00
huang b3faef601b 修复资源库样式问题 2016-03-17 12:43:35 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
ouyangxuhua 805784a858 组织内的链接加上Setting.protocol 2016-03-17 10:52:19 +08:00
huang 0a881f14e8 导入添加自动搜索 2016-03-16 17:06:11 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
alan 3b63071dee 修复《issue的展开和收起在属性表格的上面》 2016-03-16 15:12:50 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop 2016-03-16 11:16:41 +08:00
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限 2016-03-16 10:00:21 +08:00
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天 2016-03-15 17:21:12 +08:00
cxt e97690e2f2 “导入作业”改为“从题库选用” 2016-03-15 16:47:57 +08:00
cxt 90d664bbca 学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。 2016-03-15 16:36:10 +08:00
huang a10475fa65 公共资源删除、新建代码优化 2016-03-15 16:28:35 +08:00
linchun 7d5a5f1de2 完成项目资源列表中的排序（资源大小，上传时间，下载次数） 2016-03-15 16:14:53 +08:00
linchun 3fcf192430 完成了课程资源列表的排序（上传时间，资源大小，下载次数） 2016-03-15 15:59:49 +08:00
huang 22ce591c36 资源库添加搜索过滤 2016-03-15 15:42:20 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +08:00
ouyangxuhua 70f4bb1c14 Merge branch 'develop' into ouyangxuhua 2016-03-15 14:22:38 +08:00
ouyangxuhua fe0d31d9c4 1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示 2016-03-15 14:17:06 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
linchun 4da8a3828f 用户最新列表单位完成，修改了点击最后两页报错的问题 2016-03-15 09:47:27 +08:00
linchun df4ad9f597 完成管理员界面最近登录列表单位信息 2016-03-15 09:31:35 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
huang 3bfaddc80f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-14 18:31:09 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
huang a7990a4c3c Merge branch 'yuanke' into develop 2016-03-14 18:25:26 +08:00
ouyangxuhua c0edd91c3d 登陆注册链接改为www. 2016-03-14 18:20:19 +08:00
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
huang a1cae3f592 admin教师单位获取 2016-03-14 17:50:07 +08:00
ouyangxuhua 46b50ab065 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-14 17:46:47 +08:00
linchun a1bef60bb5 Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun 2016-03-14 17:41:14 +08:00
linchun 96f65f338c 用户列表添加单位 2016-03-14 17:40:49 +08:00
huang 3d06d5a503 Merge branch 'yuanke' into develop 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-14 17:31:53 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
cxt d2a8acf87b 个人主页--首页显示不全，右下角也应该显示展开按钮 2016-03-14 17:11:23 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
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
guange f53d9e19f7 修改菜单 2016-03-01 17:55:03 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
Tim 11592bdbcc 导入题库题目弹框样式更改 2016-03-01 17:28:49 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange a59f65a455 wechat 2016-03-01 16:13:37 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
guange 4d1969e715 修改wechat配置 2016-03-01 15:42:37 +08:00
guange 42edbce8f2 修改wechat配置 2016-03-01 15:41:33 +08:00
guange b5a8625e40 修改wechat配置 2016-03-01 15:39:18 +08:00
guange 4802743aed 修改wechat配置 2016-03-01 15:37:48 +08:00
guange 9872e05b95 修改wechat配置 2016-03-01 15:36:30 +08:00
guange b1a95d4a53 修改wechat配置 2016-03-01 15:32:44 +08:00
guange d1e29220da 修改wechat配置 2016-03-01 15:26:37 +08:00
guange e2ecd54663 修改wechat配置 2016-03-01 15:24:30 +08:00
guange e32fdf6bcb 修改wechat配置 2016-03-01 15:21:20 +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
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +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