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

1599 Commits

Author SHA1 Message Date
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang cb148c3b9c fixed 500 2016-07-11 10:48:44 +08:00
cxt 320db4ddd9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	.access_token
 2016-07-08 20:01:55 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
cxt 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
huang 67cad6fc25 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:54:38 +08:00
huang 374a905d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:53:47 +08:00
huang e74a2ba275 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:53:29 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
yuanke a7ecfba23b Merge branch 'yuanke_org' into develop 2016-07-01 17:52:23 +08:00
cxt 0e2e1b09b5 title修改 2016-07-01 17:51:01 +08:00
yuanke 547d5409bb 组织中的课程字样改为班级 2016-07-01 17:43:38 +08:00
txz 7178c50b1d branch's total commits 2016-07-01 15:37:39 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
Your Name 77387778d8 some css 2016-06-29 14:08:30 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
Your Name e5b93ac7ed modified main method 2016-06-27 18:13:46 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 01bedc4bc2 编码问题 2016-06-24 19:40:06 +08:00
huang 4a4c613c55 utf-8编码 2016-06-24 19:38:08 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
cxt f984a01cdc 跳转协议问题 2016-06-24 18:50:47 +08:00
cxt b5c9156c10 加入课程报403 2016-06-24 18:43:12 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name e4e0e7b166 helper 2016-06-24 12:17:05 +08:00
Your Name e17aa4c5d8 color 2016-06-24 11:20:39 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
huang a0635bbb2d 所占百分比 2016-06-24 10:47:21 +08:00
huang dcd2aa7848 参考临界值 2016-06-24 10:05:49 +08:00
Your Name e6b263feb5 issues from sonar 2016-06-24 09:58:51 +08:00
Your Name 0dc1a1c047 get status 2016-06-23 18:24:22 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
cxt e3ee99b486 消息通知中过滤掉已删除的课程消息、 
at消息不显示
 2016-06-16 15:46:16 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
huang 90aaaa544a 最新动态按创建时间排序 2016-06-08 11:36:32 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang 9c01bb63e7 配置页面管理员栏目权限控制 2016-06-07 17:36:33 +08:00
huang c5bccf1adb 组织动态按更新时间排序 2016-06-07 16:02:46 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang bfa447c195 未登录状态下anonymos改为未登录 2016-06-06 15:11:07 +08:00
huang edbe882cc9 管理员栏目其它成员不可见 2016-06-03 15:56:04 +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
huang e726a362d8 组织配置页面状态的更新 2016-06-03 14:56:38 +08:00
huang 1e34a4f174 显示样式一级添加二级目录权限 2016-06-03 14:43:20 +08:00
huang fa2437cdf6 添加课程学期 2016-06-03 14:28:12 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang 0b3ec0322f 右一模式 2016-06-02 18:41:00 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
cxt 0cc8cb9928 刚提交的回复时间显示为“刚刚” 2016-06-01 08:57:27 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang a96fafd704 模式三（未完） 2016-05-31 18:37:21 +08:00
huang 8d56d8556f 完成模式6 2016-05-31 16:03:48 +08:00
huang bb7204846f 新版资源类型定制模式6 2016-05-31 14:41:50 +08:00
cxt 796125bd1c 修改微信端的时间提示 2016-05-31 14:18:40 +08:00
huang c369b271a0 组织管理员配置后的权限控制及局部刷新 2016-05-31 11:24:47 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +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
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang 79e57e2b7f 代码和并冲突处理及连接参数 2016-05-13 17:00:25 +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
huang 39c753fd25 名师列表排序 2016-05-13 16:54:27 +08:00
huang 467ee60657 名师默认显示5个，没有则不显示 2016-05-13 15:37:04 +08:00