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

2240 Commits

Author SHA1 Message Date
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
txz 0e63a3a24c 指派文字显示不全 2016-06-12 15:37:52 +08:00
huang dcb3d8659b Merge branch 'cxt_course' into develop 2016-06-12 15:02:33 +08:00
txz 719774f159 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 14:52:29 +08:00
txz b57f6fbc65 微信回复框增加padding 2016-06-12 14:52:24 +08:00
cxt 00528bec60 学生列表没有分班就不显示分班列 2016-06-12 14:50:47 +08:00
guange 36fedd4d15 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 10:21:07 +08:00
txz 981b199a0f 微信图标与数字间距调整，作业增加作业类型 2016-06-08 15:34:14 +08:00
txz 5f26e9e3ee 微信回复文字格式不一致，微信回复换行处理 2016-06-08 15:02:06 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
cxt b6eb5a3668 还原作品列表的拖动 2016-06-08 11:28:20 +08:00
yuanke 4cb4213a52 修改blockquote样式 2016-06-08 10:44:58 +08:00
yuanke ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
txz 24a17d719e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-08 09:15:41 +08:00
txz 9b4a3a704d 锁定帖子不能回复 2016-06-08 09:15:35 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。 
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
 2016-06-08 09:02:00 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang 09ff5954bd 字体过长演示问题（模式二子页面） 2016-06-07 16:56:20 +08:00
cxt de58cfb5e5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 16:02:08 +08:00
Tim 1d44116841 作品列表可拖拽 2016-06-07 15:30:17 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
Tim 253d9da345 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 09:01:53 +08:00
huang 21197c95b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-06 15:11:59 +08:00
huang df8df117a8 解决匿名用户登录问题（控制器和view） 2016-06-06 15:02:11 +08:00
Tim a44cb47a26 组织未登录回复框提示 2016-06-06 14:41:18 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
huang 4367cf2233 Merge branch 'yuanke' into develop 2016-06-03 15:01:37 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
Tim 3c6c617d09 门户样式冲突问题 2016-06-03 10:08:54 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +08:00
yuanke c3c639aa77 超链接颜色修改 2016-06-02 15:27:16 +08:00
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条 
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
 2016-06-02 13:55:40 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/student_work/_evaluation_un_title.html.erb
	app/views/student_work/_evaluation_un_work.html.erb
 2016-06-01 13:59:01 +08:00
Tim 513fe1a93d 作品列表可拖拽 2016-06-01 13:46:05 +08:00
guange 1bdf8800bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-31 19:20:45 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
txz e121d7d927 二级回复显示边框区分 2016-05-31 14:55:25 +08:00
txz 91be3b9f85 回复提交时按钮变灰 2016-05-31 14:37:45 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
Tim 9cc749bd57 门户样式统一，防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
huang 389172e5b2 CSS样式 2016-05-30 10:45:00 +08:00
yuanke 98244d2a3d 将文章标题的颜色恢复正常 2016-05-27 16:42:05 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
cxt 7599bf75a3 分组作业不关联项目时的作品列表样式调整 2016-05-27 15:04:56 +08:00
Tim 5f27519c67 table可拖拽 2016-05-27 14:44:32 +08:00
cxt 400a470a2b 作品列表的样式调整 2016-05-27 14:42:12 +08:00
cxt 3b33732e6f 学生列表的姓名、学号、分班和加入时间做成不可点击的 2016-05-27 14:15:26 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
txz 9134e55606 动态纯文本模式，图标处理 2016-05-26 17:40:22 +08:00
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 10:55:18 +08:00
txz c73ce61afe 微信动态可点击，icon图片替换 2016-05-26 10:55:00 +08:00
guange 01428fad14 merge 2016-05-26 10:51:01 +08:00
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
txz 921b01e8e3 输入框支持文字内容滑动 2016-05-25 14:26:49 +08:00
txz c4c0dd3c60 回复内容换行符未显示 2016-05-25 13:50:59 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
Tim 1c0a68e57b 组织配置成员tab，搜索结果太多导致换页断行问题 2016-05-24 15:47:22 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能 
2.所有自动识别URL区域的链接颜色都改为#15bccf
 2016-05-24 09:11:50 +08:00
yuanke 5eff3db9e8 1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点 
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
 2016-05-23 15:58:32 +08:00
cxt c3ec7289b7 Merge branch 'develop' into cxt_course 2016-05-23 09:51:59 +08:00
huang c749fe381b Merge branch 'weixin_guange' into develop 2016-05-20 21:02:01 +08:00
huang cdde844e44 Merge branch 'cxt_course' into develop 2016-05-20 21:01:30 +08:00
huang f94806bcdf Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 21:01:18 +08:00
Tim dd4786d639 作品列表查看详情定位 2016-05-20 20:44:13 +08:00
txz d329b60a8a 微信加载中去白底，内容去除固定行高 2016-05-20 20:26:04 +08:00
Tim 5f4a9304fe 提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整 2016-05-20 20:05:39 +08:00
huang 8ebe8b0d0c 删除提示顺序 
消息样式
 2016-05-20 18:55:17 +08:00
huang fc8cbc2b38 Merge branch 'hjq_beidou' into develop 2016-05-20 16:18:47 +08:00
huang ef1a5d32f2 顶端背景色 2016-05-20 16:18:23 +08:00
huang d108f0a684 Merge branch 'yuanke' into develop 2016-05-20 15:37:44 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
Tim 13f83719c1 作品列表改为table布局 2016-05-20 15:15:42 +08:00
yuanke ed58e78065 KE表格颜色问题 2016-05-19 16:38:48 +08:00
huang 4857769c49 Merge branch 'yuanke' into develop 2016-05-19 16:11:06 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
 2016-05-19 16:10:18 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 3ebef0eae2 消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面 2016-05-19 15:57:20 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
huang 61ba7b0c30 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-17 11:22:03 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +08:00
Tim fa788ced1b 资源库添加私有资源 2016-05-16 15:00:08 +08:00
huang 0d2a7d8bfd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 16:57:39 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
Tim d384d1e2b4 名师榜样式调整 2016-05-13 16:28:16 +08:00
txz 8d338cff9e 微信锁定帖子关闭回复 2016-05-13 15:48:31 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
Tim 61470c9bd4 名师榜css样式添加 2016-05-13 11:29:45 +08:00
cxt 17497cd74e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 10:57:54 +08:00
Tim 51a6727b07 名师榜样式 2016-05-13 10:41:13 +08:00
Linda a2418396dd 邦本库zip下载样式界面 2016-05-13 10:30:38 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
Tim 2ac201ffdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:41:42 +08:00
Tim 565d5e3bcc 作业测验列表html代码重构，添加序号列 2016-05-12 17:41:27 +08:00
cxt ac5a9c87ac 消息通知中的“同意|拒绝”调整宽度 2016-05-12 14:59:12 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
Tim 7957beb64a 发送至按钮样式控制 2016-05-11 15:51:59 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
Tim c8e0ffbdae 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00
Tim 2461a5c918 组织门户二级目录位置重新设置 2016-05-09 19:40:53 +08:00
Tim b32693ca2a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-09 18:44:43 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang f4a5aeec07 样式优化 2016-05-06 18:29:26 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
huang 6ba4b9dfa2 Merge branch 'yuanke' into develop 2016-05-06 18:07:24 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang b40a112015 配置页面一级域名超过的时候显示样式 2016-05-06 17:25:50 +08:00
huang 9c18b37349 Merge branch 'hjq_beidou' into develop 2016-05-06 17:05:27 +08:00
Tim c3aec4d115 组织一级栏目名称过长时溢出 2016-05-06 16:31:40 +08:00
huang 7f9a327166 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/sub_document_comments/show.html.erb
 2016-05-06 16:25:41 +08:00
Tim cd95ed0558 二级回复展开更多效果实现 2016-05-06 16:20:39 +08:00
yuanke d32e07bda9 项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点. 2016-05-06 14:22:45 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
yuanke a863c143f3 收缩箭头修改 2016-05-06 10:22:48 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
Tim 4bf1883ba2 组织门户导航栏二级显隐 2016-05-06 10:02:31 +08:00
yuanke 283a83013c KE 修改项目符号、表格颜色问题 2016-05-06 08:48:15 +08:00
Tim d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
cxt 55718f2d44 设置课程大纲时若博客标题太长以省略号结束 2016-05-05 11:34:31 +08:00
Tim c3514f5b6a 二级栏目名长度控制 2016-05-05 09:28:49 +08:00
Tim 787dbaaffc 二维码处文字样式处理 2016-05-05 09:08:01 +08:00
Tim abbbe9b7d6 二级子目录样式处理 2016-05-04 16:53:59 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
huang 7fbf6f4011 模式二帖子列表添加分页 2016-05-04 11:04:41 +08:00
cxt ff160ff793 题库的申请改为绿色按钮 2016-05-04 10:15:22 +08:00
cxt d3e3e9d22b 补交作品的样式 2016-05-03 18:15:40 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 8446fbe39a Merge branch 'weixin_guange' into develop 
Conflicts:
	app/services/wechat_service.rb
	public/stylesheets/weui/weixin.css
 2016-05-03 17:14:58 +08:00
txz de8b303b93 微信数据请求时显示加载中 2016-05-03 15:37:35 +08:00
yuanke 5f24fb6496 锁的样式修改 2016-05-03 14:40:33 +08:00
cxt 14a539bd0a 样式冲突 2016-05-03 11:40:24 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
Tim 56a4a64d09 北斗详情翻页更改；位置超出省略号 2016-04-29 17:09:15 +08:00
Tim 1f87d105d0 添加二级目录弹窗，翻页css 2016-04-29 16:47:06 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
Tim 5c795b92ee 图片百分百显示； 默认大图尺寸调整 2016-04-28 11:12:44 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
yuanke c729c1252d 项目、课程列表显示修改 2016-04-28 10:19:59 +08:00
Tim 024667d035 title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等 2016-04-28 10:17:59 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
Tim 5d44dc5bba 滚动栏js效果修改 2016-04-27 15:16:23 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
Tim c9cc4739aa 北斗组织微信块调整 2016-04-27 09:57:41 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
Tim b8d6ca0229 北斗组织门户样式更改 2016-04-27 09:36:54 +08:00
huang 17b2e82963 banner类型 2016-04-26 16:23:08 +08:00
Tim 86751e31fb 题库加入私有课程题目，可申请使用 2016-04-26 15:35:42 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
txz dcb150559e angularjs路径修改 2016-04-22 16:37:01 +08:00
yuanke 5c5d212193 博客列表 2016-04-22 13:52:33 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
txz 0bab42256c 微信loading弹框改 2016-04-21 11:21:29 +08:00
txz 39c64c9198 解决冲突 2016-04-21 10:41:54 +08:00
txz 8e254ff722 微信loading弹框 2016-04-21 10:38:36 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
txz 0b82bf50c2 微信内容中图片正常显示 2016-04-20 15:45:33 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
txz d0331da0c2 微信最新动态样式调整 2016-04-19 16:26:05 +08:00
huang 4e4cb309a9 版本库目录最新动态 2016-04-19 15:03:47 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
txz 73b89cdde5 微信边框，回复点赞样式更改 2016-04-18 11:19:13 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
Tim f479277a96 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:38:34 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
Tim deda05b048 作业下拉选择 2016-04-13 14:23:24 +08:00
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表 2016-04-13 11:20:38 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
txz 3665597153 详情页面排版调整 2016-04-12 14:56:17 +08:00
txz f82ad97a68 详情页面回复框宽度问题 2016-04-11 15:11:01 +08:00
txz 0262e3b8ab 回复长单词显示问题 2016-04-08 18:46:46 +08:00
txz 707127631e 微信公众号样式调整 2016-04-08 14:07:49 +08:00
guange 4e50a9e289 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:45:10 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
txz f3738519e9 长单词折行问题 2016-04-08 10:10:08 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
huang 8f4ff2bf91 列表样式问题 2016-04-01 10:20:31 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
huang 5866dfb7ff 登录 
没内容more
logo不加链接
 2016-03-31 20:12:20 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang 0244008b32 一些链接和样式 2016-03-30 17:33:22 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
ouyangxuhua 74d8dffc14 发送功能样式调整 2016-03-29 16:07:00 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
cxt f90b25b230 作业附件的用户名省略号太早 2016-03-22 15:50:06 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange 
# Conflicts:
#	Gemfile
#	db/schema.rb
 2016-03-21 18:17:39 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
cxt 54a00ca867 题库作业信息框的样式调整 2016-03-18 15:39:20 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
alan 9265186307 修改user动态中issue行高，使之与project中的一样 2016-03-17 14:36:05 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
huang 3d06d5a503 Merge branch 'yuanke' into develop 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-14 17:31:53 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
luoquan 006731ea61 修改以下问题： 
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
 2016-03-14 15:51:50 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
luoquan e0922e9b19 调整视频播放默认图大小 2016-03-11 16:25:05 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1e256add7f 媒体播放默认样式 2016-03-11 13:17:15 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
yuanke 6fa2fd8b47 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-03-10 15:11:33 +08:00
luoquan 1c6deadfd7 修改KE编辑的内容与发布的样式对其不一致问题 2016-03-10 10:58:43 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
yuanke 0805bfce6a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-03-09 15:32:24 +08:00
yuanke e073d58169 KE的几个问题修改 
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
 2016-03-09 10:16:27 +08:00
cxt 1cccf79bd8 课程资源库菜单中的删除资源无法点击 2016-03-09 09:20:53 +08:00
Tim 56372fbdd5 积分规则显示样式调整 2016-03-07 16:50:30 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
huang 596d4e17e9 解决样式冲突 2016-03-04 09:57:54 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
cxt 9b573248d8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_show_user_homework_form.html.erb
	app/views/users/_show_user_homeworks.html.erb
 2016-03-03 17:07:35 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
Tim 11592bdbcc 导入题库题目弹框样式更改 2016-03-01 17:28:49 +08:00
cxt f6f84b564e 在线测验的选项和候选答案的正确显示 2016-03-01 15:18:38 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
Tim 100b002a1f 提交改动显示页面调整 2016-02-25 15:48:49 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-24 16:08:38 +08:00
cxt e499be999f 课程英雄榜的样式修改 2016-02-24 16:05:48 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
huang ea2033eb30 Git文件识别，换行 2016-02-24 11:24:05 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
Tim 87f5f9c380 上传头像预览图片排版，课程关联组织取消按钮 2016-02-23 15:26:34 +08:00
huang 78c70dce81 版本库用户名长度引起的错位 2016-02-22 15:52:16 +08:00
ouyangxuhua 808f9a6b7a 组织页面右上角样式还原 2016-02-20 17:40:00 +08:00
Tim 228857f20c 资源历史版本样式 2016-02-20 17:23:24 +08:00
huang 59d45f2d52 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:18:49 +08:00
Tim 55b13e7dde 历史版本样式更改 2016-02-20 17:00:21 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua 02f8007557 修改组织配置的样式；修改一个bug 2016-02-03 12:42:42 +08:00
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-01 10:41:30 +08:00
Tim 83a3c879d4 私信配置按钮显示 2016-02-01 10:40:42 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
cxt a04f136e9f Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-25 15:33:59 +08:00
Tim 900b861f31 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-25 10:38:04 +08:00
Tim 035e47510f 图片更改 2016-01-25 10:37:32 +08:00
cxt 4b25383531 学生列表的tip被遮盖 2016-01-22 21:42:05 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00
cxt e09f795171 附件的显示 2016-01-22 17:05:58 +08:00
huang 448a412abf issue详情页面在 user动态、project动态中修改 2016-01-21 17:29:46 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后，跳转到个人首页 2016-01-21 16:11:06 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt f15847371c 附件显示过长 2016-01-21 10:36:30 +08:00
guange 7e18fe19be 添加适合微信图文的图片 2016-01-20 22:01:45 +08:00
guange 3f867a7f83 添加weui样式 2016-01-20 21:40:56 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
huang 01016c67a9 issue属性局部刷新 2016-01-20 18:28:27 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-20 09:27:29 +08:00
Tim cd3a1e59dd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-19 17:03:10 +08:00
Tim 04fded784e 单词折行样式 2016-01-19 17:02:46 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh 
Conflicts:
	db/schema.rb
 2016-01-14 17:54:16 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
 2016-01-14 17:35:25 +08:00
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
 2016-01-14 16:07:06 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-14 14:40:13 +08:00
ouyangxuhua 307d382568 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 14:38:08 +08:00
Tim 893e5dc7f3 针对课程370的精品课程样式设计 2016-01-13 18:33:22 +08:00
Tim f0347c9166 精品课程图标 2016-01-13 18:16:19 +08:00
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +08:00
huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/models/issue.rb
	app/models/message.rb
	app/models/news.rb
处理冲突
 2016-01-13 16:28:00 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
cxt e5f8c4c4a8 测试结果的对齐显示 2016-01-11 17:00:29 +08:00
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接 2016-01-11 16:44:52 +08:00
cxt a93539da5e 课程学期往前推一个学期 2016-01-11 11:07:03 +08:00
ouyangxuhua 09c7728201 样式更新 2016-01-11 10:35:25 +08:00
huang 5d68d185d5 资源样式冲突 2016-01-08 21:24:25 +08:00
cxt a206a1d7f1 样式 2016-01-08 20:43:33 +08:00
ouyangxuhua 0ac99571de 样式调整 2016-01-08 19:50:17 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
huang 0ab500986a 发送搜索功能 2016-01-08 18:03:59 +08:00
ouyangxuhua d574521b48 样式更新 2016-01-08 18:03:12 +08:00
huang dc90976497 项目资源库添加 “发送”功能 2016-01-08 17:09:32 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
Tim 125479f671 课程复制样式调整 2016-01-08 10:49:02 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 2b75c1e11a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-07 15:29:38 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
huang 972f2bfea8 完成项目资源库tag云的查询统计 2016-01-07 10:31:22 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-06 16:27:42 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang 9464495c19 资源搜索 
资源公开私有ajax
 2016-01-06 15:58:22 +08:00
Tim e9d986b311 课程关联项目样式调整 2016-01-06 11:01:00 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
huang 7ee4ff69b3 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-05 17:03:10 +08:00
huang 2efcb5b89a 课程讨论区添加展开、收缩 2016-01-05 16:05:27 +08:00
Tim 06fa32f0e2 博客高度控制 2016-01-05 15:23:37 +08:00
cxt c4886306d4 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-05 15:05:51 +08:00
huang 1f09817e4d 增加课程讨论区/项目讨论展开更多功能 
博客列表页面展开更多
统一展开高度为一个屏幕
 2016-01-05 12:59:59 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
cxt 3ddbeae100 课程的“更多”模式的文字不用粗体 2016-01-04 11:32:48 +08:00