Commit Graph

68 Commits

Author SHA1 Message Date
huang 2992414d62 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-31 16:40:20 +08:00
cxt e65f9bd98b issue多级回复的调整 2016-10-31 15:56:37 +08:00
huang dfbc2657d2 项目新建的时候加入Kindedit及标题为空样式调整 2016-10-31 15:14:52 +08:00
huang a2a40558f1 项目新建添加KE及样式调整 2016-10-31 14:39:50 +08:00
huang 738d473ce1 里程碑统计数加上title及项目样式 2016-10-28 16:32:46 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-28 15:57:53 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
huang 35c8157efa 修改版本库显示代码样式,改成与编辑器显示一致 2016-10-25 15:10:23 +08:00
cxt 891c0018e5 多层回复时的展现方式调整 2016-10-25 13:56:25 +08:00
Tim 20bba5bfe5 课程中不能删除创建班级教室title模拟 2016-10-21 15:37:26 +08:00
Tim f4690f0cab 回复,二级回复,删除时,回复框宽度控制 2016-10-21 11:09:54 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
Tim a58cebdf5c 提交改动页面宽度扩展 2016-10-18 17:30:07 +08:00
Tim aa379980d7 版本库显示页面宽度扩展 2016-10-18 15:40:23 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制;更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/public.css
2016-10-13 14:17:54 +08:00
Tim c693afdee8 project.css去重,提取到public.css 2016-10-11 17:26:36 +08:00
Tim 005cd09d4a 大纲中按钮样式移到common.css中;project.css中部分样式去重;翻页去掉灰色边线;大纲项目公用样式提取到public.css中 2016-10-11 14:58:50 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
Tim ffedecab7a 新问题反馈样式;侧导航课程、班级名称长度js控制 2016-09-14 15:05:08 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
cxt b3f738ee5d 与班级相关平台班级名称规范调整 2016-09-09 10:23:18 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示;课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
Tim 9e317c4a8f 二级回复英文单词过长不折行 2016-09-02 13:54:34 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
Tim d940f957ec css问题更改 2016-08-26 18:36:59 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
2016-08-26 17:55:51 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
Tim 3e78dec32a 将课程、项目公用类放至public.css中 2016-08-25 16:07:57 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop
Conflicts:
	public/stylesheets/css/common.css
2016-08-05 15:30:03 +08:00
Tim be5e74897a 项目弹框位置调整 2016-08-05 15:26:15 +08:00
Tim b8a40862ce 改变行代码格式化,不折行 2016-08-04 14:04:55 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
Tim 6078db7e39 sy_public.css样式重用处理 2016-07-27 16:44:21 +08:00
Tim 9d7fa86cb6 syllabus.css样式重用处理 2016-07-27 16:33:27 +08:00
Tim 52475099dc 博客设为主页后,文字整个容器宽度显示;班级配置图标菜单css冲突处理;大纲样式冲突处理 2016-07-27 14:36:46 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/base_syllabus.html.erb
2016-07-22 16:46:01 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
Tim 541440135f css中引用图片路径修改 2016-07-21 10:11:02 +08:00
Tim dcb541e889 资源库资源列表取消虚线 2016-07-20 17:10:51 +08:00
Tim 2850fe1b2b 预览图片边框阴影效果 2016-07-20 17:08:31 +08:00