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

295 Commits

Author SHA1 Message Date
sw 6d8f0e728d 课程 作业、通知模块，新版编辑器相关BUG 2015-06-12 16:26:24 +08:00
sw 1c808464d5 新版编辑器不可以拉宽 2015-06-10 16:12:19 +08:00
sw 8b0eb21d08 关注需求功能取消，部分用户进入个人主页报错 2015-06-05 11:17:00 +08:00
guange 444658d0b3 转换变为既时转换 2015-06-04 10:24:05 +08:00
guange f86acbb10f 需要迁移的预览文件优化 2015-06-03 18:30:49 +08:00
guange e4d68e988e 加上utf8头 2015-06-03 17:57:49 +08:00
guange 9ecb119aa4 task中也改为pdf 2015-06-03 17:43:42 +08:00
guange c331e5a9c8 转html改为转pdf 2015-06-03 17:42:41 +08:00
guange 00745f1270 修复文件预览bug 2015-06-03 11:40:00 +08:00
guange 57f8c7d04f added timeout 2015-06-03 10:54:40 +08:00
guange 670f9598e4 添加后台转换office任务 2015-06-03 09:53:10 +08:00
guange c9b46e4e3a 头像上传bug修复 2015-05-24 13:52:27 +08:00
guange eb73ba0b43 kindeditor界面打开时，有一个这个界面的过渡 2015-05-21 16:05:42 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
huang 3f744d46f2 超级管理员界面--贴吧回复成功 2015-05-20 16:24:32 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
guange 06b17581b1 图片撑出在firefox上的问题 2015-05-14 17:45:02 +08:00
guange aab94676bb 在lib里不能直接用logger,要用Rails.logger 2015-05-13 09:24:02 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +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
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
guange 86347cab89 现在可以通过rake redmine📧test[guange] 发送测试邮件 2015-04-27 16:44:53 +08:00
guange 3baba9c95e 清理gemfile 2015-04-27 11:56:10 +08:00
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +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
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