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

2344 Commits

Author SHA1 Message Date
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
cxt 9b974b6170 Merge branch 'cxt_course' into szzh 
Conflicts:
	db/schema.rb
 2015-12-31 15:39:07 +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
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +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
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +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
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +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
huang e5b4b9915d 添加footer图片 2015-12-25 16:06:24 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
huang a16d6803ae Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:48:41 +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
guange fd746c25f3 文件下载改为base64传输 2015-12-22 16:11:09 +08:00
guange 22d8fc9abd 作业附件乱码优化 2015-12-22 15:45:17 +08:00
huang 0e68266f49 版本库显示调整 2015-12-22 10:59:09 +08:00
guange 1724ae430e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 15:15:48 +08:00
guange 8cdd7c58cf at名单加宽一点 2015-12-21 15:14:51 +08:00
cxt e86f9f9aeb 去掉通知页面的字符限制 2015-12-21 13:20:09 +08:00
guange 5748078e3e 只调用一次at列表 2015-12-18 20:40:52 +08:00
guange 488e62472d at改为点击时加载. 2015-12-18 20:26:50 +08:00
guange 9dea58c921 将contentEditable改为enable_at 2015-12-18 17:41:14 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
guange 634815f93a at后字体改 2015-12-18 16:50:59 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00
guange 71a0802a49 at后字体改色 2015-12-18 16:46:35 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +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
cxt 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +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
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
guange ed649e0724 @颜色修改 2015-12-17 15:54:29 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
lizanle 4bc68081ee editor修改 2015-12-17 15:15:00 +08:00
lizanle 8d58b045f1 文件链接却弹出图片框 bug 2015-12-17 09:55:02 +08:00
lizanle 66f88cdf5a issue 文件 2015-12-16 16:55:07 +08:00
lizanle b13ae8f599 issue 2015-12-16 15:55:40 +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 da5709e3f0 . 2015-12-15 14:52:24 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
cxt af0e592d8a 匿评日期的设置 2015-12-14 17:03:20 +08:00
cxt d7b690e53a 匿评设置时匿评关闭日期可以等于匿评开启日期 2015-12-14 16:54:28 +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
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:11:48 +08:00
huang 616679e9c1 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:07:57 +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
lizanle d1423ebc7e ke高度小修改。 2015-12-11 15:41:41 +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
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang 35c918cb40 Merge branch 'hjq_new_course' into develop 2015-12-11 11:02:09 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
ouyangxuhua 48e7aa78d1 项目加载更多样式问题 2015-12-10 17:00:24 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
ouyangxuhua 1a7a97dbc5 引用了ke的页面下方存在一个可见的uploadbutton 2015-12-09 15:53:36 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +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
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
guange 71a5504017 去除at功能,合并 2015-12-07 15:05:51 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
guange 7e5a7fce29 加入atwho 2015-12-06 15:04:07 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
Tim 7e86d8fdf1 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:49:37 +08:00
Tim d115a97f78 追加附件效果调整 2015-12-04 16:49:14 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
cxt ae218fa86c 发布作业时添加分组作业 2015-12-02 11:14:46 +08:00
lizanle 8f4c915c57 博客的非空验证bug 2015-12-01 17:33:18 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
 2015-11-30 11:07:53 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
huang 41b99af7dd Merge branch 'develop' into sw_new_course 2015-11-27 17:17:21 +08:00
Tim 06ca4c8f4b 作品列表样式调整 2015-11-27 16:52:28 +08:00
cxt 85aade79ce Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	public/stylesheets/courses.css
 2015-11-27 15:21:32 +08:00
cxt f7ac2b0ef5 老师查看学生的答卷结果 2015-11-27 15:19:13 +08:00
huang 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course 2015-11-27 14:47:16 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
Gan Yi.ang ee85cc35ed Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 11:27:03 +08:00
Gan Yi.ang 1115d54d9a 非trustie用户changesets_latest_coimmit 2015-11-27 11:25:16 +08:00
Tim 2d14b66336 作品列表样式调整 2015-11-27 10:56:46 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
 2015-11-27 09:50:17 +08:00
cxt f8621cac76 未设置考试时长时，只要还未到截止时间就可以一直提交试卷。 2015-11-26 16:57:51 +08:00