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

7174 Commits

Author SHA1 Message Date
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang a9510f4869 Merge branch 'dev_hjq' into develop 2015-12-10 17:29:52 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
ouyangxuhua aab9594ac9 1.解决英文版下，组织成员列表编辑成员显示错误； 
2.解决在组织文章详情页面，删除文章报错的问题
 2015-12-10 17:22:59 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
huang dbadbf8621 修改密码gitlab同步 2015-12-10 15:54:44 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
ouyangxuhua 78fb8b6254 1.编辑或者删除栏目的帖子返回对应页面 2015-12-09 16:19:52 +08:00
cxt f2f81d5243 作品列表的代码缩进 2015-12-09 10:52:56 +08:00
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能； 
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
 2015-12-09 10:48:15 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
lizanle 6c02115f3f 不允许修改登录名 2015-12-09 10:17:30 +08:00
lizanle c1d82d6348 输入框 和 ke对齐 2015-12-09 09:39:07 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
cxt c26778b41c 分组作业关联项目 2015-12-08 17:36:35 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
lizanle 92bc3361fe 匿评失败消息改变 2015-12-08 15:33:17 +08:00
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-08 15:31:17 +08:00
ouyangxuhua bb7bcf46a9 1.设置首页后，跳转至组织首页 2015-12-08 15:30:58 +08:00
huang 7c34122ff6 fork的时候如果用户没有同步，则自动同步 2015-12-08 09:46:29 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
ouyangxuhua 5198f4dde4 Merge branch 'dev_hjq' into develop 2015-12-07 17:19:26 +08:00
ouyangxuhua 9d6b4783df 删除组织配置栏目的组织首页项 2015-12-07 17:18:46 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
lizanle ee661bb6d4 input光光标到最后的折中解决方案 2015-12-07 16:21:00 +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
lizanle 9e01f02a66 作业题目统一改为作业标题 
作业匿评截止消息改造
 2015-12-07 15:52:22 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
lizanle ad2d9fa374 添加对帖子的全文搜索 2015-12-07 15:32:57 +08:00
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
cxt c8f4149206 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 15:18:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
huang 5eb249515c 版本库显示样式 2015-12-07 15:12:30 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua 9f30c7a44e 如果用户没有登陆，不能在组织页面中，增加项目或课程。 2015-12-07 14:37:35 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt 0472a5ed0c Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 10:54:28 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
huang ab1c945a30 修改版本库库权限 
自己不能fork自己的项目
 2015-12-07 10:34:10 +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 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
ouyangxuhua 4c9d9dee35 组织首页样式 2015-12-05 13:27:58 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua 5b0bdb5069 修改组织栏目的内容及样式 2015-12-04 18:19:35 +08:00
huang c7058e6bbf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:45:18 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 6fad26cabf 去死奥placebold 2015-12-04 17:32:56 +08:00
cxt 8b160b1c38 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:29:55 +08:00
cxt 19c34de643 编辑作品时弹出的作品确认框不提供重试的按钮 2015-12-04 17:29:39 +08:00
huang 120a7274d3 fork样式显示 2015-12-04 17:22:22 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
huang 61d76e6744 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:42:55 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 7fe3a02d81 Merge branch 'gitlab_guange' into develop 2015-12-04 09:11:22 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
huang 5d18b14e73 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 2015-12-04 00:16:21 +08:00
huang 057d9a3337 0 2015-12-04 00:15:47 +08:00
huang 8d891a9faa fork权限 2015-12-03 20:57:09 +08:00
huang b91c65798d 课程成员添加设置 2015-12-03 20:44:29 +08:00
cxt 4e9e7543ba chrome浏览器点击保存测验头部信息无反应 2015-12-03 19:21:35 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt 9c4c90e066 Merge branch 'develop' into cxt_course 2015-12-03 09:55:18 +08:00