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

14470 Commits

Author SHA1 Message Date
daiao 980ae78185 修改pull request发送源项目提示 2016-11-24 10:11:59 +08:00
daiao 5ed9d169f3 Merge branch 'develop' into dai_ao 2016-11-24 10:05:18 +08:00
cxt f6034b56f0 作业的提交截止时间一直显示 2016-11-24 09:53:36 +08:00
daiao 1c0b4e99a8 项目配置，创建版本库提示字样式调整，和Pull Requests页面的tab点击样式调整 2016-11-24 09:47:10 +08:00
huang 42dee92c60 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 17:18:42 +08:00
daiao 61a3ffcbd0 项目issue统计显示顺序按任务量排序，调整total位置和样式并增加未指派一栏 2016-11-23 17:18:12 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
yuanke 2dc6171b48 微信反馈时的提示语加入www.trustie.net 2016-11-23 16:40:31 +08:00
yuanke 82fa7600da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 09:29:02 +08:00
daiao 85f9f636a2 修复：里程碑关闭，编辑issue，里程碑被清空的情况 2016-11-22 16:51:16 +08:00
huang fca68c24dc pull_request合并到源项目的问题 2016-11-22 15:05:33 +08:00
daiao 196d3b31a1 为完 切换分支 2016-11-22 14:29:03 +08:00
cxt f9d12758d4 班级分班：如图在某具体分班中，编辑某成员分班为“暂无”或其他分班，原始分班列表未自动刷新 2016-11-22 11:29:45 +08:00
huang 79b1cdcf84 pull request 源项目拉取代码及提交 2016-11-22 11:06:18 +08:00
cxt eeacd76aa9 首页班级列表的归档 2016-11-22 10:27:56 +08:00
yuanke c571d19548 项目简介单词不换行 2016-11-22 10:16:09 +08:00
yuanke 88057fdf4e Merge branch 'develop' into yuanke_youhua 
Conflicts:
	app/views/projects/show.html.erb
 2016-11-22 10:15:15 +08:00
yuanke 8d980b16db 换行修改 2016-11-22 10:10:53 +08:00
daiao 0eb6a607b2 项目issue中，附件名称后缀显示不全 2016-11-22 09:23:16 +08:00
yuanke f1ad70bb33 关注BUG修改，修改密码BUG修改 2016-11-22 08:52:19 +08:00
daiao 428cb8e928 项目issue。里程碑为空，完成为100%的issue筛选不了 2016-11-21 17:21:15 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
daiao e585687e9c 铃铛消息，将登录名改为用户姓名，并将部分没有链接的加链接 2016-11-21 16:30:37 +08:00
daiao c31287f2f5 temp用户，铃铛消息报500，并修改点击名称进个人主页（目前申请类消息点击进自己主页） 2016-11-21 15:21:51 +08:00
cxt 62ea9d12f7 项目简介的样式调整 2016-11-21 14:11:35 +08:00
yuanke 6cb711d66b Merge branch 'develop' into yuanke_youhua 2016-11-21 10:14:08 +08:00
yuanke 14552abd56 博客人气排序修改，个人主页关注BUG修改 2016-11-21 10:08:27 +08:00
daiao c74fe9278a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:31:01 +08:00
huang 8238f5bcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:21:38 +08:00
huang 90cf429a10 fork 弹出新页面 2016-11-18 21:20:44 +08:00
daiao 609d1d2fb4 新建和编辑issue时，里程碑被清空的bug 2016-11-18 21:19:34 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
daiao f9a384b253 Merge branch 'dai_ao' into develop 2016-11-18 19:18:36 +08:00
cxt cf6acd48c4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:17:47 +08:00
daiao 286422e1c5 我的issue样式调整 2016-11-18 19:17:35 +08:00
huang c7d781d58c 删除和fork弹框居中并统一值 2016-11-18 19:13:14 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
daiao f91722a422 我的issue样式调整 2016-11-18 17:46:51 +08:00
cxt 20465ef281 导航栏题库“发送”后的提示弹框丢失了 2016-11-18 17:37:25 +08:00
cxt 4da94a5bb0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 17:32:55 +08:00
cxt 149ecc0b99 只有班级创建者才能归档和恢复 2016-11-18 17:32:45 +08:00
huang 9b2d4b8a07 新建项目边框问题 2016-11-18 17:31:48 +08:00
cxt 6bb4e650c4 QQ反馈返回空白页、“返回上一页”不能点击时字体置灰 2016-11-18 17:21:23 +08:00
huang 7f1d12de04 项目版本库标题改成用户名加版本库名 2016-11-18 17:08:36 +08:00
huang b1b456e63e 项目标题去掉姓名，单词不换行 2016-11-18 16:57:45 +08:00
cxt 9a30369cef 班级作业：两种身份（助教和学生）的成员匿评扣分错误 2016-11-18 16:37:25 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
huang 5f35e8bd97 修复新注册用户不能fork的问题 2016-11-18 16:20:18 +08:00
huang d48c2a36fc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 16:09:28 +08:00
huang 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 3b2e33f3ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 15:45:20 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
daiao 1e761081c2 我的issue样式调整 2016-11-18 14:45:42 +08:00
cxt db71b1578b 新建作业的时候，必须先选择作业类型 2016-11-18 10:43:49 +08:00
huang f87d1ce3bd ISSUE中指派者按中文姓名排序 2016-11-18 10:04:02 +08:00
daiao b8e59430e8 项目资源库，资源描述框宽度增加至800px 2016-11-18 09:46:28 +08:00
daiao 440e73ea99 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 09:36:03 +08:00
daiao 19483ee762 新建和编辑issue时，选择里程碑按创建时间的倒序排列 2016-11-18 09:35:49 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
cxt 4d7dbc1fc6 已发布的试卷显示提交情况 2016-11-17 17:07:01 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang edb86615a2 个别用户修改资料500问题 2016-11-17 12:20:12 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
cxt 6c8736bea8 加入班级时的提示修改 2016-11-17 11:10:48 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
huang 987b5ba6db 注释掉消息中的新闻 2016-11-16 13:54:47 +08:00
huang 75a05ba9c2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:50:26 +08:00
huang 1dd97ee253 个人主页的项目收藏列表提示错误 2016-11-16 13:50:10 +08:00
daiao 12ccd69167 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:37:15 +08:00
daiao 05fcd32225 修复项目issue，编辑issue“完成度”为100%后，该issue历程被清空 2016-11-16 13:36:57 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 5dcb99c3ad 优化projects数据库表，删除不必要的字段 2016-11-15 16:38:30 +08:00
huang 8843ff7686 质量分析公共部分封装，没有权限用户删除的时候显示灰色不可点击 2016-11-15 15:58:50 +08:00
huang 3ab5ab4e4b 代码质量分析列表优化 2016-11-15 15:34:15 +08:00
cxt 57c82effed 讨论区帖子：新建时没有字数限制，编辑时却有字数限制了，不合理 2016-11-15 15:04:24 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 1e5d3e05ad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 14:09:40 +08:00
huang 0ea9a49f86 质量分析界面调整 2016-11-15 14:09:25 +08:00
daiao d45b1c7d4c 我的issue 2016-11-15 14:03:57 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
cxt 7988257e10 项目讨论区：如图多级回复，“点击展开更多”要用新的样式 2016-11-15 11:19:31 +08:00
cxt 5d0954d108 班级申请消息通知，如图以省略号结束的消息，当鼠标移至此消息，消息应该显示完全 2016-11-15 10:54:31 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
cxt d8906db1aa 班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新 2016-11-15 10:34:14 +08:00
yuanke 19e2c34917 测试代码还原 2016-11-15 10:33:28 +08:00
yuanke 85938bf3f1 测试 2016-11-15 09:28:42 +08:00
yuanke e33146813d 加日志测试 2016-11-15 09:25:58 +08:00
huang e9ec3ca258 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 09:02:15 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt ef9b389cfc 作业动态报500 2016-11-14 17:32:18 +08:00
daiao 442be21a30 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:48:22 +08:00
daiao 98849931d6 项目新建/编辑issue，调整“里程碑”提示 2016-11-14 16:47:45 +08:00
cxt 5605a9e638 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-14 16:37:54 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang ddb747bfcb 解决login中带特殊字符的问题 2016-11-14 16:35:15 +08:00
huang 2b1a73e692 解决用户登录名的.号问题 2016-11-14 16:33:49 +08:00
huang 695ce6c2e4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:07:16 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
cxt b06dcc9db4 780班级访问分班报500 2016-11-14 15:38:00 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
yuanke 5134418388 Merge branch 'yuanke_youhua' into develop 2016-11-14 15:14:05 +08:00
cxt 96bc35552a 未收藏的班级和项目动态不显示 2016-11-14 15:11:37 +08:00
daiao f4df8716d3 issue查看页，新增新建按钮 2016-11-14 13:28:41 +08:00
yuanke 5fd00ae472 关注官方微信改为关注微信APP 2016-11-14 10:35:40 +08:00
yuanke d0abc8d3ad Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 19:52:38 +08:00
yuanke 369f6eb9f7 微信动态不显示的BUG修复 2016-11-11 19:52:30 +08:00
cxt a2b0717aaa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:41:36 +08:00
cxt 3aec93e5e4 分组作业的作品列表展开/收起 2016-11-11 18:41:29 +08:00
cxt a831be59d0 匿评时点击姓名和关联的项目应打开作品详情 2016-11-11 18:31:00 +08:00
huang 5104340b78 Merge branch 'dev_newproject' into develop 2016-11-11 18:21:29 +08:00
huang 6752b8fa62 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:19:19 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
cxt 809cb5a344 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:12:31 +08:00
cxt acfbe6f03e 某用户为某班级的助教和学生两种角色成员，当前身份是助教，点击个人主页“我的作业”，如图对应的班级作品显示的却是“提交作品”-》 “查看作品” 2016-11-11 18:12:22 +08:00
huang 561c96b485 用户图像下拉列表中我的课程、组织链接改成登录名 2016-11-11 18:02:17 +08:00
daiao 753da4b078 点击用户将id改为用户名 2016-11-11 17:59:34 +08:00
huang e6354c82cf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:57:45 +08:00
huang bb871b5a77 个人主页 博客 粉丝 关注url的id改成登录名 2016-11-11 17:57:31 +08:00
cxt 6ee9b12c5d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:55:32 +08:00
cxt c352fb5604 学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数 2016-11-11 17:55:25 +08:00
huang 7e762a42ed 用户动态部分url的id改成登录名 2016-11-11 17:50:42 +08:00
cxt 18bfb26689 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:38:25 +08:00
cxt e1c216ef80 班级导入问卷不可用 2016-11-11 17:38:19 +08:00
daiao 1ec0100386 项目简介样式调整，并且输入网页能点击 2016-11-11 17:35:11 +08:00
cxt 4a266b33e6 新建课程增加示例，并追加班级的说明tip 2016-11-11 17:26:38 +08:00
huang d040d2efd1 版本库添加返回上一级目录 2016-11-11 17:21:18 +08:00
cxt ec36b07aab 分班名称编辑后，如图班级左侧导航处未自动刷新 2016-11-11 17:05:47 +08:00
huang b944a4a5c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:00:10 +08:00
huang 9113c93e49 项目成员列表点击跳入新的页面 2016-11-11 16:59:34 +08:00
cxt 93c10515df Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:59:28 +08:00
cxt 7298e983fa 如图课程大纲中“加入班级”，输入错误的邀请码，提示“您加入的班级不存在”不合理，应该是“您输入的邀请码错误” 2016-11-11 16:59:15 +08:00
huang f71a21155f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:54:47 +08:00
huang a655e73c50 配置中成员链接改成登录名 2016-11-11 16:54:24 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
cxt 16c51e1eaa 基于项目的分组作业没有显示项目详情 2016-11-11 16:50:25 +08:00
huang 8c48c3d420 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:46:07 +08:00
huang f41a36557a 时间插件改为英文 2016-11-11 16:45:43 +08:00
daiao e1afe9d2d7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:36:13 +08:00
daiao 92531ce487 项目简介样式调整 2016-11-11 16:35:26 +08:00
huang 442fb8a531 添加fork成员列表 2016-11-11 16:09:43 +08:00
daiao fff56c08de Merge branch 'dev_newproject' into develop 2016-11-11 15:24:01 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
daiao 812c74134a Merge branch 'develop' into dev_newproject 2016-11-11 14:55:29 +08:00
huang 1fdf6e2053 用户动态中一些用户的url显示登录名 2016-11-11 14:55:19 +08:00
huang 50a14ad5fe 修改判断整数的方法 2016-11-11 14:26:58 +08:00
huang 4d1d6506fe 用户登录后点左侧个人主页url路径问题及用课程动态中url转换成login 2016-11-11 14:13:56 +08:00
huang 846ef5f72c 博客列表中用户id改成login 2016-11-11 14:03:09 +08:00
cxt 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
huang 42503fa6c6 课程大纲中用户url的id改成login 2016-11-11 13:55:38 +08:00
daiao 5742a9951e 项目-配置-成员，翻页时，当前页用蓝色颜色标识 2016-11-11 13:44:39 +08:00
huang ae6821f252 组织配置中用户url为ID 2016-11-11 13:43:11 +08:00
huang a44170217c 组织用户头像链接中带用户ID 2016-11-11 13:37:50 +08:00
huang 14178b0f8f 解决组织中成员列表用户url为ID的问题 2016-11-11 13:33:06 +08:00
huang b633200ab6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 10:38:10 +08:00
huang aab24ea34a 解决顶部fork路由错误，已经fork过该项目的添加提示 2016-11-11 10:37:20 +08:00
yuanke c59081c824 Merge branch 'yuanke_youhua' into develop 2016-11-11 10:24:22 +08:00
cxt 0d8d2fbc90 班级活跃度排行去除老师和教辅 2016-11-11 09:29:29 +08:00
yuanke eb56a134d3 作业微信通知消息改为异步发送并且只发送给学生 2016-11-11 09:28:10 +08:00
daiao 9bdc76b6e3 项目issue详情页面，点击指派给跳个人主页 2016-11-10 17:34:58 +08:00
cxt 1e0c2e5d6a 班级首页的活跃度和英雄榜由3个增加到6个 2016-11-10 17:28:14 +08:00
cxt 4a5e350615 个人主页：删除个人留言动态，却跳转到个人留言页面去了，不合理 2016-11-10 17:24:00 +08:00
daiao ae84afe43e 项目issue，新建和编辑issue时，上传附件时，保存按钮不可点击 2016-11-10 17:16:54 +08:00
cxt 6cc38ee51e 班级留言回复中用户头像建议加链接返回该用户主页 2016-11-10 17:12:04 +08:00
yuanke 5a99b632b8 资源描述不变时不请求后台 2016-11-10 15:55:51 +08:00
daiao b1e0cc7884 里程碑所有ISSUE 标题与指派着加链接，并对指派着为空报500处理 2016-11-10 15:45:00 +08:00
daiao 590af4ff4a 编辑issue，删除上传issue为实时刷新 2016-11-10 15:19:13 +08:00
daiao 5bf519bbf7 项目里程碑，新建里程碑弹框样式 2016-11-10 14:18:53 +08:00
daiao 4fc98308bc 项目简介样式问题 2016-11-10 13:34:43 +08:00
daiao 43e72813b4 当指派着为空时，导出统计为空 2016-11-10 11:11:28 +08:00
huang ec39b2d52c 用户个人主页姓名添加url 2016-11-10 11:11:14 +08:00
yuanke 88d489b485 作业列表设留言at消息为已读改为delay_job执行 2016-11-10 10:41:35 +08:00
huang 3dcd38a059 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-10 10:31:40 +08:00
huang ceb4bef0c4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-10 10:28:24 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
yuanke 7e657a4ad0 提问反馈框去掉X按钮 2016-11-10 09:23:12 +08:00
daiao c5ab8550ff 项目里程碑，配置的里程碑点击编辑弹框时间样式修改 2016-11-10 09:12:07 +08:00
daiao a8a7029746 班级资源库，资源描述输入非汉字类型过长时，对学生成员只显示一行内容 2016-11-09 16:26:50 +08:00
huang 6322d18325 里程碑编辑的时候日历不显示的问题 2016-11-09 16:06:41 +08:00
huang e39c3cfd9c 解决里程碑新建里程碑的时候弹窗不显示日历 2016-11-09 15:57:06 +08:00
huang 919e973efb 项目配置中框框没对齐问题 2016-11-09 14:57:39 +08:00
huang cf67c8603c 项目配置中 编辑里程碑的样式及日历无法显示问题 2016-11-09 14:55:25 +08:00
huang 36e363c278 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-09 14:43:16 +08:00
huang 8848bfb06f 配置中最新里程碑放置最前面 2016-11-09 14:42:50 +08:00
yuanke 77f3921d0e . 2016-11-09 14:20:13 +08:00
yuanke 10f810960e . 2016-11-09 14:15:37 +08:00
yuanke 59e6495610 ... 2016-11-09 14:04:44 +08:00
daiao 2b164594f6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-09 13:34:23 +08:00
daiao f6eb96cfdc 项目头部点击fork弹框 2016-11-09 13:34:03 +08:00
yuanke 69996e8550 . 2016-11-09 11:29:10 +08:00
huang 018b982f7f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-09 10:41:56 +08:00
huang 431ff8b31c 甘特图配置及issue导出指派人为空的问题 2016-11-09 10:40:59 +08:00
daiao f45e9f992c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-09 10:02:12 +08:00
daiao c1cf633d2c 项目版本库样式调整 2016-11-09 10:01:56 +08:00
huang a8575c3476 版本库查看 历史记录 下载显示及返回 2016-11-08 17:31:39 +08:00
huang 2122a06608 版本库大写转小写，解决路径问题 2016-11-08 17:12:35 +08:00
huang 9a9250f6e1 fork弹框 2016-11-08 16:40:25 +08:00
huang dfcf93082a Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-08 16:20:30 +08:00
huang 14f66e1e82 版本库添加返回上一级目录 2016-11-08 16:20:07 +08:00
daiao 27c8d53cad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-08 16:19:23 +08:00
daiao ac60940c34 1.项目头部样式调整 2016-11-08 16:18:59 +08:00
huang 736c93fc13 解决查看文件改动的时候403问题 2016-11-08 15:45:32 +08:00
cxt 070e18a9b2 作业动态优化 2016-11-08 15:39:00 +08:00
huang c27faf862f 版本库单个文件历史记录修改 2016-11-08 15:30:16 +08:00
huang b5f035d286 版本库详情页面添加目录回退功能，部分功能及界面调整 2016-11-08 15:21:12 +08:00
huang 83f2270edc 完成版本库的目录选择功能 2016-11-08 12:19:21 +08:00
huang 721a916a20 版本库按钮调整 2016-11-08 10:44:57 +08:00
huang c217af8cea Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-08 10:23:27 +08:00
huang a3dfd03e81 项目顶端框架搭建及权限判断 2016-11-08 10:23:02 +08:00
yuanke 4f7531b0c4 修改群号 2016-11-08 09:28:32 +08:00
daiao bdf423bc81 编辑issue时，删除上传的附件，未自动刷新 2016-11-08 09:21:45 +08:00
huang cceadb02ce Merge branch 'develop' into dev_newproject 2016-11-07 17:19:47 +08:00
huang 0ef3dbf5f8 Merge branch 'develop' into dev_newproject 2016-11-07 17:18:36 +08:00
cxt 85b1d145fe Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-11-07 17:13:10 +08:00
cxt 2bb018b0fe 导入问卷的弹框用新版样式 2016-11-07 17:12:29 +08:00
daiao e57e439210 新建，编辑issue时，上传附件尽课程展示全 2016-11-07 17:08:24 +08:00
daiao 83c801878d 问卷答题与查看页预览答题框的宽度设为一致 2016-11-07 16:20:46 +08:00
daiao 6dbf031d3b 问卷编辑icon显示效果调整 2016-11-07 16:03:04 +08:00
cxt 356fbfe792 班级问卷：新建问卷时，如图不输入标题及描述直接点击“取消”，再点击保存或发布，却提示保存成功和发布成功 2016-11-07 15:44:40 +08:00
yuanke 788193f6e1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-07 15:35:21 +08:00
yuanke cb975d1cb2 组织一级帖子点击BUG 2016-11-07 15:35:02 +08:00
daiao 3d2d526149 新建和编辑ISSUE，上传附件名称显示问题 2016-11-07 15:21:00 +08:00
cxt 87c443ab1e Merge branch 'cxt_course' into develop 2016-11-07 14:45:08 +08:00
cxt 4c9a3b769e 分组作业老师评分时“组员同分”默认勾选 2016-11-07 14:43:45 +08:00
cxt 70a6a26819 班级作业：分组作业，开启了匿评后，某组再加了某组员，如图该组员看到的作业列表中不应该是“作品匿评” 2016-11-07 14:38:10 +08:00
yuanke 5ec5bc9a57 修改加入QQ群的链接 2016-11-07 14:25:41 +08:00
cxt f8316ee1ee 分组作业的缺评扣分 2016-11-07 14:06:11 +08:00
daiao e70c66b5ac Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/views/projects/_act_issues.html.erb
 2016-11-07 13:30:15 +08:00
daiao 8b5879217d 调整新建项目issue页面 2016-11-07 13:28:50 +08:00
cxt 3b34b87f7d 样式调整 2016-11-04 20:41:01 +08:00
cxt f738f5571e 班级作业：多重角色（教辅、学生）、组长角色的成员，当前角色是教辅，如图“合作成员”入口应该隐藏 2016-11-04 20:12:42 +08:00
cxt 4377fc1f9e 班级作业：评分设置中最终得分“教师优先”、“教辅优先”轮流切换多次后，得分计算错误 2016-11-04 20:04:27 +08:00
cxt 15a88b76c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-04 19:18:53 +08:00
cxt 2f0ff68047 班级作业：多次打分，如图回复块的分数显示不能自动刷新 2016-11-04 19:18:39 +08:00
cxt 59a4514950 关闭匿评时出现比例大于100%的情况 2016-11-04 19:10:22 +08:00
yuanke 9ef8f0f612 弹框BUG修改 2016-11-04 18:59:48 +08:00
cxt f921c8cccc 发布作业时默认教师优先、迟交扣分为0、缺评扣分为0 2016-11-04 18:54:51 +08:00
cxt 94284e72a2 弹框样式调整、 
课程大纲的提示，在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框：如图当鼠标移至右上角关闭图标，图标丢失、
 2016-11-04 18:43:44 +08:00
cxt 0bbccab616 样式调整 2016-11-04 16:59:33 +08:00
cxt 23edad0687 首页报500 2016-11-04 16:37:50 +08:00