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

5125 Commits

Author SHA1 Message Date
whimlex a1b5277fe2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 16:15:10 +08:00
whimlex 6e0de61458 项目讨论区回复修改 2015-04-03 16:13:31 +08:00
sw 4044cc6674 Merge branch 'develop' into szzh 2015-04-03 16:01:14 +08:00
sw 42124e8ec5 开启、关闭匿评是有时候报500 2015-04-03 15:54:58 +08:00
sw 500b54a466 讨论区回复引用是html代码 2015-04-03 15:39:24 +08:00
lizanle 5299d2d332 删除demo代码 2015-04-03 15:13:51 +08:00
lizanle 717463076c 删除democontroller 2015-04-03 15:09:46 +08:00
lizanle 452e299966 删除demo代码 2015-04-03 15:08:52 +08:00
sw b971147aa8 1、添加通知会alert 
2、添加通知描述样式
3、通知添加评论样式
 2015-04-03 15:01:26 +08:00
lizanle 56cbc753eb Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-03 14:35:55 +08:00
lizanle f96fbe5150 注释一行不需要的 2015-04-03 14:35:50 +08:00
sw ec8e609ddc 打爆下载增加权限、增加打包下载功能 2015-04-03 13:10:18 +08:00
lizanle b8cc431f13 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-03 12:08:43 +08:00
lizanle 65030656a6 kindeditor上传的资源所属的类型映射关系 2015-04-03 12:08:30 +08:00
sw a1a761266b Merge branch 'szzh' into guange_dev 2015-04-03 11:38:27 +08:00
guange 113e11f6cd Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/models/comment.rb
	app/models/message.rb
	app/models/news.rb
 2015-04-03 11:34:39 +08:00
whimlex 2ef224556e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 11:31:08 +08:00
whimlex aa64b47d74 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +08:00
guange 893f6af856 用回rubyzip, zipruby有bug. 2015-04-03 11:29:37 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
guange 0118b10725 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-02 09:45:13 +08:00
lizanle 073ef00bb7 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-02 08:48:34 +08:00
lizanle 552c27c51d 课程作业学生提问问题计数修改 2015-04-02 08:48:01 +08:00
guange 9cefb9f339 每日发送取日期不对 2015-04-01 17:47:04 +08:00
guange 0099ab9f9a 去除以前的邮件规则 2015-04-01 16:44:40 +08:00
guange 243bac8fed 除了mail_notification == all 的，其他都不即时发邮件 2015-04-01 16:41:23 +08:00
guange 3ea33aa847 新建news报500 2015-04-01 13:14:15 +08:00
guange 618e8c017c Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	db/schema.rb
 2015-04-01 11:16:57 +08:00
guange 89e0602983 邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到 2015-04-01 11:12:55 +08:00
z9hang 5eac727584 项目资源模块功能完成（样式尚未调整，代码尚未应用） 2015-03-31 15:57:15 +08:00
guange 27e123f9fd const_defined?小错误 2015-03-31 12:02:33 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
z9hang c4e9321e14 将attachment_candown方法提取到application_help里面 2015-03-31 10:03:52 +08:00
z9hang 43af61d684 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-31 09:34:48 +08:00
z9hang e2eaae63f4 资源模块，默认按时间降序排列 2015-03-31 09:34:27 +08:00
guange efdfa67c64 日报homework created_on to created_at 2015-03-30 21:32:48 +08:00
sw a84af9d138 课程私有资源不显示在没有权限查看的用户上 2015-03-30 17:44:40 +08:00
z9hang 5bbc562abd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-30 17:15:07 +08:00
z9hang eabcd4e92b 项目资源模块新界面（列表显示，排序等功能，样式尚未调） 2015-03-30 17:14:52 +08:00
sw 4817e2e1a7 新建课程取消后返回host_course 2015-03-30 17:04:36 +08:00
sw 94ecc3e59e 1、课程新增成员分页控件样式 
2、课程老师列表翻页不可用
 2015-03-30 17:03:20 +08:00
guange 51dbc43ecf 修改apache中git认证文件路径，user.passwd ==> htdocs/user.passwd 2015-03-30 16:05:55 +08:00
sw de0403580e 新增课程成员时增加默认选项 2015-03-30 16:03:24 +08:00
sw 5640eae39b 删除课程成员 2015-03-30 15:59:57 +08:00
sw ed02959e00 修改成员角色 2015-03-30 15:57:10 +08:00
sw 2af071a92e 课程添加成员后js提示 2015-03-30 14:55:41 +08:00
sw 083a3b9de6 1、课程成员列表显示昵称 
2、添加课程成员功能
 2015-03-30 13:47:19 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
sw e7da022564 课程界面默认图片路径修改 2015-03-30 10:11:11 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +08:00
sw cee08d9c58 修改加入课程弹出框样式 2015-03-27 20:05:00 +08:00
sw 72d683bdb7 加入课程与退出课程js刷新 2015-03-27 19:50:01 +08:00
sw cc27fca8aa 加入当前分班按钮样式 2015-03-27 19:03:38 +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 21db854adb Merge branch 'develop' into szzh 2015-03-27 17:45:08 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
sw 20e80944a5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:43:56 +08:00
z9hang 9fcdaee0cc 课程讨论区回复后附件消失问题 2015-03-27 17:42:28 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00
sw 10515adc5c 课程通知和讨论区回复样式不对 2015-03-27 17:00:21 +08:00
z9hang a89826f171 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:00:17 +08:00
z9hang 1c8b4c5bdd 去除导出ATOM 2015-03-27 16:59:52 +08:00
sw b55ef84c9c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:55:37 +08:00
sw 7fa8ccad7c 课程通知和讨论区编辑、新建时宽度不对 2015-03-27 16:55:23 +08:00
z9hang a1e1e2dedf 课程讨论区，新建，编辑界面调整 2015-03-27 16:53:36 +08:00
sw dc4686d130 去掉跟踪功能 2015-03-27 16:45:47 +08:00
z9hang e10c747a5f 修改通知附件样式 2015-03-27 16:41:28 +08:00
z9hang 35e0f73345 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:19 +08:00
z9hang cc2cce22cf 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
sw 61ddfc6363 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:13:20 +08:00
sw 6a9abf12b9 1、当问卷描述过长，显示超过页面 
2、描述未对齐
 2015-03-27 16:11:56 +08:00
sw 8374ba1995 配置课程是对齐单选框 2015-03-27 16:05:38 +08:00
z9hang acb01e452b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:02:28 +08:00
z9hang 1c53731966 留言框样式调整 2015-03-27 16:02:06 +08:00
sw 1e3b28d4bd 修改上传图片样式 2015-03-27 15:57:47 +08:00
sw 9c8d402056 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 15:41:56 +08:00
sw 52acd8981f 修改上传文件样式 2015-03-27 15:41:28 +08:00
z9hang 5ec28d8fc3 置顶贴子显示 2015-03-27 15:39:59 +08:00
whimlex 3d2fc8e5ef IE8 2015-03-27 15:21:48 +08:00
sw 7b70369438 上传文件样式调整 2015-03-27 15:19:13 +08:00
whimlex 762c83b26c commit 2015-03-27 15:17:18 +08:00
sw a320956ccc Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 15:13:40 +08:00
sw 472ff76c72 启动匿评时弹框位置问题 2015-03-27 15:13:03 +08:00
z9hang ef7949584c 课程资源tag点击报错问题，回退后删除无效问题 2015-03-27 15:02:13 +08:00
z9hang 41e372c16a 上传资源按钮样式调整 2015-03-27 14:51:59 +08:00
sw 8ee6f8a6f9 解决冲突丢失问题 2015-03-27 14:25:17 +08:00
sw 9af60424c2 去除错误代码 2015-03-27 14:14:11 +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 83dfcdcc02 学生可以发帖 2015-03-27 11:57:49 +08:00
z9hang bdaf574266 修改发布新帖，发布课程通知链接 2015-03-27 11:55:18 +08:00
z9hang 61b220c913 课程资源库删除资源tag失效问题 2015-03-27 11:28:27 +08:00
whimlex 7fd77f0354 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 11:21:55 +08:00
whimlex 89a001ad9d IE8浏览器及以下低版本浏览器提示 2015-03-27 11:20:15 +08:00
sw 240fc240e6 修改默认图片 
修改上传按钮样式
 2015-03-27 09:51:20 +08:00
sw fcbcdffa44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/courses.css
 2015-03-27 09:33:41 +08:00
sw 519c119543 修改上传文件样式 2015-03-27 09:32:13 +08:00
z9hang d8da3bb73c 课程通知列表显示多一个空行问题 2015-03-27 09:05:43 +08:00