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

5496 Commits

Author SHA1 Message Date
whimlex 36f2643ad8 上传logo 2015-04-22 16:33:12 +08:00
whimlex 7ec060cc46 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 15:49:56 +08:00
whimlex 4cb22f2437 课程、项目、个人头像上传 2015-04-22 15:49:38 +08:00
sw de192761b8 Merge branch 'szzh' into guange_dev 
Conflicts:
	Gemfile
	config/application.rb
 2015-04-22 14:53:40 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw 1cced5d7e6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 14:16:48 +08:00
sw 2f2d4257c2 调整提交作业按钮样式 2015-04-22 14:10:45 +08:00
huang 9cfcbc5584 项目讨论区--未登录情况下提示界面 2015-04-22 13:56:36 +08:00
huang bce1006969 邀请界面添加权限控制 2015-04-22 13:46:35 +08:00
huang eeaa613c9e 项目类型实时刷新功能 2015-04-22 13:34:57 +08:00
huang 154ee9f38b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 12:43:35 +08:00
huang 2f021aecee 项目成员列表添加角色。用户得分 2015-04-22 12:43:20 +08:00
guange d2dd77612b 将登录默认值改为自动登录 2015-04-22 12:42:22 +08:00
sw 09c51d1a87 修改创建作业未启用匿评时，所有作业列表看不到 2015-04-22 11:44:52 +08:00
sw 83796bfaa0 去掉puts 2015-04-22 11:18:22 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +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
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
huang 49f33dd50c 类型bug修复 2015-04-22 10:50:12 +08:00
huang 249c02efff Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 10:24:43 +08:00
huang be5c7ac6dd 修改项目类型术语 
图标
 2015-04-22 10:24:15 +08:00
whimlex 0f037e78fa Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	public/stylesheets/public.css
 2015-04-22 10:18:49 +08:00
whimlex 5123ca1047 版本库样式调整 2015-04-22 10:16:14 +08:00
huang ee4cfb9c89 修改流程碑点进去样式 2015-04-22 09:59:29 +08:00
sw 5385f35aff 教师列表删除翻页 2015-04-22 09:52:12 +08:00
huang ca26b0d819 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
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 729d11ebaf 修复项目配置中首页显示问题 2015-04-22 09:22:52 +08:00
huang 8b77079f44 公开。私有标识强制不换行 2015-04-22 00:55:40 +08:00
sw 57193b077e 作品列表取消分页显示 2015-04-21 20:44:27 +08:00
huang 7c91a40e4f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 18:05:51 +08:00
huang 1fe35fc063 配置中添加角色权限判断 
不同角色通过admin配置显示不同模块
 2015-04-21 18:05:35 +08:00
whimlex 51aeb40d31 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 18:05:20 +08:00
whimlex 6441d298a2 版本库修订SVG图样式修改 2015-04-21 18:04:57 +08:00
whimlex 9fa3d25e3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-21 17:57:39 +08:00
whimlex b99f8d8056 上传头像，上传课程项目logo提示 2015-04-21 17:56:01 +08:00
lizanle d6527f1f7e 去掉学生列表分页 2015-04-21 17:54:49 +08:00
lizanle da7528c780 重定向到项目配置里的新建版本页面 2015-04-21 17:10:07 +08:00
whimlex 0d26f64afd 搜索课程——授课时间”与“课程简介”显示异常 2015-04-21 16:49:13 +08:00
huang 2043b963c8 添加意见反馈 
项目配置权限
 2015-04-21 16:35:51 +08:00
whimlex ab93d19b56 动态中显示更新项目缺陷样式异常 2015-04-21 16:17:51 +08:00
huang 861469e39f 1、修改回复帖子和新建帖子标题冲突 
2、对齐新建框
3、版本库新建按钮样式
 2015-04-21 16:11:25 +08:00
huang 86027e077f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:22:43 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
whimlex 84d7e63d54 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:11:15 +08:00
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +08:00
huang c510f14edb 流程碑添加新建版本 2015-04-21 15:10:05 +08:00
huang 2521e802bf 缺陷统计添加冒号 2015-04-21 14:48:49 +08:00
huang b6f34045db 修改缺陷：缺陷上传附件后，第一条回复中会显示附件。 2015-04-21 14:40:12 +08:00
huang 5c2fdf7aee Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 14:20:13 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
lizanle 457b86a861 版本配置 2015-04-21 10:14:46 +08:00
lizanle 2987253303 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-21 09:53:22 +08:00
lizanle 3b70ab964d issue过滤 2015-04-21 09:53:09 +08:00
huang 4cddb214fd 修改资源库站内搜索不能搜索的bug 2015-04-21 09:49:10 +08:00
huang 3bd4f2d0f6 修改资源库样式 2015-04-20 17:55:07 +08:00
huang 692500af2e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-20 14:54:27 +08:00
huang 93e3247685 项目名称不能为空提示 2015-04-20 14:54:04 +08:00
whimlex 86ef3e680a 项目简介展开更多信息不超过一定内容不显示 2015-04-20 14:45:46 +08:00
huang 8dd0e985a0 完成 2015-04-20 10:48:36 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
whimlex ab39d54b45 版本库文件列表样式 2015-04-17 17:07:23 +08:00
sw 6df1f55ac4 添加课程成员后不自动刷新 2015-04-17 16:53:04 +08:00
sw d5e71e9803 增加课程成员收索功能后、添加课程成员，成员列表不自动刷新 2015-04-17 16:38:25 +08:00
huang 7340ef793c 修改新建项目的显示样式 2015-04-17 16:26:05 +08:00
whimlex 65e6b41d91 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 16:06:40 +08:00
whimlex 22a4bf9216 查看修订样式 2015-04-17 16:06:24 +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
whimlex 92bf340786 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 14:51:27 +08:00
whimlex af28461cf0 动态中创建项目样式调整 2015-04-17 14:51:10 +08:00
lizanle 17838acddb 提示信息数组 flatten 2015-04-17 14:39:30 +08:00
lizanle 0ca96a5500 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 14:27:30 +08:00
lizanle ade32aae02 列宽修改 2015-04-17 14:27:26 +08:00
sw 3a8bfbf880 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 14:22:19 +08:00
lizanle 3c17492901 列宽 2015-04-17 14:22:08 +08:00
sw 7239f6a641 1、成员列表分页空间翻页不可用 
2、当五输入时显示，无用户显示
 2015-04-17 14:21:44 +08:00
lizanle 17f9ed52ce Wiki列宽度 2015-04-17 14:21:43 +08:00
lizanle 15e54dd765 版本 输入名字不能为空 2015-04-17 14:21:18 +08:00
lizanle b6db00643e Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 14:20:58 +08:00
lizanle 532a8cb5c3 返回的时候展开输入框 2015-04-17 14:20:53 +08:00
whimlex 1382f9a0cd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 14:14:35 +08:00
whimlex dc955c7e2d 编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
sw 9814a859c3 项目添加TAG页面不刷新 2015-04-17 14:09:58 +08:00
huang 14a0d885f0 settings 2015-04-17 13:49:40 +08:00
huang 04af919c77 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 12:57:48 +08:00
huang fc8dacbd5f 引入资源列表界面调整 2015-04-17 12:56:54 +08:00
lizanle f8951c0044 国际化 2015-04-17 12:55:07 +08:00
lizanle 5e8848f962 国际化 2015-04-17 12:44:27 +08:00
lizanle 42b798e111 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 12:00:53 +08:00
lizanle 3620cd99b6 去掉错误的符号 2015-04-17 12:00:47 +08:00
sw cdbe95f6ec 修改老师配置界面成员搜索 2015-04-17 11:48:47 +08:00
huang 0607cf326c 版本库里面页面验证 2015-04-17 11:42:23 +08:00
whimlex 7e0120e029 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:41 +08:00
huang 917701f09d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:43 +08:00
huang c2c9660a46 项目得分界面调整 2015-04-17 11:15:27 +08:00
whimlex 51e0217eb8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:15 +08:00
whimlex eb1f8acbd3 版本库样式修改 2015-04-17 11:14:55 +08:00
lizanle 8290741746 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 11:13:40 +08:00
lizanle d2b0eae119 格式修改 2015-04-17 11:13:36 +08:00
sw 9f862ad7a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-17 11:11:03 +08:00