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

1969 Commits

Author SHA1 Message Date
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
cxt a4a29b0ee9 关联项目的文字样式调整 2016-01-04 11:26:42 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
ouyangxuhua 9c34cf6c3a 课程/项目帖子页面，齿轮菜单内容居中显示 2015-12-31 15:30:36 +08:00
lizanle ff88d1ed2c Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle 
Conflicts:
	db/schema.rb
 2015-12-31 11:12:32 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
Tim ecd1cd6041 资源库样式调整 2015-12-31 11:06:59 +08:00
ouyangxuhua 2271befedd 修正组织部分页面的样式 2015-12-31 09:50:41 +08:00
cxt 335ea381b4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2015-12-30 16:28:09 +08:00
cxt 76b95fbf93 课程和项目的课程简介默认可显示20行 2015-12-30 16:27:56 +08:00
Tim 077368f597 匿评增加系统评分显示，对应样式调整 2015-12-30 16:02:31 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
huang d6e765cf4a 修正讨论区删除跳转 2015-12-29 15:46:20 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
huang c29e6f1b14 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/boards/_project_show.html.erb
	app/views/boards/_project_show_detail.html.erb

解决冲突
 2015-12-29 11:09:16 +08:00
huang 5060ec26bb 项目讨论区 2015-12-29 11:04:20 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua 5334a3d40f 链接样式还原 2015-12-28 17:14:15 +08:00
ouyangxuhua 33ea55ecca 项目/课程帖子发送弹窗样式修改 2015-12-28 17:03:13 +08:00
lizanle e35d2daa0a 课程资源库 2015-12-28 16:19:30 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
lizanle 3b08adfc68 课程资源页面修改。 2015-12-27 23:24:21 +08:00
cxt 37aee434e2 缺陷动态的回复图片超出边框 2015-12-25 19:43:49 +08:00
cxt f63f38fb82 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 17:07:34 +08:00
cxt bca503f171 追加附件必须填写描述 2015-12-25 17:07:27 +08:00
huang 533be61cf7 添加底部样式 2015-12-25 16:13:17 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
Tim 1a24505eac footer新增图片，样式修改 2015-12-25 15:27:45 +08:00
cxt b8d8cece02 关联项目的样式修改 2015-12-25 14:56:08 +08:00
huang a92d33300b 里程碑 添加 “已解决”，区分已解决和已关闭 2015-12-24 17:18:52 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
Tim eb7d0761cb 组织菜单栏修改成和个人首页相同 2015-12-24 10:37:13 +08:00
Tim c405950469 课程关联项目列表显示调整 2015-12-23 17:26:13 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
huang 0e68266f49 版本库显示调整 2015-12-22 10:59:09 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
lizanle 8ce2dbc4b8 issue回复 2015-12-17 18:12:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
guange ed649e0724 @颜色修改 2015-12-17 15:54:29 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
lizanle 66f88cdf5a issue 文件 2015-12-16 16:55:07 +08:00
cxt dc0f004021 关联项目的提示信息 2015-12-16 15:47:30 +08:00
lizanle 2aa241bffa issue 2015-12-16 11:50:30 +08:00
cxt bfde278340 学生作品列表的样式调整 2015-12-16 11:02:52 +08:00
lizanle 02a9f08fe6 表单长度对齐 2015-12-16 10:19:48 +08:00
lizanle 68aceaa7df issue下载 2015-12-15 18:43:58 +08:00
guange 4ce9eb428e at样式问题 2015-12-15 16:28:11 +08:00
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-15 16:03:26 +08:00
cxt 0deffdba33 在线测验学生答题时可点击保存也可点击提交 2015-12-15 15:21:52 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
ouyangxuhua a5fa68c928 资源栏目增加资源 2015-12-14 16:41:18 +08:00
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00
ouyangxuhua de0b5d1897 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 16:58:19 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型，可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt d4bde8e73c 调整学生作品列表的样式 2015-12-11 16:05:18 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
ouyangxuhua 48e7aa78d1 项目加载更多样式问题 2015-12-10 17:00:24 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang 3459164e64 过滤条件样式 2015-12-07 17:25:32 +08:00
huang 5f6d9f2425 项目动态新样式 2015-12-07 17:14:13 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00