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

765 Commits

Author SHA1 Message Date
huang 9c4eab4e04 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-18 13:02:54 +08:00
huang 9c63e2a87e 1、版本库添加成员代码提交统计 
2、版本库成员过多拥挤问题
 2015-07-18 13:02:28 +08:00
sw f909fbb835 作品列表增加分班过滤 2015-07-15 16:01:03 +08:00
sw e73517cfd0 扣分规则显示 2015-07-10 15:34:55 +08:00
zhangshenjerry 0c70169dfc 创新竞赛--编辑竞赛通知页面导航处不要显示“添加通知” 
创新竞赛--竞赛通知：添加竞赛通知置条件为空，提示信息“竞赛标题/描述不能为空”错误
 2015-07-06 13:10:35 +08:00
huang be2b3a78d6 修改项目资源引用未选着项目时提示 2015-07-04 15:26:01 +08:00
huang 02805fd145 1、修改邮件显示样式及国际化 
2、发布作业代码更新
 2015-07-04 12:12:44 +08:00
sw 2344e3d07f admin用户导出缺失文件列表功能 2015-07-02 10:41:08 +08:00
sw 7338f0d44e 未完善个人资料的用户创建可以报错 2015-07-01 10:02:50 +08:00
sw fa31fe421b 匿评列表导出Excel 2015-06-30 16:36:37 +08:00
sw c2e21f7a0c 缺评列表导出 2015-06-30 15:30:51 +08:00
huang 65ee86bb45 1，解决git中英文500错误 
2.解决编辑器输入样式邮件显示异常问题
 2015-06-26 17:07:31 +08:00
huang df910a9c2d 更改邮件提示语（同步国际化） 2015-06-26 14:44:26 +08:00
huang 5c36cf5c9d Merge branch 'szzh' into dev_hjq 2015-06-11 16:36:19 +08:00
huang a4f1edcdee 更新：wiki项目其它成员可以收到； 
项目、课程留言其它成员可以收到
邮件显示页面国际化
 2015-06-11 16:30:14 +08:00
sw 574c7373ec Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-10 15:16:54 +08:00
huang 0d9bdae5b0 邮件按天发送新界面 2015-06-10 15:02:44 +08:00
sw 857d3d5f62 问卷调查结果导出功能 2015-06-09 17:03:28 +08:00
sw 0d292d8ee6 课程留言为空时的提示 2015-06-04 11:18:06 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw 3f9855f25c 老师删除作业功能 2015-05-28 14:13:47 +08:00
sw e1a3ed4b82 到处Excel 2015-05-28 11:07:28 +08:00
guange 1fe49c8cb1 添加删除作业功能 2015-05-27 19:39:06 +08:00
guange b5d9cf55ff 将域名配置加入到管理员后台 2015-05-22 15:59:37 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
sw 25672aa229 编辑作业功能完成 2015-05-20 17:01:08 +08:00
sw 40f6295609 1、新建作业功能完成 
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
 2015-05-20 16:49:19 +08:00
huang 3f744d46f2 超级管理员界面--贴吧回复成功 2015-05-20 16:24:32 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +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
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
lizanle 54f8079ba6 去掉html符号 2015-04-17 14:34:57 +08:00
sw a8b1ca10b3 1、学生作业 --> 作品 
2、学生交了作品之后显示修改作品
 2015-04-17 10:36:32 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +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
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 6ff1a7d692 问题顶和踩国际化 2015-04-11 11:03:36 +08:00
huang 33abbaffe1 修改isuue显示界面 
附件显示形式
国际化
部分样式调整
 2015-04-10 17:49:16 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
whimlex 9ef212b6d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 20:47:08 +08:00
whimlex bcf83328f2 项目界面国际化 2015-04-09 20:46:48 +08:00