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

134 Commits

Author SHA1 Message Date
sw 3313bef0b1 路由报错 2015-04-11 11:00:06 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
huang 34321d35ec 添加相关图片 
动态箭头
 2015-04-08 12:01:46 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +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 240fc240e6 修改默认图片 
修改上传按钮样式
 2015-03-27 09:51:20 +08:00
huang eac6f814a8 解决浏览器提示关闭按钮与邮件邀请界面冲突 2015-03-26 10:41:54 +08:00
sw 746a7902c5 更新css文件 2015-03-25 16:29:30 +08:00
huang 525a6394ca 1、公共贴吧邮件提醒 
2、浏览器版本过低提醒（样式需要再调试）
 2015-03-25 10:20:08 +08:00
sw 06c5739767 更新css以及上传图片 2015-03-23 17:35:35 +08:00
sw 78a7764de0 更新css文件并上传缺失图片 2015-03-18 15:42:23 +08:00
sw 4ebd27ea40 修改课程默认图片 2015-03-18 10:14:18 +08:00
sw d2c7861706 1、添加缺少图片 
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
 2015-03-17 15:57:09 +08:00
sw 88d6b25ace 1、修改意见反馈图片 
2、去掉个人首页权限判断
 2015-03-16 09:28:18 +08:00
huang a010c800d6 修改权限库为空情况下403问题 
修改项目标题样式
确认发送国际化
添加小图标
 2015-03-13 15:37:54 +08:00
huang 29655838f0 项目超过的部分用“展示更多信息”拉开 2015-03-11 23:50:37 +08:00
huang f898e2aa91 16:22 2015-03-06 16:22:07 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
 2015-03-06 15:23:42 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw 45fe622f26 1、修改进入系统首页报错 
2、增加组织的默认图片
 2015-03-05 14:42:46 +08:00
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:46:30 +08:00
huang 84bfd30fc5 修改问题反馈弹框！ 2015-01-22 17:46:12 +08:00
huang f7c1b76b3d 用户反馈弹框模块！ 2015-01-10 15:39:02 +08:00
= 098b8094b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-30 14:35:57 +08:00
= 305cbae008 维护浮动框 2014-12-30 14:35:35 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
alan 5c33c578bb 增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-08 16:50:20 +08:00
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 
Conflicts:
	db/schema.rb
 2014-12-03 19:20:25 +08:00
alan 615bc7d444 增加课程分组的功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-03 19:17:10 +08:00
alan 63c9804da8 添加course_group表单到数据库中，并建立对应于members和courses之间的关联， 
对相应页面的修改

Signed-off-by: alan <547533434@qq.com>
 2014-12-02 14:41:36 +08:00
sw 38a912672a 手写评分相关js 2014-12-01 11:15:03 +08:00
z9hang a7a6fbcd22 课程资源界面修改 2014-11-18 18:02:01 +08:00
alan baacf328b7 增加《注册跳转邮箱页面》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 09:13:44 +08:00
sw e2897b3d1a 修改匿评弹出框样式 2014-11-03 18:45:53 +08:00
sw f3ac5a0a84 1.修改学生创建作业界面 
2.取消老师修改作业界面启动互评按钮
3.修改css.css文件中样式
 2014-11-02 17:08:19 +08:00
sw c2e9363d44 学生进入作业列表，如果已经被分配匿评作业且该学生未对此作业进行打分的情况下，弹出匿评相关提示 2014-11-02 11:35:37 +08:00
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-15 16:16:13 +08:00
yanxd 2b57e170ef want that image popup in html when user click on thumbnail. 2014-07-10 10:05:45 +08:00
nwb 10397eec3e 更改课程图标显示逻辑，添加课程图标文件夹 2014-06-04 17:30:42 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
yanxd 63af60d7b6 edit 图标丢失 
bid修改文件保存
 2014-05-17 10:44:01 +08:00
t430 09eae52fc1 hard picture file 2014-05-15 19:09:35 +08:00
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑 
2.添加附件资源类型编辑js、control相关逻辑
 2014-05-14 15:03:04 +08:00
Wen 50745d5d21 course首页布局上的小调整 2014-04-29 09:49:51 +08:00
Wen 10fdcbb050 一个简单的后台上传学校logo的页面. 2014-04-28 16:13:37 +08:00
Wen a8e029da58 数据库迁移：更改了默认的学校logo 2014-04-28 09:44:40 +08:00
Wen ba80593ab0 别忘了改数据库！= = 2014-04-25 10:42:57 +08:00
Wen 02295e5ca9 给严总调试用 2014-04-25 09:40:05 +08:00
wanglinchun 9af6c03547 Merge branch 'competition' into develop 
Conflicts:
	Gemfile.lock
	app/views/layouts/_base_footer.html.erb
 2014-04-23 17:18:53 +08:00
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes 2014-04-23 08:51:46 +08:00