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

14054 Commits

Author SHA1 Message Date
daiao d9189487e3 Isuue新建里程碑弹框 2016-10-27 11:15:28 +08:00
cxt 5d7af65bac 问卷调查显示页面的调整 2016-10-27 10:55:12 +08:00
Tim 97f35d1cc9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 10:53:10 +08:00
Tim e035316cc7 里程碑，版本库table宽度限制 2016-10-27 10:53:01 +08:00
cxt f3d67dc26a 问卷类型按创建顺序排列 2016-10-27 10:12:50 +08:00
huang 3cc9899e5d Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 10:10:18 +08:00
huang 03bfbf777a pull request 添加一些判断 2016-10-27 10:10:06 +08:00
Tim e3fc304d35 项目动态回复栏展开更多时，回复框宽度扩展问题 2016-10-27 10:06:58 +08:00
yuanke 1d674e0f6e 修改资料界面修改 2016-10-27 09:46:59 +08:00
Tim 409dc30e78 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 09:44:35 +08:00
Tim 2823ea4182 项目成员列表和关注列表增宽 2016-10-27 09:44:20 +08:00
huang 0e15ac00be 动态中链接为空问题 2016-10-27 09:27:48 +08:00
cxt 8cccaba9f3 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	public/stylesheets/css/courses.css
 2016-10-27 09:04:39 +08:00
Tim acda8ca15c 单选题增加操作栏；多选题增加选项上下限；数字随选项数实时变化js实现 2016-10-27 09:02:56 +08:00
huang 8a41bc0b23 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 19:12:18 +08:00
huang 5368d6755e 没有数据可供显示提示 2016-10-26 19:11:50 +08:00
daiao 7a1177c199 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 19:09:30 +08:00
daiao c7bd0ea802 除去新建项目第二栏，配置页面上传图片隐藏 2016-10-26 19:09:16 +08:00
huang 7c0ff4bbe2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 18:39:48 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
daiao 7fd1beb8d0 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 18:04:25 +08:00
daiao 3080c8ff09 里程碑列表，新建弹框 2016-10-26 18:04:12 +08:00
huang 17a9d0f174 配置中用户链接 2016-10-26 17:51:06 +08:00
huang a83f5317bb 里程碑列表页面添加删除 2016-10-26 16:28:40 +08:00
cxt 00f8c9ec0b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-26 16:13:07 +08:00
cxt 51e422c1a6 个人留言、课程留言的主留言增加自动保存 2016-10-26 16:12:51 +08:00
yuanke ca5e47b705 修改delay_job时间上限 2016-10-26 16:09:31 +08:00
huang c76b0d75f8 setting中新建里程碑bug 2016-10-26 16:01:20 +08:00
huang f22b9eb35b pull request用户链接处理 2016-10-26 15:45:47 +08:00
huang 68ff26e3ef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:41:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
daiao a40d6933f6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:18:42 +08:00
daiao 3229277737 里程碑编辑弹框 2016-10-26 15:18:07 +08:00
yuanke a882a919e5 调试 2016-10-26 15:07:32 +08:00
yuanke 3529bb6cf1 . 2016-10-26 14:58:23 +08:00
huang 7b3b49d874 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 14:55:04 +08:00
huang 95eab901a9 modified analysis quality show 2016-10-26 14:54:55 +08:00
yuanke 513be115cd 调试 2016-10-26 14:44:44 +08:00
yuanke e7bd24b552 . 2016-10-26 14:31:39 +08:00
yuanke 16fd8ff658 . 2016-10-26 14:00:28 +08:00
yuanke 653f485064 异步发送微信消息加点日志 2016-10-26 13:46:23 +08:00
huang 5a45ac2af6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 13:45:35 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
yuanke de5fb72ff3 调试 2016-10-26 13:41:58 +08:00
yuanke c5ac0ed6b7 调试 2016-10-26 13:37:49 +08:00
yuanke afa72a8acc . 2016-10-26 11:30:44 +08:00
yuanke a9136bd8d0 班级微信通知改为异步发送 2016-10-26 11:18:05 +08:00
Tim d7194d908c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 17:46:44 +08:00
Tim bb071b8e5e 代码提交带动页面宽度扩展 2016-10-25 17:46:33 +08:00
huang b93b4ca3f3 quality analisis css of list 2016-10-25 17:27:38 +08:00
huang 412b37d643 modified quality analysis error list 2016-10-25 17:08:05 +08:00
daiao 6833cc5105 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 16:39:01 +08:00
daiao 2608348c92 项目Issue列表样式调整 2016-10-25 16:38:45 +08:00
huang 7ffb010b4f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 16:10:19 +08:00
huang 715de1b7f3 pull request js问题调试 2016-10-25 16:09:57 +08:00
Tim d44744cfd7 在线测验问答题支持回车 2016-10-25 15:55:48 +08:00
Tim 5b2df31c95 在线测验多选题题目支持换行 2016-10-25 15:47:26 +08:00
daiao c6bc304c04 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 15:38:01 +08:00
daiao 9042304794 项目ISSUE编辑和新建页面 2016-10-25 15:37:49 +08:00
Tim 26b39c5d20 在线测验单选题高度自适应 2016-10-25 15:36:55 +08:00
huang 187a96b251 pull request评论局部刷新及样式 2016-10-25 15:34:32 +08:00
cxt 7f99e82181 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
 2016-10-25 15:29:46 +08:00
cxt 95c7dcea3a 作业列表的样式调整 2016-10-25 15:28:41 +08:00
huang 35c8157efa 修改版本库显示代码样式，改成与编辑器显示一致 2016-10-25 15:10:23 +08:00
huang a0ff6a0cb1 完成项目讨论区的拉宽工作 2016-10-25 14:47:05 +08:00
Tim 46fa91b6e9 分组作业评分弹框打开，”大作品评分即组长的评分“提示显示 2016-10-25 14:10:52 +08:00
huang 21d34bb4d4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 14:05:24 +08:00
huang 2702b5a197 项目收藏结构修改 2016-10-25 14:05:07 +08:00
cxt 891c0018e5 多层回复时的展现方式调整 2016-10-25 13:56:25 +08:00
Tim a33e6a1578 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 13:36:28 +08:00
Tim d72993b76c 日历tip文字加大 2016-10-25 13:36:18 +08:00
huang 8d53893a9b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 13:32:41 +08:00
huang f41696eaee 版本库创建跳转及显示 2016-10-25 13:32:22 +08:00
cxt 15b6aaf2a2 新建班级、新建课程增加tip说明 2016-10-25 13:21:01 +08:00
daiao b097f678a8 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 11:23:43 +08:00
daiao a0ba21b397 新版Issue编辑和新建页面 2016-10-25 11:23:02 +08:00
huang 4bb13a0d3c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 11:11:40 +08:00
huang a86ad7d99a 项目配置各种局部刷新（新建编辑提示等） 2016-10-25 11:11:25 +08:00
Tim e3ddfd1841 日历与甘特图宽度扩展 2016-10-25 10:42:29 +08:00
Tim 8876dcdcec 讨论区帖子编辑页面宽度扩展 2016-10-25 09:43:19 +08:00
Tim 968a132d80 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:30:56 +08:00
Tim 1738fee99f 资源库宽度扩展 2016-10-25 09:30:40 +08:00
daiao 1652ec9195 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:28:28 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
Tim 5f233d2f10 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:12:15 +08:00
Tim 1023f5301e 讨论区列表、讨论区详情、讨论区回复宽度扩展 2016-10-25 09:11:56 +08:00
huang 7a78bbdc45 新建版本、新建版本库正则JS撇配 2016-10-24 17:35:26 +08:00
cxt c962e3c18b 导入问卷后进入问卷再回退，再点击该问卷，页面报404 2016-10-24 17:35:06 +08:00
cxt cfeece0c76 新建班级样式调整 2016-10-24 17:21:09 +08:00
huang 651ea5d189 配置页面，里程碑编辑删除局部刷新以及标题为空JS判断 2016-10-24 16:36:08 +08:00
cxt 3d3b46f7f3 问卷：没有选定时，其它 选项的输入框禁用。选择了才可用 2016-10-24 16:01:46 +08:00
huang 38d30c1cca 项目配置页面冗余代码清理 2016-10-24 15:42:57 +08:00
huang d385123a93 里程碑添加导出功能 2016-10-24 15:42:22 +08:00
huang bb250af86c 里程碑导航js 2016-10-24 14:54:33 +08:00
huang d97c559e9c PULL Request部分功能 2016-10-24 14:34:54 +08:00
cxt c2a7ec4fc7 游客身份，隐藏讨论区二级栏目新建帖子的入口 2016-10-24 14:10:37 +08:00
cxt fcb1d4d115 打开分班名称编辑框后，点击其他分班名称或全部、未分班，数据刷新，但是编辑框未收起，应该收起 2016-10-24 14:02:09 +08:00
huang 76a3686f9f 项目动态message板块回复样式 2016-10-24 13:30:45 +08:00
huang a9cac4abf1 项目动态中message动态和users中动态分离 2016-10-24 12:15:27 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +08:00
Tim c44911c54f 項目討論區留言路徑跳轉更改 2016-10-24 11:26:12 +08:00
cxt e5377b63d9 问卷导入弹框页显示文字错误，“课程”→“班级” 2016-10-24 11:20:30 +08:00
cxt 9c4eed3cdd 分组作业的作品列表显示“X组已交” 2016-10-24 11:17:23 +08:00
cxt 40a895a786 issue动态附件点击后下载更新为直接查看 2016-10-24 10:57:40 +08:00
huang 7eeefecdef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-24 10:57:34 +08:00
huang be396d2ead 项目动态中message模块二级回复框架 2016-10-24 10:57:18 +08:00
cxt 3bc11cd5be 班级左侧导航的小分班增加“添加成员”的快捷按钮 2016-10-24 09:45:49 +08:00
daiao d2e6333ed6 里程碑列表 样式调整 2016-10-21 20:01:20 +08:00
yuanke b7cd1e8fa2 Merge branch 'cxt_course' into develop 2016-10-21 19:59:37 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
Tim ba1ef995fd 组织标题长单词显示不全bug 2016-10-21 19:38:52 +08:00
Tim ef141d82c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 19:33:18 +08:00
Tim a9a36d655e 提价作业界面长单词不折行bug 2016-10-21 19:33:08 +08:00
yuanke 5811f3944e 小班导出列表500BUG 2016-10-21 19:25:09 +08:00
yuanke 992f8f5f75 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 19:14:18 +08:00
yuanke f785fe4fbd 修改路由 2016-10-21 19:14:07 +08:00
daiao ce3845f110 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 19:05:14 +08:00
daiao e23b01f90c 项目里程碑详情页面的issue统计页面 2016-10-21 19:04:58 +08:00
Tim f730b48eac Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-21 18:40:43 +08:00
Tim 82dcd5db00 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 18:39:06 +08:00
Tim dbadf409df 作品完整性校验描述scroll显示 2016-10-21 18:38:53 +08:00
huang d61ffc958e pull request 2016-10-21 17:53:23 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang bdfa28e762 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 17:14:22 +08:00
huang 5ebd829dbf pull request列表及详情页面（详情未完） 2016-10-21 17:14:04 +08:00
Tim 6b6584d764 分组作业关联项目提示 2016-10-21 17:12:05 +08:00
daiao fa453090aa 项目里程碑详情页面 2016-10-21 16:16:26 +08:00
yuanke 7f99c2fdc5 Merge branch 'weixin_guange' into develop 2016-10-21 15:39:28 +08:00
Tim 20bba5bfe5 课程中不能删除创建班级教室title模拟 2016-10-21 15:37:26 +08:00
yuanke a363b89e32 点联系我们提示文字修改 2016-10-21 15:22:08 +08:00
Tim 912f70420a 讨论区帖子标题为长英文不折行bug修复 2016-10-21 14:56:48 +08:00
yuanke 0d885100b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:35:36 +08:00
huang 49c77312da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:23:20 +08:00
daiao 624cba3228 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:22:44 +08:00
daiao 64dd693e6f 项目里程碑详情页面 2016-10-21 14:22:14 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
huang d024bb1236 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:18:52 +08:00
huang 76b2ca1d7c pull_request index页面 2016-10-21 14:18:34 +08:00
yuanke 108c28be9d Merge branch 'weixin_guange' into develop 2016-10-21 14:12:19 +08:00
yuanke 1f0e8649b9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:07:14 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
huang 3ccff07bf0 项目动态issue模块删除的时候样式 2016-10-21 11:26:15 +08:00
huang 1f4e8ca931 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 11:20:08 +08:00
huang ac54d02bdc pull request 列表页面 2016-10-21 11:19:56 +08:00
Tim f4690f0cab 回复，二级回复，删除时，回复框宽度控制 2016-10-21 11:09:54 +08:00
huang 56cf1f9ba3 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 10:33:01 +08:00
huang 733a91d160 新版pull 新建功能 2016-10-21 10:32:38 +08:00
Tim 4156815394 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 09:23:14 +08:00
Tim 45d846ea79 讨论区动态宽度扩展 2016-10-21 09:22:54 +08:00
cxt f9505a24b9 题库发送的提示语不正确：应该是目标班级，而不是目标课程： 2016-10-21 08:59:16 +08:00
cxt f6e86866cb 个人主页调整 2016-10-21 08:55:17 +08:00
huang 4b2f0d4bca 里程碑完成百分比四舍五入 2016-10-20 18:14:09 +08:00
huang a3da43b793 里程碑列表 2016-10-20 18:08:24 +08:00
cxt b0d089f85c 编程作业报500 2016-10-20 17:46:33 +08:00
cxt 0ccb6b884a 编辑作业时分组作业的评分比例 2016-10-20 17:31:48 +08:00
cxt ab0280aa30 样式调整 2016-10-20 17:19:08 +08:00
cxt 5bfb99083c 主页中间导航过长 2016-10-20 17:17:19 +08:00
cxt 7cc96b1569 样式调整 2016-10-20 16:57:19 +08:00
cxt 07458b35d9 学生列表的排序箭头方向错误 2016-10-20 16:27:41 +08:00
cxt e8d7e64f80 主页子页面链接 2016-10-20 16:18:45 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 453e91dcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 14:24:13 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
huang cfbabf3eac 样式 2016-10-20 14:06:57 +08:00
huang df5458675e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 13:34:16 +08:00
huang 16b6c55637 注释掉id转换成登录名 2016-10-20 13:34:02 +08:00
daiao b45aec9134 项目配置-里程碑，版本库页面调整 2016-10-20 13:33:25 +08:00
cxt 59f0101a62 个人主页的链接改成登录名 2016-10-20 13:32:33 +08:00
huang 786110f711 还原 2016-10-20 13:31:05 +08:00
yuanke e802629d27 Merge branch 'develop' into weixin_guange 
Conflicts:
	app/models/student_work.rb
	app/models/student_work_test.rb
	app/views/blog_comments/show.html.erb
	public/javascripts/homework.js
 2016-10-20 13:28:23 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt dde8be3f94 主页内容自动识别链接 2016-10-19 20:13:26 +08:00
cxt 35caacf067 首页取消、添加关注不可用 2016-10-19 20:03:34 +08:00
cxt 251465ceb5 袁可 编程 2016-10-19 19:41:02 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt 26121d895f 袁可 编程测试 2016-10-19 18:09:29 +08:00
cxt 800aaf8853 隐藏博客首页 2016-10-19 18:07:19 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
daiao cf4d908c5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:43:12 +08:00
daiao 1c80a89b8d 项目配置样式调整 2016-10-19 17:43:05 +08:00
huang fbb2bfce91 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:35:46 +08:00
huang 601de5d67f 项目base中统计数字四舍五入，数字中添加链接 2016-10-19 17:35:33 +08:00
daiao 269c061053 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:56:36 +08:00
daiao a9fa958f7f 项目配置，信息与模块样式调整 2016-10-19 16:56:25 +08:00
huang 2425f7e159 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:35:45 +08:00
huang a722cb0031 超过1w的用k+ 2016-10-19 16:35:26 +08:00
Tim 6b04c9144e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:29:15 +08:00
Tim 783ef3eae1 创建项目动态宽度调整 2016-10-19 16:29:04 +08:00
huang da78adc697 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:52:11 +08:00
huang c34209534d 版本库展开文件目录异步刷新 2016-10-19 15:51:55 +08:00
Tim a3126870a1 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:48:00 +08:00
Tim ae9a6eb928 版本库查看文件页面宽度调整 2016-10-19 15:47:50 +08:00
daiao c829749849 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:35:49 +08:00
daiao 7499f4659d 项目配置，成员界面，点击操作-编辑按钮，角色出现下拉列表框 2016-10-19 15:35:37 +08:00
huang 5571fb0f90 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:18:56 +08:00
huang 97172ed76f 版本库异步加载 2016-10-19 15:18:26 +08:00
Tim af5db3713c issue详情页面，属性页面，回复页面，二级回复页面宽度调整 2016-10-19 14:57:31 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
Tim e4a6a5f58d 项目issue状态宽度调整 2016-10-19 11:17:34 +08:00
yuanke b907b626a9 代码测试结果不全分数100分的BUG修复 2016-10-19 10:27:40 +08:00
Tim 10e9194032 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 10:18:50 +08:00
Tim 6fbb6629d7 动态issue回复宽度扩展 2016-10-19 10:17:56 +08:00
huang 89292054c8 项目动态讨论区模块独立出来 2016-10-19 09:57:17 +08:00
huang 3750252f39 项目创建信息与用户动态中分支 2016-10-19 09:35:53 +08:00
huang 83eaa4d9db Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 09:30:37 +08:00
huang 0305676896 项目动态附件信息分离 2016-10-19 09:30:22 +08:00
Tim b9703a4125 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 17:30:18 +08:00
Tim a58cebdf5c 提交改动页面宽度扩展 2016-10-18 17:30:07 +08:00
daiao daf0263be9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 17:22:52 +08:00
daiao 61ad05a379 项目配置界面 2016-10-18 17:09:00 +08:00
Tim ba7c9a33b6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:40:35 +08:00
huang 23ff82a8cd Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:24:49 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +08:00
huang bb9ba14c47 base 2016-10-19 14:47:22 +08:00
huang 1379959af8 Merge branch 'develop' into dev_newproject 2016-10-19 14:46:02 +08:00
huang bf3506002b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 14:43:25 +08:00
huang 590e639112 新版项目issue模块 2016-10-19 14:43:07 +08:00
Tim aa379980d7 版本库显示页面宽度扩展 2016-10-18 15:40:23 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
yuanke c0e6085e74 注册时登录名改为只能字母和数字、字母开头4-15长度 2016-10-18 14:47:06 +08:00
Tim 5844af922e 项目动态宽度扩展 2016-10-18 13:34:28 +08:00
Tim 622fa382ca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 11:30:57 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
huang e3ef502be2 版本库删除功能 2016-10-19 10:09:38 +08:00
huang 72ce5a51ed 新版项目顶部样式JS控制 2016-10-19 10:01:14 +08:00
huang e276559286 项目show附件类型新版块 2016-10-19 09:24:07 +08:00
huang a0811ec14c project show中添加邀请码 2016-10-19 09:14:32 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
 2016-10-19 08:53:38 +08:00
Tim fb9e1a02df 项目动态宽度调整 2016-10-18 11:30:42 +08:00
cxt 8648ea605f 问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
yuanke e999cac944 取消博客的设为首页功能 2016-10-18 10:09:25 +08:00
cxt 750a9c9d38 问卷答题报网络异常 2016-10-15 19:34:58 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制；更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
Tim 6ae066937d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:48:02 +08:00
Tim 16bedc3d8f 项目资源库弹窗位置及样式js控制 2016-10-15 15:47:48 +08:00
cxt 61bfe405f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:35:13 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
cxt a709f5c720 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:16:39 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
Tim 0c481de79d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 13:41:45 +08:00