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

317 Commits

Author SHA1 Message Date
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
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +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
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
whimlex e030c12be8 课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序 2015-04-09 15:18:13 +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
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
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +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 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
guange 77134c8dde 将每日邮件移入crontab 2015-03-30 20:56:42 +08:00
sw 94ecc3e59e 1、课程新增成员分页控件样式 
2、课程老师列表翻页不可用
 2015-03-30 17:03:20 +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
lizanle d1bc2b85d0 kindeditor。 2015-03-26 16:12:03 +08:00
whimlex 1452e09154 邮件邀请邮箱格式自动填充；部分国际化 2015-03-25 17:28:22 +08:00
sw 1ab0215592 修改课程动态报错 2015-03-20 16:33:43 +08:00
sw 90df8056c8 1、修改分页控件中省略号颜色 
2、更新样式文件
3、修改课程首页用新建问卷换行
 2015-03-19 14:58:42 +08:00
sw 258d9bf33a 1、调整分页控件显示样式 
2、修改课程动态分页算法
3、更新样式文件
 2015-03-19 14:30:06 +08:00
sw 8f5d8c86a3 新版样式header调整 2015-03-18 16:16:18 +08:00
guange fdee890694 git优化上线文档补充 2015-03-18 15:33:09 +08:00
guange c45850eb8a git hook改为异步 2015-03-18 14:42:11 +08:00
guange dc29ccf3b7 1. git仓库新建时加入hook代码 
2. 对现有的旧hook代码进行更新的rake任务
 2015-03-18 11:22:05 +08:00
sw ec1ff6dfc3 1、修改课程界面未登录时，先显示注册，再显示登录 
2、增加课程相关的css引用
3、增加top、left、content的静态页面
 2015-03-17 17:34:43 +08:00
sw e4c0c840bf 1、完成课程模块导航栏样式调整 
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
 2015-03-17 15:30:15 +08:00
guange 39f1fb879f 对Gemfile作了一些优化 
1.  源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
 2015-03-15 23:09:44 +08:00
guange 08eae0e5eb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-03-13 11:30:25 +08:00
guange ab6c21314d #1503 老师发布的作业可以在课程动态中显示了 2015-03-12 21:57:35 +08:00
whimlex 5732f0ed03 国际化问题修改，新添加en.yml存在中文字符，格式问题 2015-03-11 10:10:54 +08:00
whimlex a4a9b2dfdd 国际化插件 2015-03-10 10:43:17 +08:00
sw 770704790d 还原修改 2015-03-07 16:40:07 +08:00
sw c6788e2f40 修复首页报错 2015-03-07 15:30:37 +08:00
huang f898e2aa91 16:22 2015-03-06 16:22:07 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
 2015-03-06 15:36:47 +08:00
huang 9e2c479590 new project 2015-03-06 15:26:40 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-02 14:50:10 +08:00
alan f374bfd7e2 修复《窗口跳转问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-02 14:47:50 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/_search_project.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-02-09 22:14:16 +08:00
whimlex 59a2c8283a 国际化结构调整 2015-02-09 22:07:21 +08:00
alan d61199f66b merge szzh 2015-01-31 16:43:10 +08:00
alan 4ebd34722d email_verifier 插件 2015-01-31 15:53:50 +08:00
alan 2f168dd4d7 修改《课程动态》样式 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 17:47:57 +08:00
lizanle 0785384813 修改bug，课程动态报错 2015-01-30 10:28:31 +08:00
lizanle 43e9f738c0 添加注释，修改变量命名 2015-01-27 16:32:27 +08:00
lizanle 475ef12cd5 添加注释，修改变量命名 2015-01-27 16:31:44 +08:00
lizanle 6c76cacb61 解决项目动态很慢，数据量很大的问题 2015-01-27 15:20:44 +08:00
lizanle d112c5a911 调整了注释 2015-01-27 13:46:47 +08:00
lizanle 6c02c96342 去掉了增加时间跨度的代码 2015-01-27 13:39:16 +08:00
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh 
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
 2015-01-14 16:15:09 +08:00
alan 90925edce2 修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 17:56:09 +08:00
alan 9f807438d6 教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？ 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 14:58:11 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
sw 8dc9b223b1 修改竞赛模块，重复评分不会以最后一次评分为准的BUG 2014-12-29 16:03:51 +08:00
sw f934824175 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-02 17:05:27 +08:00
z9hang d8e9dba404 #1647 正式版--资源搜索窗口搜索课程资源进行下载返回500错误（资源可见性判断修复） 2014-12-02 16:25:49 +08:00
sw 9a61354328 1.评分、评论作为一个action发送到服务器 
2.修改作业的show方法获取参数不正确的问题
 2014-12-01 15:41:49 +08:00
sw 512f16a036 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-14 15:04:53 +08:00
alan a4e659d8e1 修改bug<代码评审模块请在左下角显示，不要在tab中显示> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 15:55:12 +08:00
sw a24d1493f9 1.修复点击课程动态，课程动态tab页不高亮显示 
2.修复点击新建作业，课程作业tab页不高亮显示
 2014-11-12 16:51:07 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-08 16:40:36 +08:00
z9hang 9b4e9bd04a 1、部分星星显示不正确问题，2、评分初始值设置为0 2014-11-06 16:52:29 +08:00
sw 9b64027ed6 1.当用户真实姓名为空时作业列表界面显示为昵称 
2.修改分页控件样式
3.作业用户图像增加链接，修改鼠标悬浮样式
4.增加当前选中页显示样式
 2014-10-31 14:04:19 +08:00
sw fd5b7ac468 1.更新css样式文件 
2.增加相关图片
3.分页空间支持ajax刷新界面
4.修改分页控件显示样式
 2014-10-31 11:48:40 +08:00
alan 7696e34ecf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-10-30 10:06:44 +08:00
alan 7487c538f3 Signed-off-by: alan <547533434@qq.com> 2014-10-30 10:06:35 +08:00
z9hang 7c331cf49c 还原对tags做的修改(上次的修改对一个系统文件做了修改，无法应用到本系统) 2014-10-30 09:32:33 +08:00
z9hang 20e12327c4 点击标签报错问题 2014-10-29 17:03:32 +08:00
alan 66aa72d210 Signed-off-by: alan <547533434@qq.com> 2014-10-23 18:49:14 +08:00
sw 8f4b994b11 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
 2014-10-23 14:23:18 +08:00
sw ed7dac6126 1 2014-10-23 14:21:33 +08:00
alan e044f5b615 修改contest中出现的逻辑错误 
Signed-off-by: alan <547533434@qq.com>
 2014-10-23 11:30:34 +08:00
z9hang 2e3bdf1179 将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug 2014-10-22 16:05:08 +08:00
z9hang e4ff85894d 1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页 2014-10-17 15:02:09 +08:00
z9hang 57776d67c5 优化代码 2014-10-16 11:09:45 +08:00
z9hang dfc536bff9 附件编辑时设置私有为公开无效问题 2014-10-11 11:55:25 +08:00
z9hang 97522f273e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-10-11 11:06:55 +08:00
z9hang ef3e0798cc 1、课程、项目讨论区编辑附件没有公开字样问题。2、设置附件私有属性遗漏讨论区的附件的情况添加。3、编辑附件的描述、公开属性无效的问题，原因编辑保存逻辑存在问题，修正 2014-10-11 11:06:37 +08:00
sw 3b9704ed4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-10-11 10:23:13 +08:00
sw 0f492047a5 修复项目首页的用户动态会显示私有项目中的动态的BUG 2014-10-10 13:52:33 +08:00
z9hang a6efe10984 1、#1313 课程/项目：资源库“下载次数“字样显示错误,解决修改其样式。2、项目缺陷模块勾上也不显示问题，原因：模块名称匹配错误，修正之 2014-10-10 11:46:59 +08:00
z9hang 75b9fccb84 #1309 项目--配置--模块：不勾选相关模块，却也能在项目主页显示,解决添加条件判断，不勾选的模块不再显示。admin首页定制中设置不显示课程时，个人主页出的课程tab页也不在显示 2014-10-10 10:49:21 +08:00
z9hang de8e3e5fac 课程、项目讨论区添加删除自己上传的附件功能 2014-10-09 11:23:22 +08:00
z9hang 2f2c6c39b5 去掉教师列表的学号 2014-09-30 11:11:19 +08:00
z9hang 1b98572bc2 查看课程资源附件权限恢复 2014-09-29 11:01:04 +08:00
z9hang da853bf4eb 修复redmin.rb被重置的修改 2014-09-29 10:43:54 +08:00
sw c2b8c30949 还原redmine.rb文件 2014-09-29 10:31:47 +08:00
alan b9e242a7f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	lib/redmine.rb
 2014-09-28 17:18:07 +08:00
alan 43e940eb1d 修复竞赛作品附件删除报错的bug 
Signed-off-by: alan <547533434@qq.com>
 2014-09-28 17:14:09 +08:00
z9hang d998f80060 课程讨论区附件无法查看问题，权限项目被删，恢复之 2014-09-28 16:40:05 +08:00
z9hang 418615e7bc 课程通知无法查看问题，查看课程新闻权限项被删，解决：重新添加 2014-09-28 16:33:00 +08:00
z9hang 045a09e2ed 添加贴吧资源下载权限控制 2014-09-28 11:31:12 +08:00
z9hang 21343a0111 超级管理员权限报表界面项目权限与课程权限分开整理，#1300 配置管理--角色和权限--权限报表，显示超出边框 解决：修改css样式 2014-09-25 15:34:00 +08:00
z9hang 67162bd8fb admin编辑角色，项目权限、课程、；竞赛权限分开显示 2014-09-24 17:36:49 +08:00
z9hang 9ae553bace Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-21 14:57:05 +08:00
z9hang 5482ba3207 后台统计所有用户分数算法优化 2014-08-21 14:56:44 +08:00