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

9906 Commits

Author SHA1 Message Date
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
cxt 23ff5f6449 匿评时具有多重身份的教辅打的分变成了“我的评分” 2016-08-30 15:01:41 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
huang 2b7a38062c css for red 2016-08-30 11:30:08 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
cxt f803a23298 组织头像编辑的小笔调整 2016-08-29 16:49:54 +08:00
cxt 141118e3d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:54 +08:00
Tim ac0cc37fe4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:23 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
cxt 60fb21d2fc 班级主页的样式调整 2016-08-29 16:30:37 +08:00
cxt eb255d84b1 issue详情页里的点赞刷新 2016-08-29 16:25:30 +08:00
cxt 45f0234ff7 组织logo点击可编辑 2016-08-29 16:19:06 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
cxt acb18ca4c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:40:26 +08:00
cxt 15ba4a6136 头像调整 2016-08-29 15:38:58 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
Tim a8d551105b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:28:45 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
cxt cbcf414e63 班级主页的访问计数 2016-08-29 14:44:33 +08:00
cxt 547fb8a1a5 未登录用户访问个人主页时的头像显示 2016-08-29 14:41:01 +08:00
cxt 0b0a23f270 issue详情页面的点赞 2016-08-29 14:26:25 +08:00
cxt 313bc8573d 首页访问计数失效 2016-08-29 14:01:40 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
huang 8c4f943f83 注释掉资源提示 2016-08-26 19:33:18 +08:00
huang 5237d9664f css for avatar 2016-08-26 18:52:20 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 9b86661f4a <ul class=contribute-list> 2016-08-26 17:49:31 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt f25a90cccd 项目的非创建者管理员也可编辑项目头像 2016-08-26 17:33:04 +08:00
cxt 5fbb9f56a6 Merge branch 'dev_shcool' into develop 2016-08-26 17:10:15 +08:00
cxt 148aa9cda9 首页头像调整 2016-08-26 16:42:29 +08:00
huang af68f4ca76 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/files/_course_file.html.erb
	app/views/files/_project_file.html.erb
 2016-08-26 16:27:14 +08:00
huang a71f948f41 项目、课程资源库添加私有资源提示 2016-08-26 16:26:12 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
yuanke 21df119c59 Merge branch 'weixin_guange' into develop 2016-08-26 16:19:50 +08:00
yuanke a66ecf6c28 修改图片地址 2016-08-26 16:18:57 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
huang a434942b6d Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-26 15:14:07 +08:00
huang 60a76e64a5 贡献列表 2016-08-26 15:13:07 +08:00
cxt cdffaed1ea 班级主页设置班级为公开私有时刷新资源库页面 2016-08-26 15:11:57 +08:00
cxt eb20ca4ffe 新建班级时班级名称实例要加上课程名称 2016-08-26 14:56:29 +08:00
cxt 0d05d04d2c 头像编辑的样式调整 2016-08-26 14:44:32 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
yuanke fcf6325761 Merge branch 'weixin_guange' into develop 2016-08-26 14:04:22 +08:00
yuanke 2a6321cd9e 发布帖子标题长度改为128 2016-08-26 14:03:09 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
daiao d37cbaad61 1.完善资料流程优化；2.基本资料从业者单位保存丢失问题 2016-08-26 10:14:48 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim 27678d09f6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:55:49 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
cxt d8117f9576 作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致 2016-08-25 15:43:11 +08:00
daiao 758aaca12a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 15:29:19 +08:00
daiao a466fdd64e 强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用 2016-08-25 15:29:04 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
huang 3778871f58 issue在项目动态、列表、用户动态中删除回复添加提示 2016-08-25 10:39:16 +08:00
huang 69301a1120 Pull reques登录提示（权限控制） 2016-08-25 10:04:51 +08:00
huang 799c451921 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 09:20:46 +08:00
cxt 21c48ea383 at所有人 2016-08-24 17:46:18 +08:00
huang 80c6132ba5 Merge branch 'rep_quality' into develop 2016-08-24 17:39:44 +08:00
huang 7493de1334 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 17:38:40 +08:00
huang 0cc59260cd modified sonar list form of language 2016-08-24 17:35:04 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
huang 8cc60ef1e8 delete some language of quality_analysis 2016-08-24 17:28:55 +08:00
cxt ea7f65308e at所有人后不应带有用户登录名 2016-08-24 16:02:02 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
daiao a3ec35c008 个人主页报500 2016-08-24 15:56:03 +08:00
huang f0ed380002 Merge branch 'rep_quality' into develop 2016-08-24 15:13:37 +08:00
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 8b0c0925dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-24 14:52:10 +08:00
daiao 078900088a 修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500 2016-08-24 14:41:26 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
Tim bb2b51aa8d 收藏按钮增加title 2016-08-24 10:30:20 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
cxt 5d5bd88c88 个人主页：用户不应有修改他人头像的权限 2016-08-24 09:30:57 +08:00
cxt 74b15229fb at所有人 2016-08-23 17:15:51 +08:00
daiao 5088770214 修复：文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
daiao 7e34062435 Merge branch 'dev_shcool' into develop 2016-08-23 09:43:38 +08:00
huang ea6b928188 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-22 17:19:48 +08:00
huang 5e98884801 tip for sonar 2016-08-22 16:32:32 +08:00
cxt 06361246c7 作品列表中的已提交人数无法自动刷新 2016-08-22 15:24:12 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
huang ea3ba1f71e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-14 11:30:54 +08:00
huang 577aa40ea1 time for nil 2016-08-14 11:27:49 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
huang 1f4f03d8ed 修改项目列表中的资源链接 2016-08-13 17:31:09 +08:00
cxt a4a0ef139b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 17:04:16 +08:00
cxt 1374444ec1 左侧项目列表的展开 2016-08-13 17:04:09 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-13 15:35:10 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
daiao 4a9967674a 1. 强制编辑基本资料，在删除单位时给出消息通知 
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
 2016-08-13 14:29:33 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
guange a761bfe3f8 . 2016-08-13 11:37:37 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 3a000a360a appid 修改 2016-08-11 17:30:06 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
cxt 03c093fb13 班级作业列表中“赞”和“取消点赞”不可用 2016-08-11 16:34:00 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
huang 3df8a46634 PUll request代码简化及reverse评论 2016-08-11 14:16:13 +08:00
huang 41ad5ca444 修改Gitlab接口返回创建时间 2016-08-11 11:11:49 +08:00
Tim f4445619d2 题库预览弹框样式调整 2016-08-11 11:02:40 +08:00
huang a9942fd4b3 change integer to A 2016-08-11 10:48:48 +08:00
Tim 59a76c3b9a 调整组织上传资源弹窗位置 2016-08-11 10:47:22 +08:00
cxt bae0562b97 适用专业和先修课程的换行显示 2016-08-11 10:32:57 +08:00
cxt 9b8470b813 编辑分组作业后点确定，原来设置的基于项目实施会被取消 2016-08-11 10:23:44 +08:00
huang 88e35c7431 quality list 2016-08-11 10:02:59 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
cxt d99348c245 测验描述超出边框 2016-08-11 09:46:41 +08:00
Tim 83323e7d18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-10 17:19:42 +08:00
Tim ba7f9ed735 班级、项目侧导航文字缩小 2016-08-10 17:19:32 +08:00
huang b046f24b44 合并信息提交 2016-08-10 16:54:58 +08:00
cxt 7edb30754b student_works添加字段commit_time，记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
huang 98a8702ba6 记录谁合并的pull request请求 2016-08-10 16:49:48 +08:00
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
huang 8af8147ebb 代码分析列表加上时间 2016-08-10 14:47:50 +08:00
cxt a50ac2d79d 禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示 2016-08-10 14:22:05 +08:00
huang e2557aede8 test jenkins 2016-08-10 10:58:47 +08:00
cxt 0cc9fafddb “关注、粉丝”页面中分页显示要紧跟上面的内容 2016-08-09 17:21:11 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
cxt 8de8035441 班级首页顶部加上主讲老师的链接 2016-08-09 16:17:58 +08:00
huang 4f3b41f323 详情页面提供分页（评论、变更、提交） 2016-08-09 16:11:49 +08:00
cxt 65f6b0fc70 新建课程报500 2016-08-09 15:50:23 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang b7bccc7d22 PR添加评论 列表页面 2016-08-09 14:00:36 +08:00
Tim 5838e8f810 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:45:33 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
cxt 547aae0743 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-09 10:40:25 +08:00
cxt 2951259d23 左侧项目列表的展开 2016-08-09 10:40:00 +08:00
cxt 153e02c4fa 消息列表报500 2016-08-09 10:39:32 +08:00
cxt 40dc9b761f 未配置课程的班级报404 2016-08-09 10:39:12 +08:00