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

9643 Commits

Author SHA1 Message Date
cxt 18539b45de Merge branch 'dev_shcool' into develop 2016-08-01 14:03:58 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
huang 3feb0680cc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 09:50:31 +08:00
huang f7e8c5232c 个人主页加入项目，如果已经申请了则提示已申请 2016-08-01 09:50:05 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00
huang 21eed9ebb3 去掉同意拒绝“：” 2016-07-29 23:03:18 +08:00
cxt bf529f07a5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:49:46 +08:00
huang 97288d4eb4 按钮样式 2016-07-29 22:51:13 +08:00
cxt 23bb010315 课程列表的资源数显示不对 2016-07-29 22:49:39 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 641ccee631 修改名称过长问题 2016-07-29 22:02:23 +08:00
cxt 98a2ebd682 Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
cxt 4a800b67d8 消息列表报500 2016-07-29 21:53:00 +08:00
cxt a41fbdb985 课程大纲报500 2016-07-29 21:50:44 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +08:00
cxt ebb336afa0 课程大纲的二级回复 2016-07-29 21:48:10 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
yuanke 1704462986 管理员界面单位申请修改 2016-07-29 21:45:32 +08:00
cxt 04b9c35a05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 21:41:26 +08:00
cxt 807db1ac40 课程角色申请链接的样式 2016-07-29 21:41:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
huang cf63d252e2 局部刷新 2016-07-29 21:37:35 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
huang f857ceab32 消息中项目添加title 2016-07-29 21:07:15 +08:00
huang 8d625eff5e 修改方式就用户图像显示 2016-07-29 21:04:01 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt 02bee33ad2 身份切换加提示 2016-07-29 20:33:35 +08:00
huang 0bf9b5c6e6 消息红点记录 个人主页添加加入项目入口 2016-07-29 20:31:24 +08:00
cxt b3d34d6e0f 配置班级列表的名称显示全 2016-07-29 20:18:26 +08:00
huang 153efb7eda 局部刷新 2016-07-29 19:42:21 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
huang 60417b2db7 项目邀请消息样式问题 2016-07-29 19:30:53 +08:00
cxt 5a8d2407e2 放开新建课程、新建班级的权限 2016-07-29 19:28:50 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
huang 48a72ff816 代码分析结果入口放置在版本库 2016-07-29 17:46:24 +08:00
cxt a1553c7a8f 角色的修改 2016-07-29 16:27:02 +08:00
daiao 5b30036639 单位名称列表功能 2016-07-29 16:11:26 +08:00
huang 769a07bd94 去掉配置页面的成员申请 2016-07-29 16:00:46 +08:00
huang 450217e7c2 同意加入消息发送，及添加成员 2016-07-29 15:58:24 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop 
Conflicts:
	db/schema.rb
 2016-07-28 20:02:57 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
yuanke de46c5d9ca Merge branch 'weixin_guange' into develop 2016-07-28 17:27:57 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality 
Conflicts:
	db/schema.rb
 2016-07-28 10:19:37 +08:00
huang 7413298aad 项目邀请码申请及弹框 2016-07-28 10:18:35 +08:00
cxt e275cd9aa0 邀请码 2016-07-27 17:18:26 +08:00
cxt e2546cdcb7 邀请码的提示 2016-07-27 17:14:06 +08:00
cxt 2fea69359d 非本课程成员无法看到邀请码 2016-07-27 16:47:47 +08:00
cxt 0dfc887f74 复制班级中资源的提示修改 2016-07-27 16:43:27 +08:00
huang b1f69140c7 issue用户添加链接，issue链接颜色修改 2016-07-27 14:47:13 +08:00
Tim 52475099dc 博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理 2016-07-27 14:36:46 +08:00
cxt 35b3993c0c 未提交的作品去掉提示 2016-07-27 14:14:29 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
huang 43cb2a0d18 单位申请消息显示 2016-07-27 11:33:54 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
cxt aafe0aa4ae 删除班级留言时左侧导航栏的样式问题 2016-07-27 10:20:27 +08:00
cxt 4422bb1bc0 课程列表中的私有班级不可访问 2016-07-27 10:11:00 +08:00
cxt 76eca76728 作业发布时资源库的提示修改 2016-07-27 09:39:42 +08:00
cxt a0f2f518cf 回复他人的博客首页不应跳到自己的博客首页 2016-07-26 17:45:59 +08:00
cxt d17a9dabd8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/helpers/courses_helper.rb
 2016-07-26 16:59:20 +08:00
daiao 0d59f5a358 Merge branch 'daiao_dev' into develop 2016-07-26 16:57:18 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang d51295127d issue删除回复删除附件的问题 同事关联删除 2016-07-26 16:13:20 +08:00
daiao 3661969528 修改课程下，课件名称，显示尽可能全 2016-07-26 14:48:36 +08:00
daiao 1dcf4918b9 非管理员用户在新建帖子时，置顶及锁定功能在页面不显示 2016-07-26 14:30:12 +08:00
huang e7f862458f issue回复问题； 二级回复编辑issue弹空白框问题 2016-07-26 12:06:54 +08:00
daiao 6ab2c15504 修复先删除课程下的某班级，再删除该课程报错 2016-07-26 10:38:04 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
daiao 4646d13234 1.修改资源课程名称，竟可能显示全。 
2.班级动态下，去掉“班级动态>”
 2016-07-25 18:54:44 +08:00
daiao 5883b451ca 在管理员界面添加单位名称列表 2016-07-25 18:31:28 +08:00
huang 774650c819 项目邀请码直接数据库读取，权限修改 2016-07-25 15:22:34 +08:00
cxt 1e0ed2bfba 新建课程和班级时的占位符需要更改 2016-07-25 14:54:57 +08:00
cxt 812481d5fa 非班级成员邀请码显示为***** 2016-07-25 14:49:08 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +08:00
cxt 11c9fba7e7 提示信息修改 2016-07-22 18:58:41 +08:00
cxt dc9c0f924b 教师列表和学生列表的样式 2016-07-22 18:39:50 +08:00
cxt 48d5b89338 课程推荐为0的不显示 2016-07-22 18:26:48 +08:00
cxt 60fe1854cd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 18:20:48 +08:00
huang ab4d85dcb7 组织500问题 2016-07-22 18:21:27 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course 2016-07-22 17:14:28 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
cxt 808b553e43 班级动态只有10条，底部却显示“点击展开更多” 2016-07-22 16:50:32 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +08:00
cxt 27fa113de1 组织动态报500 2016-07-22 16:40:28 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
cxt 6b1116dfd1 课程的回复和名称的编辑 2016-07-22 16:00:56 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 10:35:44 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
cxt 0146ac1f11 访问他人主页时，对于动态过滤按钮，“我的动态”应改为“他的动态”；但浏览自己的主页时，应该显示为“我的动态”。 2016-07-21 10:50:53 +08:00
cxt f3c95906d8 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
Tim 53c515b8d1 课程大纲侧导航js控制 2016-07-21 10:28:50 +08:00
daiao 7c2495c8a1 统一在线测验新建单选选项时，样式出现的bug 2016-07-21 10:20:45 +08:00
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00
huang d58167f4bc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-07-21 09:27:33 +08:00
huang 6357f5be2a 解决成员列表获取单位不准确的问题 2016-07-21 09:27:14 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
Tim 635b3beb32 新建issue版本图标问题 2016-07-20 16:46:58 +08:00
Tim 5adc4e1e5a 项目issue上传附件与填写正确加间距 2016-07-20 16:41:53 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式；作业列表调整 2016-07-20 15:09:01 +08:00
daiao a55e64dfb3 保持组织动态用户名颜色与其他动态用户名颜色显示一直 2016-07-20 14:46:33 +08:00
huang e99c76a0de resolve edit problem of jenkins job 2016-07-20 10:09:55 +08:00
daiao 763ebcbf74 修复课程总学时结果，总学时=理论学时+时间学时 2016-07-19 17:39:20 +08:00
daiao 7808bb5ebe 修复非管理远用户帖子出现管理员帖子置顶的问题 2016-07-19 17:37:39 +08:00
Tim eb503cc3e8 Merge branch 'develop' into cs_optimize_txz 2016-07-19 16:50:30 +08:00
huang 26d4be6518 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-19 15:25:54 +08:00
huang 1a129722eb Merge branch 'rep_quality' into develop 2016-07-19 15:25:13 +08:00
huang 4e3bfd9254 some bugs for sonar show 2016-07-19 11:17:54 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
Tim 1fc2bbd56a 作业资源库弹框，资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +08:00
cxt 8e3488132b 导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库 2016-07-18 14:43:47 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
cxt 9e5e7a75b0 编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示 2016-07-18 14:09:41 +08:00
huang 412d74e295 优化最近动态获取方法 2016-07-18 13:57:00 +08:00
cxt a9ee1d10cd 新增班级成员的消息通知，跳转至该班级的成员配置页面 2016-07-18 11:19:56 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
yuanke ba1af901ad 强制更新myresource.js 2016-07-15 17:39:21 +08:00