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

4620 Commits

Author SHA1 Message Date
whimlex 091c6125d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 15:02:53 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
sw 91e37c7ab8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 14:58:51 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
whimlex e61822d74a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:56:11 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 5c0d0230fc 去掉首页底部留白和不对齐 2015-04-23 17:43:10 +08:00
sw b6652ed5e5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:32:56 +08:00
sw 10bc470dcf 修改课程讨论区 2015-04-23 17:32:37 +08:00
huang e38639665b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:02:42 +08:00
huang 7e7ff92f7c issueenter键不能搜索的问题 2015-04-23 17:02:26 +08:00
huang 4c1259ff92 缺陷enter键盘不能搜索（未完成） 2015-04-23 16:56:18 +08:00
sw 4224e11b52 课程讨论区标题换行 2015-04-23 16:34:09 +08:00
sw 66057b5b4f 编辑帖子时的样式 2015-04-23 16:19:23 +08:00
whimlex b5781ac22b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:13:19 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
huang 6a19ac4098 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:02:35 +08:00
huang 4da77d8a71 wiki页面显示 2015-04-23 16:02:18 +08:00
sw 12e65ad61f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 15:45:38 +08:00
huang c9bfe00a4f 修改成员列表的排列 
版本库页面色系
 2015-04-23 15:31:14 +08:00
sw 75504139c9 删除课程留言时留言数自动刷新 2015-04-23 15:25:04 +08:00
sw cfe0635804 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 14:31:01 +08:00
huang de23c3c2a8 配置中子页面调整 
隔行换色显示
显示页面左对齐
 2015-04-23 14:04:22 +08:00
sw b1e31ded0e 修改公共贴吧样式 2015-04-23 11:56:59 +08:00
sw 7cd54f07cb 我要反馈按钮移位 2015-04-23 11:50:16 +08:00
sw 6d058940ec 当课程没有讨论区时自动创建其讨论区 2015-04-23 11:44:07 +08:00
sw 5b5423b8c5 修改贴吧新建帖子、回复显示样式的问题 2015-04-23 10:47:54 +08:00
huang ee1c53bacc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:15 +08:00
whimlex 2070d69d44 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:01 +08:00
huang 348eae5c45 修改项目模式提示样式 
版本库
版本
 2015-04-23 10:19:59 +08:00
whimlex 19fe973b5b 上传头像 2015-04-23 10:19:43 +08:00
whimlex d66af82478 新建竞赛页面日历插件显示错误 2015-04-23 01:00:17 +08:00
huang 0484692b47 缺陷显示页面虚线多余 2015-04-22 17:57:36 +08:00
sw 9a07989917 调整header的login的样式 2015-04-22 17:01:36 +08:00
huang 425f8473b4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 16:49:23 +08:00
huang 681546b860 缺陷上传附件显示 
项目邮件邀（未完成，需切换分支）
 2015-04-22 16:49:07 +08:00
sw 1985d1c84b 调整header下啦列表框位置 2015-04-22 16:47:13 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
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 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 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
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 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
huang c510f14edb 流程碑添加新建版本 2015-04-21 15:10:05 +08:00
huang 2521e802bf 缺陷统计添加冒号 2015-04-21 14:48:49 +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 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
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
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 af28461cf0 动态中创建项目样式调整 2015-04-17 14:51:10 +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 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
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
huang 1ffa447767 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 10:58:54 +08:00
huang 640f6a1ca7 邮件发送框距离 
去掉讨论区不必要的*
 2015-04-17 10:58:40 +08:00
lizanle 1902d557c0 有日期label 2015-04-17 10:48:40 +08:00
lizanle 8cee159cb7 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 10:38:54 +08:00
lizanle e4abc86093 版本和版本库bug修改 2015-04-17 10:38:39 +08:00
huang 1961768031 新建问题前去掉不必要的* 
去掉跟踪功能
 2015-04-17 10:37:40 +08:00
sw a8b1ca10b3 1、学生作业 --> 作品 
2、学生交了作品之后显示修改作品
 2015-04-17 10:36:32 +08:00
huang f1e86ace25 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 10:14:03 +08:00
huang 54b81bdfb3 项目类型图标 2015-04-17 10:13:47 +08:00
whimlex 54e63cf4d9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/issues/_history.html.erb
	public/stylesheets/project.css
 2015-04-17 08:48:17 +08:00
huang 258a023abd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 08:44:16 +08:00
huang fec0a7472d 新闻换行处理 2015-04-17 08:43:58 +08:00
huang fbcd9f9a96 wiki页面调整 2015-04-17 08:28:07 +08:00
huang 0ea683e1b4 修改issue中图片附件的缩略图显示方式 2015-04-17 07:45:37 +08:00
whimlex 8633ba3325 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 20:11:49 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
huang d1e7777040 关注列表样式 2015-04-16 20:00:07 +08:00
huang 63a457674a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 19:08:34 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +08:00
whimlex fc106fef49 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 17:56:52 +08:00
huang fb06571918 项目讨论区引用强制换行 2015-04-16 17:56:45 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
huang ce5b2d9996 项目讨论区回复按钮 2015-04-16 17:29:04 +08:00
z9hang 47e6d5c909 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 17:28:36 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
sw daef2c455a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:55:44 +08:00
sw 57a5191fe5 课程资源列表样式调整 2015-04-16 16:55:24 +08:00
whimlex 8b89110e41 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:40:11 +08:00
sw 65bcaef911 修改TAG云样式 2015-04-16 16:39:58 +08:00
whimlex ca1e902a8f #2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐 2015-04-16 16:39:52 +08:00
huang c852e72e36 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 16:36:51 +08:00
huang 611952eb05 新建项目时候设定默认项目类型 
新建项目样式异常调整
 2015-04-16 16:36:34 +08:00
sw a0c6a09e7d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 16:10:48 +08:00
sw 332a9b45fb 修改项目上传资源弹框样式 2015-04-16 16:10:24 +08:00
huang be97e4732d 目标版本为空的不显示 2015-04-16 15:58:38 +08:00
huang bfc83d1a8c 解决项目图片不能上传 2015-04-16 15:48:13 +08:00
sw 6983764c44 修改课程名称过长时的样式 2015-04-16 15:41:50 +08:00
huang 9fa7b04ce5 组织不需要必填 2015-04-16 15:30:24 +08:00
huang b92767bbb5 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 15:16:54 +08:00
huang b80251a247 链接空白处改成不能点击 
修复项目标题过长，布局变形
 2015-04-16 15:16:15 +08:00
sw 05c74960a8 1、增加当前选择的TAG云的样式 
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
 2015-04-16 15:01:37 +08:00
lizanle 10bd7c2855 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-16 14:59:11 +08:00
lizanle 17f495e77b 项目 版本 和 版本库 标签改动 2015-04-16 14:59:05 +08:00
huang 3c563eaecb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 14:34:21 +08:00
huang bb7904b32f 引入JS文件 2015-04-16 14:34:08 +08:00
whimlex 19cbc34b2b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 14:25:19 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
huang 890f36a2d5 优化缺陷 2015-04-16 14:13:12 +08:00
sw a2b529b38b 课程添加TAG后删除TAG按钮消失 2015-04-16 14:12:37 +08:00
sw b7e9442800 添加、删除TAG云时TAG云列表刷新 2015-04-16 14:01:58 +08:00
huang 4afd9afd08 解决冲突。修改版本页面 
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	public/stylesheets/project.css
 2015-04-16 13:42:45 +08:00
huang 08fb04aff4 修改版本库样式 2015-04-16 13:40:46 +08:00
whimlex 20b17f5503 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 12:15:55 +08:00
whimlex 301e44c695 修改附件上传功能无效 2015-04-16 12:15:36 +08:00
huang 8803942a02 项目讨论区，引用样式调整 2015-04-16 11:35:38 +08:00
huang e34a00f66e 讨论区列表样式冲突 2015-04-16 11:17:44 +08:00
huang c1d997379f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 11:08:53 +08:00
lizanle a4d6eaa46c 跳转回来自动选择tab页 2015-04-16 11:08:00 +08:00
huang 284e4938f6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 11:07:55 +08:00
lizanle 38672458b0 新建版本 更改页面 2015-04-16 11:07:38 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
lizanle 86b05b8e6a Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-16 10:51:09 +08:00
lizanle fe94efeb39 新建版本更改页面 2015-04-16 10:50:53 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +08:00
huang e2f7da5b99 修改里程碑代码 2015-04-16 10:31:42 +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
huang bd800a53e4 项目简介显示 2015-04-16 10:00:36 +08:00
whimlex 7ce8ae0261 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 09:54:27 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
huang 115d77dd01 圈子JS和modulesJS 
版本库删除按钮
 2015-04-16 09:49:03 +08:00
huang bc6ff57de2 修改开发组、朋友圈、研发组切换js 2015-04-16 09:30:06 +08:00
huang 61ce44af76 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 05:01:58 +08:00
huang c11fdc7273 版本库调整：未完成 2015-04-16 05:01:09 +08:00
whimlex 1d8dee15f4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 04:59:18 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
huang fec751608a 完成里程碑界面 2015-04-16 03:54:07 +08:00
huang 8e7b4868ca wiki页面调整 2015-04-16 00:30:23 +08:00
huang 6229acac71 完成wiki新建界面 2015-04-15 21:44:19 +08:00
whimlex d79de0a354 课程日期控件样式冲突 2015-04-15 20:27:09 +08:00
whimlex 596e89a14f 缺陷更新页面 2015-04-15 20:05:21 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
huang 45c234bf9c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 18:14:10 +08:00
huang aff58dd3a7 添加关注者 2015-04-15 18:13:51 +08:00
whimlex 30dae089c6 新建缺陷页面主题不能为空 2015-04-15 17:28:53 +08:00
whimlex 521e000c74 commmit 2015-04-15 17:17:03 +08:00
sw 2e3294a341 1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法 
2、增加课程资源列表的TAG云的显示
 2015-04-15 17:16:28 +08:00
whimlex d68b0283eb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 17:06:56 +08:00
whimlex a10ced61ec 缺陷跟踪者 2015-04-15 17:06:40 +08:00
huang 3825252327 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:38:58 +08:00
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +08:00
whimlex 7fa2338ce6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:34:52 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +08:00
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00
huang 4d0a9bd35c 部分描述增加强制换行 2015-04-15 15:30:33 +08:00
huang 0023d0610b 缺陷主题、描述强制换行 
跟踪按钮样式
引用样式修改
 2015-04-15 15:15:51 +08:00
sw 1dc8190aa0 1、修改无跳转的href链接为javascript:void(0) 
2、增加课程资源库的界面
 2015-04-15 14:53:07 +08:00
sw e579157604 更新public.css 
课程讨论区文件按钮和editor靠的太近
 2015-04-15 14:29:35 +08:00
huang c607bd5cbf 定义缺陷中样式 2015-04-15 12:50:27 +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
huang afa5c3a4f9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 11:15:44 +08:00
huang bfe0176b74 修改附件显示样式 2015-04-15 11:15:25 +08:00
sw 61df6e144d 修复学生作业列表QQ浏览器显示超出边框 2015-04-15 10:06:52 +08:00
huang 4acad8088e 缺陷最新显示最上面 
代码优化
 2015-04-15 00:40:25 +08:00
huang e0695fa51d 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
whimlex b3b9688072 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 19:56:19 +08:00
whimlex cdf1ce1c17 缺陷页面 2015-04-14 19:56:03 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw c60515ac50 学生作业增加按学生真实姓名、昵称、学号搜索功能 2015-04-14 19:24:39 +08:00
sw e4b2092c7f 实现项目成员列表增加成员，以及用户/角色留空时的提示信息 2015-04-14 16:56:32 +08:00
sw bb9513b313 课程学生作业列表增加搜索的静态页面 2015-04-14 16:36:03 +08:00
huang 729b28ae43 修改项目创始人不能删除自己 2015-04-14 16:03:47 +08:00
huang 5ae5cfda03 项目配置添加申请加入 
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
 2015-04-14 15:34:04 +08:00
huang b3689377a3 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 11:48:15 +08:00
huang b98a67f50d 完成项目配置-成员模块 2015-04-14 11:47:47 +08:00
sw 679620fa51 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 10:46:52 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
huang b3c3693d72 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 10:24:07 +08:00
huang 845794675a 配置-成员界面休整 2015-04-14 10:23:49 +08:00
sw aee81e8e44 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-04-14 10:19:17 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
huang 6b8022cb23 清除不需要的子模块 2015-04-14 09:10:14 +08:00
huang f3ba393bd4 去掉代码审查 
修改配置-“版本库”样式
 2015-04-13 23:39:56 +08:00
huang 48f096178c 修改配置modoule模块 2015-04-13 21:53:52 +08:00
huang 2b063db0cc 修改版本界面 
未完成部分，隔行换色
 2015-04-13 21:08:26 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
huang 6ce998bb54 去掉新版本库中冗余代码 2015-04-13 18:30:20 +08:00
huang 5d249823df 修改配置版本库页面 2015-04-13 18:27:05 +08:00
sw 39579331e7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-13 10:51:33 +08:00
sw 01f56a761f 完成配置---模块 2015-04-11 17:28:18 +08:00
whimlex 5c96a5322a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 17:11:25 +08:00
whimlex 1d8c2d2a3a commit 2015-04-11 17:10:26 +08:00
sw fb935f124c 完成修改项目界面 2015-04-11 17:04:48 +08:00
huang 534bd46008 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 16:34:17 +08:00
huang 36d76cfa07 缺陷列表代码整理 2015-04-11 16:33:25 +08:00
sw b19bfa5c0a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 16:18:01 +08:00
sw 7ad3c2d578 修改项目配置js 
增加项目配置相关子界面
 2015-04-11 16:17:36 +08:00
huang d2a77b3d41 添加issues回复统计 2015-04-11 15:34:59 +08:00
sw 7b60998952 修改点击课程名称，url连接错误 2015-04-11 15:34:08 +08:00
huang 78868b34f0 修改缺陷中四中颜色按钮会折断换行的bug 
区别新闻和通知
 2015-04-11 15:12:06 +08:00
sw 44cb4a8e56 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-11 14:57:15 +08:00
huang 4adfec5640 解决样式冲突 
添加新闻展示页面
 2015-04-11 14:49:26 +08:00
huang e3d815b51d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 14:26:03 +08:00
huang 0c90f2361d 项目用户反馈页面调整 2015-04-11 14:25:47 +08:00
sw 837fe88545 还原冲突，增加项目配置切换js 2015-04-11 14:19:52 +08:00
whimlex f79132e9be 项目新闻评论不显示无评论的查看 2015-04-11 14:01:51 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
sw db0cc88142 静态页面添加 2015-04-11 13:32:39 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
huang 8f6b095fdb 新闻页面调整 2015-04-11 11:48:39 +08:00
whimlex 23a6408c9f 评论数为0时不显示“查看所有评论” 2015-04-11 11:19:24 +08:00
sw 1c19114252 去掉发布竞赛的权限判断 2015-04-11 11:15:15 +08:00
huang 7577f4cbbc 项目缺陷显示页面样式调整 2015-04-11 09:45:13 +08:00
whimlex 0427032cbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 17:59:27 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
huang 33abbaffe1 修改isuue显示界面 
附件显示形式
国际化
部分样式调整
 2015-04-10 17:49:16 +08:00
sw 434415343c 课程留言图片显示问题 2015-04-10 17:36:21 +08:00
sw b2b3aeb20b 课程讨论区评论图片问题 2015-04-10 17:18:52 +08:00
whimlex e148917865 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 17:00:10 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
sw ece4a67f97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 16:35:20 +08:00
sw d99910e8a1 个人动态列表留言动态url错误 2015-04-10 16:34:57 +08:00
sw f0ba408a10 课程通知、个人动态 大图片超出页面 2015-04-10 16:14:19 +08:00
sw 600003e48c 公共贴吧中使用新编辑器上传大图片，图片超出界面 2015-04-10 15:54:17 +08:00
sw 400d1a147d 课程新编辑器导致图片超出页面 2015-04-10 15:43:37 +08:00
sw ea0bd7e0dd 1、技术支持只有白羽 
2、修改鼠标悬浮在白羽上有下划线
 2015-04-10 15:22:03 +08:00
sw 596bc213ca 1、课程导航懒点击课程跳到动态页面 
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
 2015-04-10 15:15:49 +08:00
sw 6b758375f8 1、搜索课程报500 
2、课程讨论区描述换行显示
 2015-04-10 15:01:33 +08:00
sw 9ebed65fde 课程动态：作业动态url不对 2015-04-10 14:36:30 +08:00
whimlex 1fae44b201 用户主页国际化修改 2015-04-10 13:21:36 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
sw eca32ca625 课程资源库标签搜索不正确 2015-04-10 11:44:13 +08:00
huang 287c767c86 缺陷页面样式调整 2015-04-09 20:47:09 +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
huang f2cf46f0a0 修改缺陷列表显示bug 2015-04-09 19:38:49 +08:00
huang fe7646c764 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-09 19:20:10 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
whimlex 85400616f1 新建缺陷页面 2015-04-09 18:37:10 +08:00
sw 5ad1028c49 Merge branch 'szzh' into guange_dev 2015-04-09 16:05:49 +08:00
sw 7303253c07 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 16:04:15 +08:00
sw b8760c6403 个人描述最长为200 2015-04-09 16:01:26 +08:00
whimlex 3b84b0417a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 15:18:31 +08:00
whimlex e030c12be8 课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序 2015-04-09 15:18:13 +08:00
sw dbc7c7a5c6 2846 公共贴吧没有最后回复人就不显示最后回复 2015-04-09 14:46:05 +08:00
sw 4fbbd7ceb7 公共贴吧，描述显示问题 2015-04-09 14:41:17 +08:00
sw 6abdc4c7e1 课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login 2015-04-09 14:29:35 +08:00
huang 95a1c1fe62 版本库显示页面调整，分页样式调整 2015-04-09 11:40:18 +08:00
sw 4b83296a97 课程作业列表开启、关闭匿评 2015-04-09 11:38:13 +08:00
sw 503d1fc2ee 开启匿评、关闭匿评js 2015-04-09 11:31:41 +08:00
huang c8f9add566 修改项目成员邀请界面（添加按钮点击搜索） 2015-04-09 11:20:09 +08:00
sw a737342a66 完成个人信息下拉、首页下标的隐藏非项目信息的定制 2015-04-09 11:00:39 +08:00
sw 988f8b7918 增加隐藏非项目信息按钮以及路由 
实现点击按钮事数据的存储与修改
修改配置文件
 2015-04-09 10:33:15 +08:00
huang 4d4e1cac8b 完成新的邮件邀请界面 2015-04-09 10:25:46 +08:00
huang 45a03bac1b 缺陷列表新增四种类型样式 2015-04-09 09:55:21 +08:00
huang 45fa01c773 修改缺陷不能显示的bug 2015-04-09 09:22:09 +08:00
guange 0325554d24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-09 09:20:50 +08:00
huang b415575e0e 修改新缺陷列表 
完成部分项目配置
 2015-04-09 08:43:51 +08:00
sw d08329631a 修复项目讨论区引用显示不正确 2015-04-08 18:10:39 +08:00
sw ba743c120b 1、课程留言回复框大小 
2、课程留言有html代码
 2015-04-08 17:58:53 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
sw dae907d0b8 1、课程通知无法添加评论 
2、课程通知界面显示
3、课程通知评论取消按钮
 2015-04-08 15:49:53 +08:00
sw 663c9aad60 1、课程通知列表出现html代码 
2、整理课程通知部分js
3、还原编辑器js代码
 2015-04-08 15:01:41 +08:00
sw d192a564b4 课程作业列表、课程动态页面描述出现html标签 2015-04-08 14:32:42 +08:00
sw 657b022baa 修改课程作业显示 2015-04-08 14:24:42 +08:00
sw 15567e7d7b 1、新的编辑起未对其 
2、老师新建作业增加marting-bottom
 2015-04-08 14:14:44 +08:00
guange 89af4b451b #2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了 2015-04-08 13:52:52 +08:00
huang be07c2c961 添加项目关注列表 2015-04-08 11:48:29 +08:00
sw ba4894239c 1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名 
2、修改课程密码显示取消明码显示
 2015-04-08 11:29:21 +08:00
huang d832514a55 新增项目成员列表 2015-04-08 11:24:40 +08:00
huang bf36da8dcb 修改醒目新闻新建页面 
退出项目样式
 2015-04-08 09:57:48 +08:00
sw cc6a9d12f1 新建课程时显示明码按钮样式 2015-04-08 09:46:05 +08:00
huang 8b379711d9 1、修改附件列表排列和样式 
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
 2015-04-07 17:45:00 +08:00
huang c1fea1c7e2 课程资源新界面 
项目动态分页调整
 2015-04-07 14:48:36 +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
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
sw 8e38103bfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 16:40:29 +08:00
whimlex a1b5277fe2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 16:15:10 +08:00
whimlex 6e0de61458 项目讨论区回复修改 2015-04-03 16:13:31 +08:00
sw 4044cc6674 Merge branch 'develop' into szzh 2015-04-03 16:01:14 +08:00
sw 500b54a466 讨论区回复引用是html代码 2015-04-03 15:39:24 +08:00
lizanle 5299d2d332 删除demo代码 2015-04-03 15:13:51 +08:00
sw b971147aa8 1、添加通知会alert 
2、添加通知描述样式
3、通知添加评论样式
 2015-04-03 15:01:26 +08:00
sw ec8e609ddc 打爆下载增加权限、增加打包下载功能 2015-04-03 13:10:18 +08:00
sw a1a761266b Merge branch 'szzh' into guange_dev 2015-04-03 11:38:27 +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
whimlex 2ef224556e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 11:31:08 +08:00
whimlex aa64b47d74 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +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
z9hang 5eac727584 项目资源模块功能完成（样式尚未调整，代码尚未应用） 2015-03-31 15:57:15 +08:00
z9hang c4e9321e14 将attachment_candown方法提取到application_help里面 2015-03-31 10:03:52 +08:00
z9hang 43af61d684 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-31 09:34:48 +08:00
z9hang e2eaae63f4 资源模块，默认按时间降序排列 2015-03-31 09:34:27 +08:00
guange efdfa67c64 日报homework created_on to created_at 2015-03-30 21:32:48 +08:00
sw a84af9d138 课程私有资源不显示在没有权限查看的用户上 2015-03-30 17:44:40 +08:00
z9hang 5bbc562abd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-30 17:15:07 +08:00
z9hang eabcd4e92b 项目资源模块新界面（列表显示，排序等功能，样式尚未调） 2015-03-30 17:14:52 +08:00
sw 4817e2e1a7 新建课程取消后返回host_course 2015-03-30 17:04:36 +08:00
sw de0403580e 新增课程成员时增加默认选项 2015-03-30 16:03:24 +08:00
sw 5640eae39b 删除课程成员 2015-03-30 15:59:57 +08:00
sw ed02959e00 修改成员角色 2015-03-30 15:57:10 +08:00
sw 2af071a92e 课程添加成员后js提示 2015-03-30 14:55:41 +08:00
sw 083a3b9de6 1、课程成员列表显示昵称 
2、添加课程成员功能
 2015-03-30 13:47:19 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
sw e7da022564 课程界面默认图片路径修改 2015-03-30 10:11:11 +08:00
sw cee08d9c58 修改加入课程弹出框样式 2015-03-27 20:05:00 +08:00
sw 72d683bdb7 加入课程与退出课程js刷新 2015-03-27 19:50:01 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
sw 21db854adb Merge branch 'develop' into szzh 2015-03-27 17:45:08 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
sw 20e80944a5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:43:56 +08:00
z9hang 9fcdaee0cc 课程讨论区回复后附件消失问题 2015-03-27 17:42:28 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00
sw 10515adc5c 课程通知和讨论区回复样式不对 2015-03-27 17:00:21 +08:00
z9hang a89826f171 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:00:17 +08:00
z9hang 1c8b4c5bdd 去除导出ATOM 2015-03-27 16:59:52 +08:00
sw b55ef84c9c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:55:37 +08:00
sw 7fa8ccad7c 课程通知和讨论区编辑、新建时宽度不对 2015-03-27 16:55:23 +08:00
z9hang a1e1e2dedf 课程讨论区，新建，编辑界面调整 2015-03-27 16:53:36 +08:00
sw dc4686d130 去掉跟踪功能 2015-03-27 16:45:47 +08:00
z9hang e10c747a5f 修改通知附件样式 2015-03-27 16:41:28 +08:00
z9hang 35e0f73345 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:19 +08:00
z9hang cc2cce22cf 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
sw 61ddfc6363 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:13:20 +08:00
sw 6a9abf12b9 1、当问卷描述过长，显示超过页面 
2、描述未对齐
 2015-03-27 16:11:56 +08:00
sw 8374ba1995 配置课程是对齐单选框 2015-03-27 16:05:38 +08:00
z9hang acb01e452b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:02:28 +08:00
z9hang 1c53731966 留言框样式调整 2015-03-27 16:02:06 +08:00
sw 1e3b28d4bd 修改上传图片样式 2015-03-27 15:57:47 +08:00
sw 9c8d402056 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 15:41:56 +08:00
sw 52acd8981f 修改上传文件样式 2015-03-27 15:41:28 +08:00
z9hang 5ec28d8fc3 置顶贴子显示 2015-03-27 15:39:59 +08:00
whimlex 3d2fc8e5ef IE8 2015-03-27 15:21:48 +08:00
sw 7b70369438 上传文件样式调整 2015-03-27 15:19:13 +08:00
whimlex 762c83b26c commit 2015-03-27 15:17:18 +08:00
sw a320956ccc Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 15:13:40 +08:00
sw 472ff76c72 启动匿评时弹框位置问题 2015-03-27 15:13:03 +08:00
z9hang ef7949584c 课程资源tag点击报错问题，回退后删除无效问题 2015-03-27 15:02:13 +08:00
z9hang 41e372c16a 上传资源按钮样式调整 2015-03-27 14:51:59 +08:00
sw 8ee6f8a6f9 解决冲突丢失问题 2015-03-27 14:25:17 +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 c68349803e 1、课程讨论区、通知提示信息样式 
2、整理js
 2015-03-27 13:42:15 +08:00
sw 83dfcdcc02 学生可以发帖 2015-03-27 11:57:49 +08:00
z9hang bdaf574266 修改发布新帖，发布课程通知链接 2015-03-27 11:55:18 +08:00
z9hang 61b220c913 课程资源库删除资源tag失效问题 2015-03-27 11:28:27 +08:00
whimlex 7fd77f0354 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 11:21:55 +08:00
whimlex 89a001ad9d IE8浏览器及以下低版本浏览器提示 2015-03-27 11:20:15 +08:00
sw 240fc240e6 修改默认图片 
修改上传按钮样式
 2015-03-27 09:51:20 +08:00
sw fcbcdffa44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/courses.css
 2015-03-27 09:33:41 +08:00
sw 519c119543 修改上传文件样式 2015-03-27 09:32:13 +08:00
z9hang d8da3bb73c 课程通知列表显示多一个空行问题 2015-03-27 09:05:43 +08:00
z9hang b3acbec2e1 上传资源弹框样式修改 2015-03-26 20:35:40 +08:00
z9hang ddecd61926 课程资源添加标签时无样式问题 2015-03-26 20:17:47 +08:00
sw a99dda837a 课程动态描述过长超出界面 2015-03-26 19:11:06 +08:00
z9hang b8ab3770f1 资源样式冲突调整 2015-03-26 19:10:27 +08:00
sw 9a2f572cf4 是否启用匿评功能异常 2015-03-26 19:06:17 +08:00
z9hang cb498a44a6 去除多出的发布通知按钮 2015-03-26 19:04:47 +08:00
z9hang a59677c22e 课程通知展开信息按钮显示隐藏控制 2015-03-26 19:02:40 +08:00
sw cba678a357 课程是否启用匿评 
课程作业列表样式
加入与退出课程按钮样式
 2015-03-26 19:01:22 +08:00
sw ed92faaedd 关闭课程与重开课程js 2015-03-26 18:12:24 +08:00
z9hang 2c5c261b70 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 17:41:43 +08:00
z9hang e1afdab988 留言样式修改 2015-03-26 17:41:25 +08:00
sw 0d04eb745f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 17:18:27 +08:00
sw cb1fce32fe 配置课程 2015-03-26 17:17:31 +08:00
lizanle c704ba71d9 提出按ckeditor 2015-03-26 16:18:34 +08:00
lizanle e95e35fdaa 替换ckeditor 2015-03-26 16:17:56 +08:00
z9hang 35eb7e80af 讨论区留言分页 2015-03-26 16:17:33 +08:00
lizanle 7e618e5b4e 替换ckeditor 2015-03-26 16:17:29 +08:00
lizanle a8205856c9 替换ckeditor 2015-03-26 16:17:14 +08:00
sw 8f90fed8be 新建课程界面完成 2015-03-26 16:01:25 +08:00
z9hang 57dad3f3c7 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 15:55:21 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
lizanle dc2c458b34 替换ckeditor 2015-03-26 15:46:47 +08:00
lizanle 01146cd7bd 替换ckeditor 2015-03-26 15:46:35 +08:00
lizanle 05cf90062f 论坛的描述如果有图片的话，图片会显示。使排版出现问题 2015-03-26 15:45:43 +08:00