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

1952 Commits

Author SHA1 Message Date
lizanle 3620cd99b6 去掉错误的符号 2015-04-17 12:00:47 +08:00
lizanle 8cee159cb7 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 10:38:54 +08:00
lizanle e4abc86093 版本和版本库bug修改 2015-04-17 10:38:39 +08:00
huang 611952eb05 新建项目时候设定默认项目类型 
新建项目样式异常调整
 2015-04-16 16:36:34 +08:00
lizanle 9621c35e8b 项目 版本 和 版本库 标签改动 2015-04-16 15:08:46 +08:00
lizanle 17f495e77b 项目 版本 和 版本库 标签改动 2015-04-16 14:59:05 +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
huang 115d77dd01 圈子JS和modulesJS 
版本库删除按钮
 2015-04-16 09:49:03 +08:00
sw 94580ba040 11 2015-04-15 20:26:54 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
sw 73ed8b9558 全站搜索是不输入条件搜索结果为空 2015-04-15 17:43:08 +08:00
sw 0f6d2676e5 tag云显示搜索结果的TAG云 2015-04-15 17:31:15 +08:00
sw 2e3294a341 1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法 
2、增加课程资源列表的TAG云的显示
 2015-04-15 17:16:28 +08:00
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00
sw 7dbd20e5eb 修复刷新页面时只评论未评分表的作品在已评列表中 2015-04-15 10:27:17 +08:00
sw d1f42a3954 教师只评论不评分的作品在未批和已批列表中都有 2015-04-15 09:52:33 +08:00
sw 78dff36d7a 老师只评论不评分的学生作业却在已评列表 2015-04-15 09:06:54 +08:00
sw ee68828132 创建课程后跳转URL报错 2015-04-15 08:50:29 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw c60515ac50 学生作业增加按学生真实姓名、昵称、学号搜索功能 2015-04-14 19:24:39 +08:00
sw e4b2092c7f 实现项目成员列表增加成员，以及用户/角色留空时的提示信息 2015-04-14 16:56:32 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
sw fb935f124c 完成修改项目界面 2015-04-11 17:04:48 +08:00
sw 858a54267f Merge branch 'szzh' into guange_dev 2015-04-10 16:39:24 +08:00
guange f94184bc81 个人动态权限部分性能优化 2015-04-10 16:27:26 +08:00
sw 6b758375f8 1、搜索课程报500 
2、课程讨论区描述换行显示
 2015-04-10 15:01:33 +08:00
sw 9ebed65fde 课程动态：作业动态url不对 2015-04-10 14:36:30 +08:00
guange c489d2400b Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-10 10:48:17 +08:00
guange 5a876d9df1 邮件发送时，单个收件人会报错 2015-04-10 10:41:44 +08:00
sw 7303253c07 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 16:04:15 +08:00
whimlex 3b84b0417a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 15:18:31 +08:00
whimlex e030c12be8 课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序 2015-04-09 15:18:13 +08:00
sw 988f8b7918 增加隐藏非项目信息按钮以及路由 
实现点击按钮事数据的存储与修改
修改配置文件
 2015-04-09 10:33:15 +08:00
sw c399ab2e4f 项目新闻 评论内容获取不正确 2015-04-08 18:15:58 +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
huang d832514a55 新增项目成员列表 2015-04-08 11:24:40 +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
lizanle 84c2e39e6c 新闻评论出现错误。误将safe_attributes换为直接属性comments 2015-04-03 17:06:19 +08:00
sw 8e38103bfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 16:40:29 +08:00
lizanle 1009f7ac07 资源id判空 2015-04-03 16:35:46 +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 717463076c 删除democontroller 2015-04-03 15:09:46 +08:00
sw ec8e609ddc 打爆下载增加权限、增加打包下载功能 2015-04-03 13:10:18 +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