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

1946 Commits

Author SHA1 Message Date
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +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
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +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
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
linchun 3c66a29767 完善课程资源列表，完成项目资源列表 2016-03-08 11:01:08 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt 6416b01037 课程里的“课程作业”改为“作业” 2016-03-04 14:28:06 +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
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
guange a7220a535e 修改wechat配置 2016-03-01 14:33:36 +08:00
guange 8f5645e5c1 修改wechat配置 2016-03-01 14:32:10 +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
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua d2267106c2 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
guange eed6250145 secdomain问题 2016-02-02 17:36:11 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
ouyangxuhua 7b56dc7f8e 管理员界面，解决编辑组织报错的问题 2016-01-29 18:43:14 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
huang 83ff449946 项目、课程资源 浏览 改成 上传文件 2016-01-22 21:51:31 +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 faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
ouyangxuhua d7b17b455d Merge branch 'szzh' into develop 2016-01-22 10:27:32 +08:00
ouyangxuhua 5e72734bee 增加3个url定制路由 2016-01-22 09:25:58 +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
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +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
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
guange 96d0b2e717 绑定用户事件 2016-01-19 14:07:59 +08:00
guange 9f667588c4 添加菜单 2016-01-19 11:50:59 +08:00
ouyangxuhua 909e0e846b 路由配置问题 2016-01-18 11:06:08 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织，栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
guange 080cc71912 wechat 路由修改 2016-01-16 11:59:09 +08:00
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
guange 744b246930 配置修改 2016-01-15 23:15:06 +08:00
guange b68eab23ea merge 2016-01-15 17:03:32 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
huang 18bc8215e3 路由冲突 2016-01-15 11:35:27 +08:00
guange c8b52db6f9 merge 2016-01-14 20:38:37 +08:00
guange c298adda7c 子域名路由实现 2016-01-14 20:37:56 +08:00
huang 71e155d83a Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:26:26 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题 
项目得分添加讨论回复计算
 2016-01-14 18:25:42 +08:00
ouyangxuhua 3697d74d48 子域名路由配置 2016-01-14 18:13:17 +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 a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +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
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +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 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +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 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
ouyangxuhua dab3f0d225 为组织1添加子域名：team 2016-01-05 16:55:21 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +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
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +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
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00
ouyangxuhua c2c4c032dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:27:22 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
guange aa951cd7b9 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 13:18:40 +08:00
guange 887d2f9f00 添加micros和nubot的链接 2015-12-30 13:14:32 +08:00
ouyangxuhua 40bf109223 给资源栏目增加board 2015-12-30 10:34:37 +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
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua d77625e4e9 Merge branch 'develop' into dev_hjq 2015-12-28 17:04:12 +08:00
huang 900d7d62cb 邮件按天发送添加提示 2015-12-28 16:14:32 +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
cxt d2f56693b4 课程通知新建报404 2015-12-25 19:02:26 +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
cxt 3e39eacd19 新建课程通知时通知标题框自动获取焦点 2015-12-24 16:45:45 +08:00
cxt f26f71c07a 课程通知改成动态的模式 2015-12-24 09:57:32 +08:00
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +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 b235e8de70 改为默认模板 2015-12-21 15:15:39 +08:00
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:22:08 +08:00
huang 88cdb5a3ed Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/repositories_controller.rb
解决冲突
 2015-12-18 17:08:26 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
houxiang 5f2e6284ce 增加了两个template文件，大家下拉代码后将template文件复制去掉后尾的template就行 2015-12-18 09:21:05 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +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
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
huang 074d8f62c2 delete the two config files on gitlab 2015-12-17 11:16:46 +08:00
ouyangxuhua 977100e92e 双击资源栏目标签可编辑，编辑标签后更新标签 2015-12-16 11:17:06 +08:00
ouyangxuhua af157a9c63 组织资源栏目增加标签功能 2015-12-15 17:30:24 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
ouyangxuhua a5fa68c928 资源栏目增加资源 2015-12-14 16:41:18 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +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 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 a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
huang 4e0b442309 修改邮箱的时候同步到gitlab 2015-12-10 10:50:15 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +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
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
ouyangxuhua e45ce0fb95 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-07 15:52:32 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
huang ab1c945a30 修改版本库库权限 
自己不能fork自己的项目
 2015-12-07 10:34:10 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 120a7274d3 fork样式显示 2015-12-04 17:22:22 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt 68a29d8131 学生提交作品后可点击重试重新上传作品 2015-12-01 15:18:14 +08:00
ouyangxuhua 6f9c89d67b 1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能； 
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
 2015-11-30 16:04:43 +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
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 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
lizanle 0992ddd0f6 全站搜索 2015-11-27 13:07:25 +08:00
lizanle 6be917e052 全站搜索 2015-11-27 11:34:42 +08:00
lizanle 768aff89da 全站搜索 2015-11-27 11:09:01 +08:00
lizanle f448b5f8e2 全站搜索 2015-11-27 11:00:06 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
lizanle ee47187a61 全站搜索 2015-11-27 09:52:51 +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
lizanle dcd441a9db 全站搜索 2015-11-26 16:43:10 +08:00
ouyangxuhua 9c3aed8028 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
Tim 3a66b1859c reserved修改 2015-11-24 16:47:31 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang a174cade83 commit by hx , 2015/11/13 2015-11-23 20:35:37 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
ouyangxuhua e01a7c2627 Merge branch 'szzh' into dev_hjq 2015-11-20 11:14:11 +08:00
ouyangxuhua 40a44c3568 增加文章二级回复功能 2015-11-20 10:52:26 +08:00
huang 74343a4929 发布问卷、取消问卷 2015-11-19 20:35:08 +08:00
huang 348488383c Merge branch 'develop' into szzh 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
 2015-11-19 16:24:56 +08:00
huang 2296a2f50c 添加学生提交作业 
老师发布作业功能
 2015-11-18 21:16:24 +08:00
cxt 3d3d50f1ea 编辑 2015-11-18 17:56:01 +08:00
cxt d407610740 填空题 2015-11-18 16:51:47 +08:00
ouyangxuhua 219774afab 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
cxt b635fdaeb7 路由 2015-11-17 18:33:42 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
huang 42a499815a 修改配置 2015-11-17 16:34:07 +08:00
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 09:34:09 +08:00
cxt 5400b907e6 学生测验列表 2015-11-17 09:33:40 +08:00
ouyangxuhua bd6a1a9d49 增加组织动态中的项目问题的回复框 2015-11-16 17:21:26 +08:00
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态； 
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
 2015-11-16 15:02:57 +08:00
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59:54 +08:00
huang ca8b62b8bd Merge branch 'szzh' into gitlab_guange 2015-11-14 15:22:05 +08:00
lizanle 56613b6358 增加项目的显示 2015-11-14 10:45:49 +08:00
huang ddbc9003c2 每个用户不能创建同名版本库 
不同的用户可以创建不同版本库
更新fork接口方法
 2015-11-13 20:24:30 +08:00
huang a40e5c5b54 frok功能开发--权限还未完成 2015-11-13 17:30:14 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
sw e6cd104ead index界面以及试卷统计相关路由添加 2015-11-13 17:23:52 +08:00
ouyangxuhua 71e6a8b135 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-13 17:21:44 +08:00
sw 70c5b27a43 相关路由 2015-11-13 16:40:39 +08:00
ouyangxuhua 3451ced888 添加我的组织页面及修改bug 2015-11-13 16:34:00 +08:00
ouyangxuhua 866c2feaa1 修改组织模块的bug 2015-11-13 15:02:12 +08:00
ouyangxuhua ef1bc8aea7 组织用户不能为空提示 2015-11-13 10:15:39 +08:00
ouyangxuhua 5aea2250c4 组织加入成员时，如果没有选择用户，弹窗给出提示 2015-11-13 10:14:38 +08:00
ouyangxuhua 2a5eeaa527 在组织页面左边，增加项目名称一栏 2015-11-13 09:13:57 +08:00
ouyangxuhua 6ec27761fb 组织功能实现及缺陷修改 2015-11-12 20:57:41 +08:00
ouyangxuhua d508cfa381 组织模块功能实现 2015-11-12 14:55:31 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
lizanle 20b49385de 更改时区设置 
作业发布消息添加发布时间
 2015-11-09 15:36:32 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
lizanle 59e95b08d7 feed_back 2015-11-05 13:49:27 +08:00
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 11:16:25 +08:00
cxt ee7b21de72 禁用匿评功能 2015-11-04 10:54:09 +08:00
lizanle 8d25b5676c tag_name名称长度扩大至120个字符 2015-11-03 14:56:32 +08:00
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器； 
编写创建组织页面。
 2015-11-03 11:19:38 +08:00
huang 4d5d012ecf 版本库相关界面调整 2015-11-02 16:41:15 +08:00
cxt 6e7a6909d6 作业动态中的未发布作业显示发布时间 2015-11-02 10:02:02 +08:00
lizanle b7a6bc3614 outline url 2015-10-30 17:21:12 +08:00
huang 89507b2b47 版本库域名写入配置文件中 2015-10-30 16:26:51 +08:00
huang aa4710d872 git中忽略配置文件 
提交记录新界面
修改获取用户路径
 2015-10-30 15:46:06 +08:00
huang 470fb3bfa6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-29 17:29:26 +08:00
lizanle 578bb2537d 课程大纲功能 2015-10-29 17:09:03 +08:00
huang df8d2f8dd4 gitlab调用commits接口 2015-10-29 14:20:23 +08:00
lizanle ac82910aa5 大纲 2015-10-29 11:53:52 +08:00