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

13443 Commits

Author SHA1 Message Date
yuanke d6ae177885 Merge branch 'weixin_guange' into develop 2016-09-09 09:05:59 +08:00
huang 8bb2b5e8d9 change sonar reuslts 2016-09-09 09:00:21 +08:00
yuanke 4adc988ec1 微信图片url修改 2016-09-09 08:35:08 +08:00
yuanke 7a71a7bd47 Merge branch 'weixin_guange' into develop 2016-09-08 18:54:18 +08:00
yuanke a6b03ed9f1 微信头像刷新修改 2016-09-08 18:53:36 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
Tim 2c719feacd 无用的内联样式 2016-09-08 18:34:35 +08:00
yuanke 8c71cf1946 Merge branch 'weixin_guange' into develop 2016-09-08 18:18:13 +08:00
yuanke 5c626f94b5 微信二级回复框不显示修改 2016-09-08 18:04:37 +08:00
yuanke 2ad432c5ce 调试 2016-09-08 17:51:36 +08:00
huang 6dbb2e4e94 Pull request数量为0的时候显示在更多中 2016-09-08 16:03:32 +08:00
huang 08c64d2ac7 解决新建及复制issue时点击取消没反应的问题 2016-09-08 15:38:01 +08:00
cxt cf25dc8dfd 首页的项目列表 2016-09-08 15:00:20 +08:00
yuanke be0158fbb0 微信二级回复BUG修改 2016-09-08 14:10:58 +08:00
cxt d8e04e7923 暂时隐藏“复制班级” 2016-09-08 14:04:40 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
cxt 3efc158fb5 班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示 2016-09-08 10:54:41 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
cxt 49e8a6f1ff 作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框 2016-09-07 15:45:12 +08:00
cxt 775ed19129 admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级 2016-09-07 15:26:15 +08:00
yuanke d8a4eb56cf 微信上传头像修改 2016-09-07 15:14:46 +08:00
yuanke c234a8d2cb 个人资料修改功能 2016-09-07 14:19:07 +08:00
cxt e6ddb3cec0 个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态 2016-09-07 11:30:26 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
cxt e084543030 新建作业时给出截止日期和发布日期的提示 2016-09-07 10:45:22 +08:00
cxt 5433e6d714 多重角色，教师/助教查看自己作为学生身份时提交的作品，追加附件重复显示 2016-09-07 09:29:06 +08:00
cxt 7b2943c37a 重试 2016-09-06 18:01:16 +08:00
cxt 8edfec258b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-06 17:51:20 +08:00
cxt 7b2ce93acc 分组作业添加成员 2016-09-06 17:51:13 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改；测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
cxt e2aef37114 分组作品的提交出错 2016-09-06 17:06:31 +08:00
cxt bf4c6d049c 新建分组作业时不创建作品列表 2016-09-06 16:38:29 +08:00
cxt 17f6b9c286 管理员界面的被留言内容加上“RE: ” 2016-09-06 15:17:49 +08:00
cxt 1e7f3db946 分组作业：组内每个成员都复制一份组长的作业，得分相同 2016-09-06 15:07:43 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
yuanke f5ef2bac50 微信回复的回复后台修改 2016-09-05 17:06:25 +08:00
daiao cdd4dfcf09 项目列表中：私有项目对非成员显示，非成员不点击进入 2016-09-05 16:55:56 +08:00
yuanke a07462076d 微信回复的回复后台功能完善 2016-09-05 16:38:25 +08:00
cxt 252851b4ad 课程导航的修改 2016-09-05 16:36:43 +08:00
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +08:00
yuanke fd3c0effe5 Merge branch 'develop' into weixin_guange 2016-09-05 14:50:06 +08:00
yuanke 6f7b40b5ad 微信增加回复的回复后台代码 2016-09-05 14:49:22 +08:00
cxt ad0acb5188 课程大纲的内容图片自适应大小 2016-09-05 14:31:49 +08:00
cxt 2974833533 新建班级页面--创建课程后面，增加： 然后 【刷新】 2016-09-05 14:14:25 +08:00
cxt 573eb13283 课程导航中的用户是创建该课程的老师，课程链接应跳到该用户的课程列表 2016-09-05 13:52:42 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
daiao bb0bafb0fd 1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠 2016-09-05 13:27:41 +08:00
Tim f94b048af2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-05 13:18:55 +08:00
Tim 9ec6074260 将头部帮助中心改为贴吧交流 2016-09-05 13:18:35 +08:00
cxt 36e541a6d0 消息列表报500 2016-09-05 11:30:13 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
huang 3e17edecd1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 19:05:46 +08:00
huang 2cd41cde7f 1706项目500问题 2016-09-02 19:05:21 +08:00
cxt c794c6197d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 18:19:43 +08:00
huang 7b6657a3e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:51:23 +08:00
huang 2c03bfbf3a 资源提示权限控制 2016-09-02 16:51:05 +08:00
cxt 22e914eec2 查看他人的留言动态报500 2016-09-02 16:42:19 +08:00
cxt b8d04c1352 课程列表的主讲老师改为创建老师 2016-09-02 16:40:07 +08:00
cxt 2a9ac3c11e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:22:07 +08:00
cxt 01ca94bc98 未读消息弹框 2016-09-02 16:21:58 +08:00
daiao 9a3603c778 1.基本资料页面，身份为从业者时，直接点确定报提示问题 
2.强制修改基本资料，修改资料按键错误
 2016-09-02 16:11:14 +08:00
yuanke 66aec27714 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:09:00 +08:00
yuanke 6571b94bf1 Merge branch 'weixin_guange' into develop 2016-09-02 16:08:49 +08:00
cxt 0d2a3cbe36 测试版消息列表报500 2016-09-02 16:00:54 +08:00
cxt 877d1930f0 超级管理员应该有权限查看不公开学生列表班级的学生列表 2016-09-02 15:35:20 +08:00
cxt b588495847 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:26:23 +08:00
huang 6c0bcadf6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:27:08 +08:00
cxt e949566d3d 合并 2016-09-02 15:26:00 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
huang 58176456e1 Merge branch 'develop' into rep_quality 2016-09-02 15:23:00 +08:00
cxt 4cdef4a22b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:22:20 +08:00
cxt 613f974440 项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复 2016-09-02 15:22:09 +08:00
huang 3881e5c5c5 资源搜索的是时候tip局部刷新 
组织资源更新公开私有问题
 2016-09-02 14:50:06 +08:00
Tim 0d7e9d4f9b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:45:11 +08:00
Tim 396664d4e7 课程右侧增加下间距 2016-09-02 14:45:01 +08:00
cxt e70334ea16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:43:07 +08:00
cxt 51ef4a96e6 课程导航添加链接 2016-09-02 14:42:59 +08:00
yuanke 11f3060ca5 自己建的issue指向自己不发微信消息 2016-09-02 14:40:40 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
cxt ded6753ce1 访问他人的主页只显示他本人的动态 2016-09-02 14:23:02 +08:00
Tim 0974153364 课程加入路径显示 2016-09-02 13:49:08 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
huang 2e36cf6d6a 课程资源库添加资源提示及 2016-09-02 12:12:26 +08:00
huang fa25a78f62 项目资源库 添加私有资源提示及局部过滤刷新 2016-09-02 11:27:35 +08:00
yuanke 12f854f31b Merge branch 'weixin_guange' into develop 2016-09-02 10:55:43 +08:00
yuanke a6bb19eb60 微信动态回复增加点赞 2016-09-02 10:54:40 +08:00
cxt 231c660744 老师对帖子的删除权限 2016-09-02 10:06:03 +08:00
cxt f78595bbbb 管理员界面中的学校列表支持按用户数排序 2016-09-01 17:11:39 +08:00
huang e798381feb 项目资源数改成实时获取 2016-09-01 16:39:09 +08:00
huang 17440ca5dc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-01 16:04:00 +08:00
huang 79e30862e9 change sonar method into restart and cancel push events 2016-09-01 15:58:53 +08:00
Tim 4d93b860f9 作品信息确认时，描述文字折行 2016-09-01 15:35:45 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
cxt 1e740525b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-01 14:31:45 +08:00
huang 0efd724b26 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-01 14:31:17 +08:00
huang 742c84bb26 项目隐藏之 issue详情页面发送隐藏课程信息 2016-09-01 14:30:56 +08:00
cxt e61cf5dd4f 多重身份的成员：教师模拟答题和学生答题作为两条记录 2016-09-01 14:21:19 +08:00
yuanke 05e72dcc7b 教师修改用户角色的BUG 2016-09-01 14:17:14 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
yuanke 7c928703b5 修改老师无法修改班级成员角色的BUG 2016-09-01 14:10:27 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
huang 5527b4e3a9 项目隐藏之 公共资源库底端发送隐藏课程信息 2016-09-01 12:25:35 +08:00
huang 4903064a5b 项目隐藏之 公共资源右键发送隐藏课程功能 2016-09-01 12:18:39 +08:00
huang c51f725a78 项目隐藏之 项目动态中讨论区 新闻发送隐藏课程信息 2016-09-01 11:24:16 +08:00
yuanke d4f8bd29f4 班级项目成员管理BUG修改 2016-09-01 11:18:42 +08:00
huang 1444511fd9 项目隐藏之 项目讨论区详情页面 发送隐藏课程信息 2016-09-01 11:18:07 +08:00
huang efa162fdeb 项目隐藏之组织资源发送 2016-09-01 11:16:09 +08:00
huang b2aba0f0bc 项目隐藏之 新闻发送隐藏课程信息 2016-09-01 11:12:56 +08:00
huang 3856ed8033 项目隐藏之资源发送项目组织 2016-09-01 11:00:34 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
yuanke 8644ad178c 修复班级项目 删除成员的BUG 2016-09-01 10:21:29 +08:00
yuanke c3c2516e6b 微信班级、项目增加删除成员和退出功能 2016-08-31 17:19:12 +08:00
cxt 5676f0b82f 项目类消息为空导致消息列表报500 2016-08-31 17:14:32 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt 7efdda5b45 班级老师也可以点击班级logo进行编辑 2016-08-31 17:01:31 +08:00
huang 9b14b86b64 隐藏项目之 隐藏组织左侧的信息 2016-08-31 16:01:23 +08:00
huang ac85eadc30 资源库点击切换样式 2016-08-31 15:42:17 +08:00
huang 1f6bd68e61 隐藏项目 组织隐藏课程信息 2016-08-31 15:37:28 +08:00
Tim ecf7522c4b Merge branch 'cs_optimize_txz' into rep_quality 2016-08-31 15:32:23 +08:00
Tim 718e59c144 消息下拉框样式 2016-08-31 15:31:09 +08:00
huang 2df6047b03 隐藏项目信息之 新用户注册但是未完善资料页面修改 2016-08-31 15:14:55 +08:00
cxt 4c59acf5a3 issue编辑后点赞按钮不见了 2016-08-31 15:04:56 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
huang 9e9b4d12c9 新注册用户不发送留言 2016-08-31 15:00:34 +08:00
huang 02fbdb57bd 隐藏项目中用户消息信息 2016-08-31 14:44:31 +08:00
cxt 8494d71e8e “课程名称”不显示，英文名称为空时不显示“课程英文名称” 2016-08-31 14:33:29 +08:00
yuanke 292e778a8c 微信班级项目增加删除和退出功能 2016-08-31 14:21:38 +08:00
cxt 076feb17e8 课程大纲的班级列表中的“主讲老师”改为“创建老师” 2016-08-31 14:12:04 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
huang 9ab68625df Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-31 13:50:57 +08:00
cxt cc7b97192e 分组作业关联项目下的文字链接到项目 2016-08-31 11:27:37 +08:00
cxt e05780cc3f 设置了答题时间的测验不应有保存按钮，而是直接提交 2016-08-31 10:48:43 +08:00
huang cde1d11871 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-31 10:34:42 +08:00
huang 4320fbf945 Merge branch 'dev_blankdatabase' into develop 2016-08-31 10:30:46 +08:00
huang 936198a8bd 隐藏非项目信息 2016-08-31 10:30:23 +08:00
cxt 6e36418201 admin界面的留言列表过滤掉新用户的留言 2016-08-31 09:47:51 +08:00
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
cxt f4632c432f 消息列表中的at消息报500 2016-08-30 17:11:22 +08:00
cxt 188b9197aa 消息列表 2016-08-30 16:15:57 +08:00
huang 6d0f22fd60 空数据库--修复后台删除issue标签500问题 2016-08-30 16:03:28 +08:00
cxt 23ff5f6449 匿评时具有多重身份的教辅打的分变成了“我的评分” 2016-08-30 15:01:41 +08:00
yuanke b9e9892257 微信issue指向BUG修改，issue@功能修改 2016-08-30 15:01:26 +08:00
yuanke b4a5179a1b 修改班级成员管里的配置返回后显示空白及@issue链接无效的问题 2016-08-30 14:25:36 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +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 0551c450b5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 10:21:59 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
cxt 885cc820a8 批量添加学生 2016-08-26 19:50:47 +08:00
cxt 5dab473eb1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-26 19:39:47 +08:00
cxt 0047f7bfdf 学生身份的编辑 2016-08-26 19:39:41 +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 16dfae4415 0 2016-08-26 18:47:17 +08:00
cxt 816a480991 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-26 18:34:44 +08:00
cxt ff95567926 基本资料中从业者的身份判断 2016-08-26 18:34:35 +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
cxt 0ce61bfee8 学生删除作品时将作品还原为初始状态 2016-08-26 16:20:14 +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
yuanke 038975fdf7 Merge branch 'weixin_guange' into develop 2016-08-25 15:57:01 +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
yuanke 6abdb47ec5 模版消息标点 2016-08-25 11:25:51 +08:00
yuanke aa11f39b2d Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/class.html
	public/javascripts/wechat/controllers/class.js
 2016-08-25 11:24:27 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +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
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +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
huang ba6d0e6926 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 15:13:00 +08:00
huang bafb3e98a7 tip for sonar results 2016-08-24 15:05:10 +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
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
Tim bb2b51aa8d 收藏按钮增加title 2016-08-24 10:30:20 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
yuanke 0eb1c1a392 微信审核链接修改 2016-08-24 09:45:18 +08:00
yuanke 2e1e9391b6 微信审核链接路径修改 2016-08-24 09:39:41 +08:00
cxt 5d5bd88c88 个人主页：用户不应有修改他人头像的权限 2016-08-24 09:30:57 +08:00
yuanke e0ab93b739 微信审核路径修改 2016-08-24 09:30:28 +08:00
yuanke 3af5bc5813 微信审核修改 2016-08-23 17:42:48 +08:00
yuanke c5cedbfcc2 修改班级和项目审核模版消息地址 2016-08-23 17:37:23 +08:00
cxt 74b15229fb at所有人 2016-08-23 17:15:51 +08:00
yuanke c612104fab 微信增加发帖功能 2016-08-23 16:52:35 +08:00
daiao 5088770214 修复：文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
cxt 461912bec2 班级作业，上传附件提交作品，重试后直接提交，提交页面附件不显示但验证弹框中被删除的附件又显示了 2016-08-23 10:50:51 +08:00
yuanke 965d8930dc 班级增加动态 2016-08-23 10:23:46 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +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
yuanke 864c6c821f Merge branch 'weixin_guange' into develop 2016-08-22 16:50:13 +08:00
huang 5e98884801 tip for sonar 2016-08-22 16:32:32 +08:00
yuanke c275557fa7 调试 2016-08-22 15:44:20 +08:00
cxt f5cbdf11bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-22 15:24:18 +08:00
cxt 06361246c7 作品列表中的已提交人数无法自动刷新 2016-08-22 15:24:12 +08:00
yuanke 7f8a6f931b 调试 2016-08-22 15:23:34 +08:00
yuanke d5a7d10f5d 调试 2016-08-22 14:59:50 +08:00
yuanke 9e4aaa767c 调试 2016-08-22 14:57:28 +08:00
yuanke 0c381ad53d 调试 2016-08-22 14:42:04 +08:00
yuanke d9e031c314 调试 2016-08-22 14:34:42 +08:00
huang f8fc656920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-22 14:22:31 +08:00
huang 300dab5fa1 版本库更新时间提交 2016-08-22 14:20:59 +08:00
yuanke 53bca5c006 调试 2016-08-22 13:52:40 +08:00
yuanke 0412009182 调试 2016-08-22 11:13:14 +08:00
yuanke a38d4f15a6 调试 2016-08-22 10:50:22 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
yuanke 2e86738fd2 调试 2016-08-22 10:42:40 +08:00
yuanke 42c6e4c5c5 调试 2016-08-22 10:26:57 +08:00
yuanke be95b3990d 调试 2016-08-22 10:04:31 +08:00
yuanke 96ce09ede3 Merge branch 'weixin_guange' into develop 2016-08-14 16:32:28 +08:00
yuanke 8a94d205f4 . 2016-08-14 16:20:53 +08:00
yuanke a7ef293356 . 2016-08-14 15:33:24 +08:00
yuanke 7e40c2447f 修改用户帐号显示， 2016-08-14 15:25:46 +08:00
yuanke 38a58cd3fc Merge branch 'weixin_guange' into develop 2016-08-14 13:47:22 +08:00
yuanke 2f8b459a6f 微信用户激活修改 2016-08-14 13:35:00 +08:00
yuanke 22e4e56029 微信自动激活修改 2016-08-14 13:24:07 +08:00
yuanke e17683d3d5 自动激活微信帐号 2016-08-14 12:42:39 +08:00
yuanke f50cfe159c 微信用户合并修改 2016-08-14 12:35:03 +08:00
yuanke 0fc6b84584 自动激活修改 2016-08-14 12:32:47 +08:00
yuanke 6eca6253db 微信注册自动激活 2016-08-14 12:29:10 +08:00
yuanke 94777a42c4 修改重新获取refresh_token 2016-08-14 12:16:30 +08:00
yuanke 962a62577b 测试测试 2016-08-14 12:13:04 +08:00
yuanke c16ea6d8be Merge branch 'weixin_guange' into develop 2016-08-14 12:06:52 +08:00
yuanke ba0d32bd09 修改判断绑定代码 2016-08-14 11:59:26 +08:00
yuanke 9d867aa224 修改微信BUG 2016-08-14 11:50:31 +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
yuanke 3be75c8633 微信BUG修改 2016-08-14 11:18:23 +08:00
huang d7177713ff 勾选游客后，游客能够下载资源 2016-08-14 11:16:43 +08:00
guange 1d53af36cd merge 2016-08-14 11:16:20 +08:00
guange dc7ff8f90f . 2016-08-14 11:15:37 +08:00
yuanke 6cea0bfb67 . 2016-08-14 10:56:38 +08:00
yuanke 91a64a67c5 微信注册和绑定判断BUG修改 2016-08-14 10:46:17 +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 56da43221d 修改绑定登录的地址 2016-08-14 10:28:46 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
yuanke 7c222373dc 修改获取用户关注公众号结果 2016-08-14 09:55:02 +08:00
yuanke 4eec1f5d4e 获取未关注修改 2016-08-14 09:50:43 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
guange ea85c0c608 . 2016-08-13 21:57:22 +08:00
yuanke 61680c6343 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 18:35:21 +08:00
yuanke 85b3df889c 修改微信获取课程大纲的代码 2016-08-13 18:35:11 +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
huang 896e301b33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 16:43:14 +08:00
huang 966722b920 关闭和打开的时候显示root问题 2016-08-13 16:43:00 +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
guange c9d32ca69b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 15:25:07 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
yuanke e06f09406c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:41:46 +08:00
guange dde0fbb3c1 迁移用户 2016-08-13 14:39:15 +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
yuanke 3a83b40a64 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:04:05 +08:00
yuanke a979bd3d54 微信修改绑定成功的模版消息内容 2016-08-13 14:03:53 +08:00
guange 7b28d2d183 . 2016-08-13 13:57:27 +08:00
guange fc74e714ee . 2016-08-13 13:53:21 +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
guange b9cf2527a4 merge 2016-08-13 11:11:24 +08:00
guange 3130296e69 修改微信个人信息获取实现 2016-08-13 11:09:48 +08:00
yuanke 852c7929b6 修改审批通知链接 2016-08-13 10:39:32 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
yuanke 88e23dca80 微信回复自动注册及获取微信昵称修改 2016-08-12 18:19:21 +08:00
yuanke 3051b82ac2 调试 2016-08-12 18:03:58 +08:00
yuanke 697e857806 调试 2016-08-12 18:00:09 +08:00
yuanke e21f7a34bd 调试 2016-08-12 17:46:44 +08:00
yuanke 1a835a25db 调试 2016-08-12 17:38:24 +08:00
yuanke 9b52c1504e 调试 2016-08-12 17:33:45 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +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
yuanke bd12ea169d 调试 2016-08-12 16:58:48 +08:00
yuanke 5b208202a0 调试 2016-08-12 15:38:17 +08:00
yuanke ae437912d8 调试 2016-08-12 15:06:28 +08:00
yuanke ae13435de6 调试 2016-08-12 14:47:54 +08:00
yuanke d60857eaea 调试 2016-08-12 14:41:56 +08:00
yuanke 9fcb43b949 调试 2016-08-12 14:29:19 +08:00
yuanke 1f8ea39765 调试 2016-08-12 14:25:45 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke c307f7769f 调试 2016-08-12 14:13:53 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke ded55ca022 调试 2016-08-12 14:08:27 +08:00
yuanke fd036d758e 调试 2016-08-12 13:50:44 +08:00
yuanke bce3513424 分享修改 2016-08-12 12:09:20 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 822ca15c78 分享修改 2016-08-12 11:34:09 +08:00
yuanke e4194288ce 微信获取用户信息修改 2016-08-12 10:59:12 +08:00
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式 2016-08-12 10:40:36 +08:00
cxt 85cd113cf9 日志修改 2016-08-12 10:20:58 +08:00
yuanke 64eacc2d5e 微信默认注册修改 2016-08-12 10:10:10 +08:00
yuanke 6af15b7121 微信自动绑定用户修改 2016-08-12 09:23:09 +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
cxt 4a25b6357b 我的作业报500 2016-08-11 16:12:48 +08:00
cxt 951390092b 我的作业报500 2016-08-11 15:59:38 +08:00
cxt 322868f063 班级的课程id变为空时打印日志 2016-08-11 15:58:49 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
yuanke 03551dfba9 项目申请BUG修改 2016-08-11 15:19:47 +08:00
yuanke 96bc405a19 修改项目申请相关BUG 2016-08-11 15:06:32 +08:00
cxt 80b8fc4444 “我的作业”中有挂起的作业时会报500 2016-08-11 14:44:43 +08:00
huang 3df8a46634 PUll request代码简化及reverse评论 2016-08-11 14:16:13 +08:00
yuanke 14e70541db 平台加入项目发微信模版消息 2016-08-11 11:22:42 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke 72a7a1e9f2 已是项目成员则之前的申请都改为拒绝 2016-08-11 11:13:37 +08:00
huang 41ad5ca444 修改Gitlab接口返回创建时间 2016-08-11 11:11:49 +08:00
yuanke b8155cc1c2 班级通知修改 2016-08-11 11:05:19 +08:00
Tim f4445619d2 题库预览弹框样式调整 2016-08-11 11:02:40 +08:00
yuanke f100d3ebea 项目发起人显示名称修改 2016-08-11 11:00:52 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +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
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33: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
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
huang 1605ef601c conflict 2016-08-11 09:50:20 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
huang b14cdb0b6d some log 2016-08-11 09:47:49 +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