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

1212 Commits

Author SHA1 Message Date
txz 938bf48d08 点赞功能修改 2016-04-07 15:26:23 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
txz eb996280a6 点赞功能 2016-04-07 15:07:37 +08:00
cxt f1783c06a2 详情页面传参openid 2016-04-07 14:24:15 +08:00
txz 3008c0c44d activities.html冲突解决 2016-04-07 14:16:51 +08:00
txz 0b1b08bd3d 点赞 2016-04-07 14:15:19 +08:00
guange 80f47476cb Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-07 13:58:23 +08:00
guange 99f39696d0 点击展开功能完成 2016-04-07 13:57:38 +08:00
txz 6d8ffabb39 代码优化 2016-04-07 11:40:20 +08:00
guange 8ac8e1c9e5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 11:23:15 +08:00
guange 79dcd48d8c 重构 2016-04-07 11:22:22 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
txz ec47fb1949 项目缺陷详情页面修改 2016-04-06 19:29:00 +08:00
txz a1ef398b9d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 16:24:41 +08:00
txz 422621759e 项目讨论区详情修改 2016-04-06 16:24:35 +08:00
cxt 20bb8c1e09 留言详情页面 2016-04-06 16:23:21 +08:00
txz 6115e374bf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 15:34:59 +08:00
txz a1a9dbd8a3 项目讨论区详情页面 2016-04-06 15:34:54 +08:00
guange 42bd2dcfc5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-06 15:23:48 +08:00
guange 3ee79a6889 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-06 15:23:20 +08:00
guange 70c2c9cc9f 把activities列表存起来,防止返回时页面变空 2016-04-06 15:19:18 +08:00
txz c9687a8764 课程通知详情页面 2016-04-06 14:44:35 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +08:00
txz 18cda892d9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:43:31 +08:00
cxt be30ac889b 冲突 2016-04-06 09:43:04 +08:00
txz 0d04f996c5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:40:53 +08:00
cxt 035b47d2b7 issue页面的调整 2016-04-06 09:38:46 +08:00
guange 606599047d 详情页出错 2016-04-05 17:35:27 +08:00
guange 23ec67b2eb 详情页出错 2016-04-05 17:23:36 +08:00
guange afd779f292 使用cookies存储openid 2016-04-05 17:19:00 +08:00
guange 80d5424ff3 详情页出错 2016-04-05 16:36:18 +08:00
guange 619b07b5c2 服务器上调试openid成功 2016-04-05 16:32:42 +08:00
txz 50c6b565e7 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 16:32:38 +08:00
txz 11651fc866 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 15:58:11 +08:00
guange bb5a527f9e 配置新菜单 2016-04-05 15:57:19 +08:00
txz b2a892bd22 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 15:12:50 +08:00
guange 417484f3ad 加入调试标志 2016-04-05 15:12:05 +08:00
txz 48e26fce62 冲突解决 2016-04-05 10:43:51 +08:00
txz 8c7de04dbf 项目问答详情页面 2016-04-05 10:30:25 +08:00
guange 36f3e3a46c 改为angularjs实现 2016-04-04 22:24:13 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
guange 9c93b3f9a6 修改openid调用位置 2016-04-02 07:43:55 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
guange 5839959f0a 修改openid调用位置 2016-04-02 07:32:40 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
cxt d47f887fd1 issue回复的修改 2016-04-01 23:48:29 +08:00
cxt bc5e455f0f 解决冲突 2016-04-01 23:25:19 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
txz d45604c4a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:21:25 +08:00
txz 3b70970651 问题跟踪详情页面修改 2016-04-01 23:21:18 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
ouyangxuhua 9e599da365 组织动态，点击展开更多没有反应问题解决 2016-03-29 15:47:05 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管 2016-03-29 09:02:54 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/javascripts/wechat/wechat-dev.js
 2016-03-28 14:47:11 +08:00
Tim a9fd79ec63 微信动态筛选 2016-03-28 14:45:11 +08:00
guange d5124e128e 添加调试功能 2016-03-26 15:56:36 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
yuanke 5116d75eb7 编程作业空格用□表示 2016-03-26 14:48:57 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +08:00
yuanke e62ee2eade 修改评测问题 2016-03-26 13:44:13 +08:00
yuanke 63ae921c40 return 放错位置了 2016-03-25 17:07:06 +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
yuanke 3c1be19702 修改编程提示语句 2016-03-25 15:41:14 +08:00
yuanke 1f9d2ceffb 修改下编程的提示 2016-03-25 15:38:14 +08:00
yuanke 0fd164d2bb 修改编程的几个提示语句 2016-03-25 15:24:31 +08:00
yuanke 3af257eb77 评测服务器有问题时得提示 2016-03-25 15:18:33 +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
ouyangxuhua 5cc31fb511 组织资源栏目排序，带过滤条件，如tag类型、搜索条件等 2016-03-25 12:30:33 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
guange 7804a1e9ec url更改 2016-03-21 18:23:34 +08:00
guange 908b3dfdbd 利用reactjs前后端分离 2016-03-21 18:18:11 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange 
# Conflicts:
#	Gemfile
#	db/schema.rb
 2016-03-21 18:17:39 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
guange b356c6cd1f 答案提交加入超时处理 2016-03-18 15:40:02 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +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
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 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 a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +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
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
luoquan 270a290df9 修改视频不能播放问题。 2016-03-14 15:18:56 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
yuanke 5dcd3b6826 解决KE工具栏一行与两行显示不一致的情况 2016-03-09 15:32:08 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
cxt 072300331b 编程测试集的输入输出添加序号 2016-02-29 17:05:11 +08:00
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +08:00
ouyangxuhua 8784c7cec6 超链接不能正常显示的问题 2016-02-26 16:13:14 +08:00
cxt 347efa275d Merge branch 'develop' into cxt_course 2016-02-24 09:50:53 +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
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
guange ac121ce585 组织文章无法编辑问题 2016-02-18 15:26:07 +08:00
cxt e6d4d7d0cb 描述框的自动增高 2016-02-02 17:16:50 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
cxt f632a3d4fb 编程弹框固定位置 2016-01-22 22:17:52 +08:00
cxt 8f1bffd28b 留言不能为空 2016-01-22 21:53:32 +08:00
cxt bb67a8f77d 若测试集够长，点击增加测试集，此时应该自动定位到测试集输入框 2016-01-22 17:34:35 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +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
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
guange e96496ddcd avatar.js和attachments.js冲突,导致头像不能上传 2016-01-08 23:01:16 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +08:00
cxt 76b95fbf93 课程和项目的课程简介默认可显示20行 2015-12-30 16:27:56 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
huang 5060ec26bb 项目讨论区 2015-12-29 11:04:20 +08:00
guange fd746c25f3 文件下载改为base64传输 2015-12-22 16:11:09 +08:00
guange 22d8fc9abd 作业附件乱码优化 2015-12-22 15:45:17 +08:00
cxt e86f9f9aeb 去掉通知页面的字符限制 2015-12-21 13:20:09 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
cxt 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
lizanle 8ce2dbc4b8 issue回复 2015-12-17 18:12:38 +08:00
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
lizanle 4bc68081ee editor修改 2015-12-17 15:15:00 +08:00
lizanle 8d58b045f1 文件链接却弹出图片框 bug 2015-12-17 09:55:02 +08:00
lizanle b13ae8f599 issue 2015-12-16 15:55:40 +08:00
lizanle 68aceaa7df issue下载 2015-12-15 18:43:58 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
cxt af0e592d8a 匿评日期的设置 2015-12-14 17:03:20 +08:00
cxt d7b690e53a 匿评设置时匿评关闭日期可以等于匿评开启日期 2015-12-14 16:54:28 +08:00
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:11:48 +08:00
lizanle d1423ebc7e ke高度小修改。 2015-12-11 15:41:41 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
cxt ae218fa86c 发布作业时添加分组作业 2015-12-02 11:14:46 +08:00
lizanle 8f4c915c57 博客的非空验证bug 2015-12-01 17:33:18 +08:00
huang 85515befc4 实现工具栏数字大于0显示，小于0隐藏 2015-11-24 17:29:57 +08:00
lizanle dffabce806 Merge branch 'dev_zanle' into szzh 
Conflicts:
	db/schema.rb
 2015-11-19 15:03:56 +08:00
ouyangxuhua af981f841e 添加组织时，翻页提醒功能改善 2015-11-18 16:52:03 +08:00
ouyangxuhua 219774afab 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
ouyangxuhua b231b44e81 1.项目和课程中，添加翻页提醒； 
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
 2015-11-18 11:12:40 +08:00
ouyangxuhua fc7e41ebf9 1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
lizanle 7c1e9f0042 MathJax这些资源不能少。少了会在一些浏览器上出bug 2015-11-18 09:58:09 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
 2015-11-17 16:48:03 +08:00
lizanle 94831443a5 MathJax的js 2015-11-17 15:24:06 +08:00
lizanle 56613b6358 增加项目的显示 2015-11-14 10:45:49 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
lizanle 506709b474 个人资源库，课程 资源文件上传 
1.单个上传
 2.给出明确的提示
 3.按钮联动
 2015-11-12 16:35:13 +08:00
lizanle a01de011ca 文件上传的 确定按钮的联动 2015-11-11 16:02:37 +08:00
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
lizanle 508ca7f823 文件提交进度条 
文件提交提示
 2015-11-11 11:19:10 +08:00
lizanle db0978c657 编辑的时候报500 2015-11-10 17:07:37 +08:00
cxt 463262e838 提交作品时立马弹框 2015-11-09 11:16:19 +08:00
huang d2b56e2811 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-06 14:40:37 +08:00
cxt 5e9cc27c11 发布作业时的发布日期若未选择则默认为当天 2015-11-06 09:56:37 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
cxt 9be1fe63b4 默认发布日期的格式 2015-11-05 15:45:21 +08:00
huang 4608190529 增加点击选择历史版本记录 2015-11-05 14:31:43 +08:00
lizanle 6ae28a1bef Merge branch 'szzh' into dev_zanle 2015-11-04 16:29:42 +08:00
lizanle de0ca8d3d8 课程相关的ke 内容提交bug 2015-11-04 11:03:45 +08:00
lizanle 43d9c5636a 课程发布通知的在ie11下的bug 2015-11-04 10:13:25 +08:00
huang 98ee22a3b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 17:19:47 +08:00
lizanle f1092d5072 去掉上传文件的时候文件名后的 可选的描述 2015-11-03 14:33:59 +08:00
huang a4209bc9f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 10:52:49 +08:00
lizanle 3360a25a42 项目 主页 资源上传 不要翻页，直接弹出资源弹出框 2015-11-03 10:28:13 +08:00
huang edf9b4a6b5 修改样式 2015-11-02 20:01:19 +08:00
cxt 25e1eb75ab 课程内发布作业失败 2015-11-02 09:49:58 +08:00
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-30 13:59:33 +08:00
cxt 6dcc97d5d1 添加作业的发布功能 2015-10-30 13:58:54 +08:00
lizanle 4d7ca63a12 添加一个参数控制 
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
 2015-10-30 11:51:09 +08:00
lizanle b67afc2b95 大纲 2015-10-29 09:07:26 +08:00
lizanle c2be8b4eec 课程大纲界面 2015-10-28 15:54:27 +08:00
huang 87b1790f04 未完成功能JS提示 2015-10-28 09:23:12 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-27 14:42:05 +08:00
huang 34a8d0890c 相政新界面 2015-10-26 17:18:59 +08:00
lizanle 69bc26033e 防止url删减报错 
url博客内容长度限制改为20000
 2015-10-26 10:54:27 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
Tim 17afc1a9fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:31:18 +08:00
huang 515dad66e2 课程资源库附件单独JS实现 2015-10-20 10:30:09 +08:00
Tim 1dd0954a94 意见反馈宽度调整 2015-10-20 10:29:51 +08:00
huang 588bc2ed98 页面显示公开/私有 2015-10-19 18:30:28 +08:00
cxt a16dc09afa 讨论区帖子图片可点击 2015-10-16 09:26:13 +08:00
cxt 8ea5d98b6c 课程讨论区发布帖子、编辑帖子的实现 2015-10-15 16:17:48 +08:00
cxt ea66ca5e00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
	public/javascripts/init_activity_KindEditor.js
 2015-10-14 11:41:30 +08:00
guange bdecea83ca js中edit报错 2015-10-13 21:37:41 +08:00
cxt a77f7e6f75 课程讨论区单个帖子页面的功能实现 2015-10-13 11:03:22 +08:00
lizanle c8357a6364 批量修改tag 2015-10-08 13:51:55 +08:00
lizanle 56db8b4232 批量修改tag的bug 2015-10-08 11:08:26 +08:00
sw 7cba1e5f76 课程内发布作业按钮无反应 2015-09-29 17:10:16 +08:00
sw 515e2be4f8 课程内的作业列表匿评设置确定按钮无效 2015-09-29 14:23:50 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang 61061573a7 去掉版本库git操作指南 2015-09-29 10:42:17 +08:00
sw 22b9c6a866 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/courses.css
 2015-09-29 10:40:11 +08:00
sw 6194be8933 界面样式调整。js修改 
在课程内发布作业时无课程id
 2015-09-28 17:09:07 +08:00
cxt 955d87a98c 新增测试集的编辑框自适应高度 2015-09-28 16:09:59 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
sw 591324854b 项目缺陷点击留言，下面留言框获得焦点 2015-09-25 17:22:31 +08:00
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
sw 5f1b4b1b24 导入作业后编辑按钮、弹出框确定按钮不可用 2015-09-25 14:16:12 +08:00
huang 8886bda790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:46:15 +08:00
huang 44c097dbaf 1、issue回复添加新的编辑器 
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
 2015-09-25 11:45:57 +08:00
lizanle 924183b1cc js合并错误 2015-09-25 10:04:56 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
guange a42152553b 添加语言提示 2015-09-24 15:26:54 +08:00
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
sw f9f51557dd 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle 
Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css
 2015-09-24 10:15:23 +08:00
lizanle b9ff46f8d0 帖子的编辑与删除 2015-09-24 09:40:53 +08:00
sw ad6fbf6c9b 点击作品名称、姓名、学号、时间列都可以展开作品 2015-09-24 09:25:56 +08:00
huang b94c57691a 项目新建重构 
项目先建添加项目类型
 2015-09-23 17:36:36 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
huang 5b671c5109 issue 引用模式修改 
issue相关代码优化
 2015-09-23 14:27:47 +08:00
sw 193eb0cb6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-23 10:03:45 +08:00
cxt afb1a8f53f 回复框发送按钮的样式调整 2015-09-23 09:59:23 +08:00
sw b5af66ffc2 取消匿评时间的js判断 2015-09-23 09:58:31 +08:00
cxt 576adfac34 回复框中出现html代码的修复 2015-09-23 08:56:48 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
sw 9d2b58738e 分班过滤功能 2015-09-22 16:16:55 +08:00
sw 90536efa1e 课程内姓名学号邮箱过滤，各种排序 改为js刷新页面 2015-09-22 15:52:08 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
guange 8ab08ea30f Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-19 18:18:02 +08:00
guange b6240127a9 对编程框进行代码着色 2015-09-19 18:17:12 +08:00
sw 2a8cf2885a 布置作业时选择语言显示不正确 2015-09-19 16:23:47 +08:00
sw ccd19021ae 课程动态回复之后，编辑器变宽 2015-09-19 13:45:32 +08:00
sw a54a51c984 Merge branch 'guange_homework' into szzh 
Conflicts:
	app/models/homework_detail_programing.rb
	db/schema.rb
 2015-09-19 11:21:45 +08:00
cxt b9bac42c1a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:18:55 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
guange bebc602efc merge 2015-09-18 17:51:51 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44:16 +08:00
huang 850a7c937f Merge branch 'szzh' into dev_hjq 2015-09-18 17:39:37 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 11:34:29 +08:00
cxt ad610cb0b2 测试集输入输出框的自适应高度 2015-09-18 11:29:38 +08:00
sw 859fe01c52 1、编程作业无法导出缺评、匿评列表 
2、编程作业评分设置初始值
 2015-09-18 11:14:59 +08:00
sw 7cc5ce92c6 完成评分比例设置功能 2015-09-17 20:20:20 +08:00
sw cc7a752623 到处附件、缺评、匿评、成绩列表 2015-09-17 17:20:29 +08:00
sw 47cdf1231d 匿评评分，成绩提示框的显示 2015-09-17 14:26:41 +08:00
Tim 3d5f93b938 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css
 2015-09-16 16:13:40 +08:00
sw 5f08ecc7e3 1、作业的开启匿评、关闭匿评功能 
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
 2015-09-16 10:26:13 +08:00
Tim 77a8c18a77 1.关于我们样式修改； 
2.登录界面格式调整；
3.个人动态回复样式调整；
 2015-09-16 10:16:25 +08:00
sw 4a959523c1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 09:51:59 +08:00
huang b0ccf9037a 邮件邀请： 
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
 2015-09-15 17:39:57 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
cxt 069c1ddf3c 课程通知页面的评论提示 2015-09-15 15:45:16 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw 8f3889e2c5 编程作品提交框自动增高 2015-09-11 18:03:37 +08:00
sw b6452bb652 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:58:05 +08:00
sw ecf2ac5e19 课程内发布作业增加提示 2015-09-11 16:57:49 +08:00
lizanle c701eefb42 暂时不添加 我要回复 2015-09-11 16:45:57 +08:00
lizanle b99663a773 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 16:44:28 +08:00
lizanle 9f871ababb 添加 我要回复 2015-09-11 16:44:19 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
sw 96405d7c0c 取消之后编程按钮无效 2015-09-11 15:38:58 +08:00
guange ca8f943a97 js函数重构 2015-09-11 15:03:20 +08:00
guange e9f9dd44b9 编程作业的修改功能搞定 2015-09-11 14:59:30 +08:00
sw f4c19c0fb0 1、homework.js on改为live 
2、导入作业之后，编程功能按钮消失
 2015-09-11 10:50:16 +08:00
sw a94521f2e1 编辑普通作业功能完成 2015-09-11 09:36:44 +08:00
lizanle cc6fe754d4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 15:45:46 +08:00
lizanle 756aae0cf2 发布issue编辑器可以上传代码并高亮显示了 2015-09-10 15:45:08 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw 401b0bc7e3 textarea自动拉伸高度优化，编辑普通作业作品功能完成 2015-09-09 16:50:46 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
lizanle 24dce81b31 高度参数用一个 2015-09-09 14:57:42 +08:00
lizanle c393a0ea01 个人中心 留言界面 编辑框 ie浏览器下报错 2015-09-09 14:00:44 +08:00
lizanle b2afe18ccd 个人中心 留言界面 编辑框自适应高度 2015-09-09 13:44:23 +08:00
lizanle 4ad139e6fd 添加一点注释 2015-09-09 11:38:08 +08:00
lizanle 1dd4700eb2 个人中心留言功能 编辑框自适应高度 2015-09-09 11:28:28 +08:00
lizanle 95f66a304c 通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短 
课程模块的通知，讨论区，留言都可以自动的长高，缩短
 2015-09-09 10:55:32 +08:00
sw 137a0b16a0 1、文件的样式图片 
2、点击编程弹框时，测试输入获取焦点
 2015-09-08 15:40:25 +08:00
guange 52c2719a46 去掉老式的编程作业提交 2015-09-08 14:48:02 +08:00
lizanle 23e60bf007 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-08 11:18:10 +08:00
lizanle de822daf44 个人动态编辑框高度自动变高缩短 
其他编辑框自动长高缩短
 2015-09-08 11:18:02 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
guange 04dffb2f89 模拟回答界面调整 2015-09-07 18:29:25 +08:00
guange 216bc7f70f 动态中作业的提交状态修改 2015-09-06 22:59:27 +08:00
guange a0c611378b 提交作业跳转报错 2015-09-02 22:09:23 +08:00
guange bacb5f859b merge 2015-09-02 21:41:13 +08:00
guange a69cee4b26 老师测试功能 2015-09-02 21:38:13 +08:00
sw ee60905eda 回复之后回复框消失 2015-09-02 21:00:08 +08:00
sw 5be3a9e03f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 19:52:56 +08:00
sw 893ae35039 新建作品、编辑作品界面修改 2015-09-02 19:52:44 +08:00
lizanle 0e68bbc5bd 调整回复框高度 2015-09-02 18:32:29 +08:00
lizanle 5135f749a4 调整回复框高度 2015-09-02 18:10:20 +08:00
lizanle f05270a519 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-02 18:01:59 +08:00
lizanle 6fdd3a8e86 调整回复框高度 2015-09-02 18:01:51 +08:00
sw c8eb7804df 增加发布时间和发送课程的js验证 2015-09-02 16:12:33 +08:00
huang a05a3074dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:34:10 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
sw 0bb0a97fd5 个人主页新增留言回复按钮无作用 2015-09-02 14:10:41 +08:00
sw 59b42e2b33 还原ＪＱｕｅｒｙ版本 2015-09-02 10:09:05 +08:00
guange 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
sw 62360175d1 课程通知回复时，所有回复框都会提交 2015-09-01 11:25:52 +08:00
sw 84ff3450d2 在动态中回复通知动态 2015-09-01 10:43:30 +08:00
ouyangxuhua 8403d5365c 修改项目新闻提示 2015-08-31 17:49:48 +08:00
guange 8f426ca040 merge 2015-08-29 18:22:33 +08:00
guange 85ee2b86cd . 2015-08-29 18:21:01 +08:00
guange 18bfe1fc73 jquery升到1.11 2015-08-29 11:59:52 +08:00
sw 3f61a908d1 部分界面样式调整 2015-08-28 17:27:51 +08:00
guange e8fe397158 added 2015-08-28 17:20:39 +08:00
guange 1d8fdbf8f1 可以提交答案 2015-08-28 15:08:07 +08:00
guange 1462ea09f3 测试代码功能完成 2015-08-28 12:04:49 +08:00
sw 007a39b5d5 作业列表的过滤查询 2015-08-28 10:00:48 +08:00
sw 049e27f15f 发布作业功能 2015-08-26 17:29:47 +08:00
sw ccfa93be66 老师布置作业界面 2015-08-26 13:56:37 +08:00
sw 757da1ec0a 调整编辑资料样式 2015-08-26 09:36:05 +08:00
sw 0d9a397453 登录、未登录搜索条件选择js 
用户主页 show方法改造
 2015-08-25 16:01:31 +08:00
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +08:00
sw 7f2f2c5d40 个人主页，项目更多功能 2015-08-24 14:53:35 +08:00
sw 2d75fea96b 课程点击更多按钮显示 2015-08-24 14:44:22 +08:00
sw 86b151979b js相关 2015-08-24 11:03:09 +08:00
sw 111478ec72 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
 2015-08-24 10:39:52 +08:00
sw 2a522f144e 编辑个人简介 2015-08-21 16:29:25 +08:00
sw 8ef6225084 个人主页，添加、取消关注及相关效果 2015-08-21 15:23:03 +08:00
sw 73854cc35c 右侧静态页面如果没有内容时增加默认最小高度 2015-08-21 14:25:01 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
sw d8da74a0d4 更新css，增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00
lizanle 421f86cdaf 资源库 2015-08-15 17:07:50 +08:00
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/models/poll.rb
 2015-08-15 16:54:51 +08:00
sw 16aea5ef42 迟交扣分0-50分 2015-08-14 15:44:54 +08:00
huang ee778b5968 1、增加issue消息提醒（发送给指派的人） 
2、下拉框形式区分消息
3、相关关联
 2015-08-12 17:45:17 +08:00
sw cbbc93acbd 当标准代码内容改变时，自动还原所有的测试信息 2015-08-01 10:45:32 +08:00
huang b42d8c6d2c Merge branch 'szzh' into dev_hjq 2015-07-31 15:47:27 +08:00
sw a74409fa04 回复子留言不成功 2015-07-31 15:18:57 +08:00
sw a52c906217 用户留言界面插件问题 2015-07-31 14:18:32 +08:00
huang 93ef63d60d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/layouts/base_users_new.html.erb
 2015-07-31 14:07:04 +08:00
sw f163cdac51 老师点击测试自动刷新，每组测试对标准代码的返回结果存储 2015-07-30 21:02:04 +08:00
sw 3e5af49281 点击测试时增加事件的发送 2015-07-30 20:36:00 +08:00
sw 5e885d9417 老师布置编程作业界面增加测试，以及测试结果的存储 2015-07-30 17:38:01 +08:00
sw 28509b7cdd 老师布置编程作业界面增加测试按钮 2015-07-30 17:27:42 +08:00
sw 32122796f9 1、我的课程、我的项目留言js问题 
2、编辑资料无法提交
3、访问他人项目不显示加入项目按钮
 2015-07-30 11:44:36 +08:00
sw 7628a53cdc 留言回复 2015-07-30 10:45:58 +08:00
sw e4e99df113 个人主页留言界面显示以及留言的删除 2015-07-29 17:41:10 +08:00
huang 55f8484654 项目留言提交JS问题修复 2015-07-29 16:54:10 +08:00
sw 8ef0d0f8a6 1、个人主页，布局右侧显示不够左侧长度时自动补充 
2、个人主页js、css提取出来
3、css错误整理
 2015-07-28 16:38:18 +08:00
sw 8c82f6c6a7 编程作业新增测试取消测试按钮 2015-07-18 16:34:24 +08:00
sw d0482fdb65 作品列表搜索报500 2015-07-18 11:38:00 +08:00
sw b6e123e476 右上角导航栏问题 2015-07-16 10:49:39 +08:00
sw 66c1dfa77e 作品列表增加分班的过滤 2015-07-15 17:34:34 +08:00
sw 6af6fdd5a3 编程作业分配比例添加以及界面显示 2015-07-08 11:17:59 +08:00
sw 5e90684677 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/homework_common_controller.rb
 2015-07-06 10:44:07 +08:00
sw 642fa8dd5d 1、缺评、迟交扣分 
2、匿评提示框、最终成绩计算提示框
3、修改作业
 2015-07-03 10:47:10 +08:00
sw 59f6ef81cd 附件提示框固定位置 2015-06-30 10:15:04 +08:00
sw 0f92a2e3cb 下载附件给出使用winrar解压的提示 2015-06-26 14:29:03 +08:00
sw ebeeb9cf28 开启匿评后学生提交作品提示，开启匿评时对老师的提示 
界面css
 2015-06-25 15:55:57 +08:00
guange 38b97aa558 下载url有两处需要处理的 2015-06-24 16:23:15 +08:00
guange 81187dea36 有带+号的作业无法打包下载的问题 2015-06-24 16:07:54 +08:00
sw 810561c31b 老师才可以查看缺评情况 2015-06-19 10:26:56 +08:00
guange 5bdad52e63 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-16 21:14:25 +08:00
guange 742506f52b IE8不能提交作业 2015-06-16 21:13:40 +08:00
sw ab88156d2f 编程作业创建部分值获取 
增加、删除编程作业测试结果
样式调整
 2015-06-16 17:55:07 +08:00
sw dd8e8e38ac 删除无用js 2015-06-16 14:46:18 +08:00
sw 61eb3ecc62 1、新建作业上一步下一步改为页面刷新 
2、下一步路由改为post
 2015-06-16 14:45:57 +08:00
sw 44e3daa0d2 1、老师新建作业，两类作业的选择 
2、编程作业静态页面的添加
 2015-06-16 10:39:42 +08:00
sw 06009934d8 编辑新闻无法编辑成功 2015-06-13 15:17:59 +08:00
sw a5d7c50fe3 课程通知展开按钮 2015-06-10 16:39:28 +08:00
sw 57804a118d 课程作业列表中展开按钮 2015-06-10 16:37:18 +08:00
sw 79893c4917 作业提交时，根据验证结果相应空间focus 2015-06-05 16:57:09 +08:00
sw f7b3229065 当作品中没有附件时，下载报错 2015-06-05 14:33:22 +08:00
sw c31e370ad6 课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常 2015-06-05 10:37:24 +08:00
sw bf653fa94f 课程作品列表搜索功能异常 2015-06-05 10:31:51 +08:00
sw 0ff088f96d 作品列表增加搜索按钮，取消搜索框手型显示 2015-06-04 10:49:32 +08:00
sw 442c991500 打分滑条取消分数的title 2015-06-03 16:27:05 +08:00
sw c161441796 课程通知如果没有超过限定长度不显示更多按钮 2015-06-02 17:56:39 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw 19bf8ef50d 作品修改功能 2015-05-28 17:09:38 +08:00
alan 98f38b0a5b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-05-28 16:34:56 +08:00
yutao 4494e5cd64 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-28 16:19:18 +08:00
yutao 065c196edc ... 2015-05-28 16:18:48 +08:00
sw 8c6ea88504 1、作品列表TAB切换 
2、作品界面作业详细信息
3、到处Excel名称
 2015-05-28 12:02:26 +08:00
sw b182feb988 作业全部附件打包下周无法下载 2015-05-28 10:47:40 +08:00
sw a1e28bcd9e 增加按学生login、学号、真实姓名排序 2015-05-28 09:46:35 +08:00
alan 32a6c29c7c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	Gemfile
	app/views/layouts/base_projects.html.erb
	app/views/projects/_development_group.html.erb
	app/views/projects/_research_team.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:42:25 +08:00
alan 59c77e870c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	db/schema.rb
	public/javascripts/course.js

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:01:52 +08:00
huang 95f3d89afa 项目新闻添加编辑器：显示页面、列表页面新样式显示 2015-05-27 14:45:36 +08:00
sw 1fe7c70955 1、评价作品增加批阅结果的删除与显示 
2、修改课程的昵称下拉框无法正常显示
 2015-05-27 09:29:27 +08:00
sw f3597d9aa5 开启/关闭匿评弹框提示 2015-05-26 10:00:37 +08:00
huang 052d293f82 新建项目时候： 
如果我的项目中有重名的项目不允许新建
 2015-05-22 16:30:22 +08:00
alan 1c9b9dff79 修改《编辑器还原》《提示信息的添加》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 13:57:07 +08:00
alan c18d1d9585 修改《匿名发布新帖》《编辑时出现跳转错误》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 11:09:43 +08:00
sw 8c72df74d6 1、增加返回顶部功能 
2、点击作品名称，弹出详细信息
3、作品列表信息生成
 2015-05-21 17:17:54 +08:00
alan a0ca31780e 修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》 
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
 2015-05-21 16:35:53 +08:00
guange 689ec5cdfc 课程通知列表更多功能bug 2015-05-21 15:57:58 +08:00
sw faeb06aae8 1、更新css文件 
2、新建作品功能天津
3、老师新建作业时增加文件的保存
 2015-05-21 15:52:27 +08:00
sw 56723d106f 新建作品功能，以及相关js验证 2015-05-21 11:58:34 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
alan 4a588506a4 增加编辑器 
Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:38:40 +08:00
sw 40f6295609 1、新建作业功能完成 
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
 2015-05-20 16:49:19 +08:00
sw 296d4a678c 新建作业js验证以及页面操作js效果添加 2015-05-20 15:43:55 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
alan 052868a6b4 Signed-off-by: alan <547533434@qq.com> 2015-05-19 14:26:42 +08:00
yutao df24007dbb 修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开 2015-05-18 11:16:41 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
guange 588d96a0c0 头像上传只允许图片 2015-05-15 16:18:44 +08:00
yutao 68cf5fa55e 修复:当1个页面存在多个上传控件时的各种bug 2015-05-15 11:45:15 +08:00
alan cc5738c12f 课程讨论区回复样式错误 
Signed-off-by: alan <547533434@qq.com>
 2015-05-15 10:07:52 +08:00
alan 0708279c5e Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:42:20 +08:00
alan 8a52225f4d Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:19:15 +08:00
alan 72ef4e1db4 修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 15:11:20 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
guange 80d44e4f4c 新版项目的上传图标问题解决 2015-05-12 17:46:54 +08:00
alan fe92b05026 讨论区编辑添加附件 
Signed-off-by: alan <547533434@qq.com>
 2015-05-12 17:14:07 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
sw 25e80cefb8 Merge branch 'szzh' into guange_dev 2015-05-08 15:44:47 +08:00
sw 5f6f7b7cdf 引用功能图片显示不正常 2015-05-08 15:31:13 +08:00
sw ee051f6a37 1、课程讨论区回复取消功能 
2、课程讨论区回复时不现实主题
 2015-05-08 14:55:56 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +08:00
alanlong9278 f638dd6810 课程讨论区 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:55:19 +08:00
alanlong9278 3d74734607 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:48:43 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
whimlex 3c72af69ea 版本库刷新页面时“git操作指南”展开收起保持一致 2015-05-06 17:41:18 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中，刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开，样式调整 2015-04-27 17:15:21 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 692500af2e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-20 14:54:27 +08:00
huang 93e3247685 项目名称不能为空提示 2015-04-20 14:54:04 +08:00
alanlong9278 0668af4f89 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-20 14:54:02 +08:00
whimlex 86ef3e680a 项目简介展开更多信息不超过一定内容不显示 2015-04-20 14:45:46 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-17 15:07:01 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +08:00
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
huang 48f096178c 修改配置modoule模块 2015-04-13 21:53:52 +08:00
huang 2b063db0cc 修改版本界面 
未完成部分，隔行换色
 2015-04-13 21:08:26 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
sw 01f56a761f 完成配置---模块 2015-04-11 17:28:18 +08:00
sw 7ad3c2d578 修改项目配置js 
增加项目配置相关子界面
 2015-04-11 16:17:36 +08:00
sw 837fe88545 还原冲突，增加项目配置切换js 2015-04-11 14:19:52 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
huang 45fa01c773 修改缺陷不能显示的bug 2015-04-09 09:22:09 +08:00
guange 0325554d24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-09 09:20:50 +08:00
huang b415575e0e 修改新缺陷列表 
完成部分项目配置
 2015-04-09 08:43:51 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
sw dae907d0b8 1、课程通知无法添加评论 
2、课程通知界面显示
3、课程通知评论取消按钮
 2015-04-08 15:49:53 +08:00
sw 663c9aad60 1、课程通知列表出现html代码 
2、整理课程通知部分js
3、还原编辑器js代码
 2015-04-08 15:01:41 +08:00
guange 89af4b451b #2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了 2015-04-08 13:52:52 +08:00
sw ba4894239c 1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名 
2、修改课程密码显示取消明码显示
 2015-04-08 11:29:21 +08:00
sw 3bedddd190 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:49:45 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
whimlex 7b09fd0489 作业的时间选择器选择时间后不能自动关闭 2015-04-03 17:33:33 +08:00
sw b971147aa8 1、添加通知会alert 
2、添加通知描述样式
3、通知添加评论样式
 2015-04-03 15:01:26 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
sw 7b70369438 上传文件样式调整 2015-03-27 15:19:13 +08:00
z9hang 41e372c16a 上传资源按钮样式调整 2015-03-27 14:51:59 +08:00
sw 2ca2f90830 上传文件js问题 2015-03-27 14:21:10 +08:00
sw b9031095d4 Merge branch 'szzh' into sw_new_course 
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js
 2015-03-27 14:13:49 +08:00
sw c68349803e 1、课程讨论区、通知提示信息样式 
2、整理js
 2015-03-27 13:42:15 +08:00
sw 519c119543 修改上传文件样式 2015-03-27 09:32:13 +08:00
sw 9a2f572cf4 是否启用匿评功能异常 2015-03-26 19:06:17 +08:00
sw cb1fce32fe 配置课程 2015-03-26 17:17:31 +08:00
sw 8f90fed8be 新建课程界面完成 2015-03-26 16:01:25 +08:00
sw ab7d12e514 1、修改、删除分班是js方法重构 
2、验证分班名是否重复重构
 2015-03-26 11:30:00 +08:00
sw ab3a3a8573 学生收索功能 2015-03-25 20:38:07 +08:00
whimlex 05d17361e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-25 17:30:54 +08:00
whimlex 1452e09154 邮件邀请邮箱格式自动填充；部分国际化 2015-03-25 17:28:22 +08:00
sw 7b379456ed 课程作业描述很长时才显示更多按钮 2015-03-25 14:34:20 +08:00
sw 6c5cf50bf0 去掉弹框js 2015-03-25 14:12:57 +08:00
sw 27e7bc21b5 当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示 2015-03-25 14:09:44 +08:00
guange 4b636d8be6 #1801 打包上传分个数下载完成 2015-03-25 13:13:09 +08:00
guange bdf419438e merge 2015-03-25 10:38:04 +08:00
z9hang 8190d0cecc 修改留言页面样式 2015-03-24 19:51:03 +08:00
z9hang be46142b3c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/javascripts/course.js
 2015-03-24 17:14:08 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
sw 2ef10e89ac Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 17:01:19 +08:00
sw 273e82f620 修改poll的show界面的样式 2015-03-24 16:26:54 +08:00
sw 7970bd6df0 1、增加作业截至时间的js显示 
2、截止时间到了之后的显示
 2015-03-24 09:57:55 +08:00
z9hang a2ec9c661a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 08:43:54 +08:00
sw f3fefe50f1 1、增加flash显示样式 
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
 2015-03-23 18:40:58 +08:00
guange 1126d9b9a9 #2082 IE8浏览器--任意模块上传附件：上传附件后，“未上传文件”字样并未随着附件的上传变成“已上传X个文件” 2015-03-23 18:06:53 +08:00
z9hang cb278e65a2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/javascripts/course.js
	public/stylesheets/courses.css
 2015-03-23 17:49:18 +08:00
z9hang d44bbe9de1 课程通知界面新建通知修改 2015-03-23 17:36:50 +08:00
sw 5139ac30dc 修改老师新建作业界面 2015-03-23 17:18:58 +08:00
z9hang bcfdac37a7 课程资源中的图片点击下载有弹框改为预览图片 2015-03-20 17:26:31 +08:00
z9hang 27a4e462de jpeg图片预览 2015-03-20 16:49:04 +08:00
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 15:59:53 +08:00
whimlex 34579e395f 附件上传bug修改；意见反馈收拉一致 2015-03-20 15:59:30 +08:00
z9hang 1cd2984c05 #2066 网站中的图片附件链接，能否点击后直接在浏览器中显示，而不是下载？ 2015-03-20 15:11:53 +08:00
whimlex 5924cd6432 commit 2015-03-20 11:37:57 +08:00
sw b6b479f6f9 1、增加开启关闭匿评时弹框 
2、增加js调用是等待的样式
 2015-03-20 11:37:56 +08:00
whimlex 3837e1fcf5 申请加入：附件上传 2015-03-20 11:34:59 +08:00
sw 3418c9ccee 1、修改course/homewrok方法 
2、修改course的作业列表显示
 2015-03-19 17:28:36 +08:00
sw b9ed34f86e 1、右边内容区域、增加js：最短为左侧长度 
2、修改课程首页动态显示
3、修改course.css文件
 2015-03-19 11:42:52 +08:00
sw 64b0646281 base_course基本完成 2015-03-18 15:18:06 +08:00
sw 16872597b6 实现课程搜索 2015-03-17 18:02:46 +08:00
z9hang 943258aebe #2025 项目--资源库：上传资源时，分类资源为“课件”或“研究报告”，成功上传后，都是源代码 2015-03-17 17:29:35 +08:00
sw d2c7861706 1、添加缺少图片 
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
 2015-03-17 15:57:09 +08:00
sw e4c0c840bf 1、完成课程模块导航栏样式调整 
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
 2015-03-17 15:30:15 +08:00
guange 38c3b40ca1 #1701 修复在编辑作业时，删附件会导致名称编辑内容丢失 2015-03-11 10:52:09 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
 2015-01-23 10:33:07 +08:00
lizanle 4461a66c7a 添加刷新函数 2015-01-21 17:43:06 +08:00
lizanle c82722c220 日期选择js 2015-01-22 16:41:56 +08:00