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
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
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +08:00
huang 106e77409b Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-10-15 12:36:42 +08:00
huang 8005958f03 删除版本刷新 2016-10-15 12:35:36 +08:00
huang 6dbb50f803 确定按钮变成手型 2016-10-15 11:34:06 +08:00
huang 50ba2fb04f 多个历史版本和没有历史版本删除附件提醒 2016-10-15 11:31:15 +08:00
huang da7de2c2a2 更新版本中隐藏删除 2016-10-15 11:12:12 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
daiao f8638d173a 项目配置，成员列表功能 2016-10-15 10:48:24 +08:00
huang f1e4628e75 组织添加历史版本删除功能 2016-10-15 09:17:47 +08:00
huang 7e1d871cf0 更新资源刷新 2016-10-15 09:04:19 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
huang 3db29cd40b J解决重复提交问题 2016-10-14 21:10:58 +08:00
daiao 3ceee6522b 还原新建贴吧报贴吧名已存在的问题 2016-10-14 21:05:40 +08:00
daiao 64d446e480 还原组织一级栏目列表 2016-10-14 20:35:51 +08:00
cxt d5eea455e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:53 +08:00
Tim 162838dae6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:04 +08:00
Tim 9ce87808c8 里程碑编辑页面样式添加 2016-10-14 20:30:52 +08:00
huang 3a1ab607fa 附件重复提交问题 2016-10-14 20:25:14 +08:00
huang 91ee5a0d9f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 19:21:54 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
Tim 71f43c757f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 18:25:44 +08:00
Tim 981e1eb358 问卷宽度减少，编辑按钮可见 2016-10-14 18:25:35 +08:00
cxt 5870c3eaaf 子栏目讨论区列表的排序、作品内容的样式调整 2016-10-14 18:24:54 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
cxt 2d7c7dc05d 左侧讨论区子栏目的样式修改 2016-10-14 17:13:26 +08:00
cxt 89307f9e84 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 17:05:55 +08:00
cxt 5b5bfe005e 新增栏目名称过长时添加失败 2016-10-14 17:05:47 +08:00
Tim 7f7f786aa0 资源库描述文字折行 2016-10-14 16:59:50 +08:00
Tim 75a68e9844 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:34:09 +08:00
Tim a302dcca04 匿评分数tip 2016-10-14 16:33:56 +08:00
cxt ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
cxt 2d508254ac 51、94用户个人主页报500 2016-10-14 16:16:35 +08:00
Tim 8aaab44697 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:13:44 +08:00
Tim 2955d07f7c 分数显示tip 2016-10-14 16:13:30 +08:00
huang 446f0d142c Merge branch 'rep_quality' into develop 2016-10-14 16:11:49 +08:00
cxt 38d43cfb67 必答不应换行 2016-10-14 16:11:46 +08:00
huang caa54c77a2 解决issue的冲突 2016-10-14 16:00:40 +08:00
cxt 9810539e84 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/poll/_show_head.html.erb
 2016-10-14 15:58:11 +08:00
cxt 45008d9868 班级问卷：鼠标点击描述框，光标却自动定位到第二行了 2016-10-14 15:55:47 +08:00
Tim 0859f86518 空问卷头部编辑按钮位置更改 2016-10-14 15:46:15 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
cxt 6b7ca9c84d 问卷调查：编辑（笔）图标按钮建议改成当鼠标移上去时才显示、多选题不显示的bug 2016-10-14 15:30:44 +08:00
Tim e72b2de6e2 长单词强制折行 2016-10-14 15:29:07 +08:00
cxt 5f04baf572 博客动态回复显示：“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +08:00
huang 0c137515c1 项目、组织存在历史版本一键删除功能 2016-10-14 15:08:29 +08:00
cxt f87e335acf 课程大纲、作业二级回复不可用 2016-10-14 15:01:36 +08:00
huang 333c9c6db0 项目历史版本一键删除功能 2016-10-14 15:01:22 +08:00
Tim 2735aca331 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-14 14:51:09 +08:00
Tim 86de58f793 问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整 2016-10-14 14:50:51 +08:00
huang b408b6ef97 组织历史版本删除功能 2016-10-14 14:46:48 +08:00
cxt d7a17868ad 去掉问卷描述的字数限制 2016-10-14 14:38:26 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +08:00
daiao c26af37456 管理员界面项目列表可以按状态进行搜索功能；游客身份，班级留言右侧“+"隐藏 2016-10-14 09:29:53 +08:00
huang dcbeea6dff 版本库可见权限优化 2016-10-14 09:01:25 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
yuanke bb0833c054 issue 2016-10-13 14:51:35 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
cxt f56fc5a44d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-13 14:25:36 +08:00
cxt 252da9c3d3 Merge branch 'cs_optimize_txz' into develop 2016-10-13 14:24:01 +08:00
yuanke 1afa774fa9 Merge branch 'weixin_guange' into develop 2016-10-13 14:23:52 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
 2016-10-13 14:22:05 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt 39151c0e65 班级-多重角色的显示错误：当一个成员的身份是：助教和学生时，角色切换按钮显示的是“学生身份”和“教师身份” 正确的应该是“学生身份”和“助教身份” 2016-10-13 14:14:32 +08:00
cxt b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +08:00
cxt 018a27f307 课程大纲的教师团队：创建班级数与参与班级数均为该老师在本课程下的创建班级数与参与班级数 2016-10-13 14:05:50 +08:00
cxt b240f801b8 创建班级，和班级设置里面，开始学期和结束学期的范围，请往前扩大3年 2016-10-13 11:30:41 +08:00
cxt 59f2478cae 首页动态过滤 “课程动态” -》“班级动态” 2016-10-13 11:25:26 +08:00
cxt d87e4f368a 学生答完问卷后的显示界面调整，提交问卷时的必答题的判断，新建题目时先不输入标题会提示“标题不能为空”、接着输入标题后依然提示“标题不能为空” 2016-10-13 11:22:38 +08:00
huang e2ee75d8c1 项目宽版架构优化（主要是model及与课程等模块的分离） 2016-10-13 10:52:48 +08:00
huang 39cc6c36ea issue详情显示调整 2016-10-13 10:17:54 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
yuanke 0265b6bfb7 搜索分页修改 2016-10-13 09:52:05 +08:00
Tim 746e27903e 版本显示与提交变更页面宽度调整 2016-10-13 09:49:34 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00
yuanke 068a66ac35 搜索修改 2016-10-13 09:42:53 +08:00
daiao 07b98bae5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-13 09:28:47 +08:00
daiao a0aa34b533 项目设置，模块页面 2016-10-13 09:28:33 +08:00
yuanke 9911faaa49 优化下回复相关的微信动态 2016-10-13 09:25:18 +08:00
huang edf2a059e8 Merge branch 'develop' into rep_quality 2016-10-13 09:00:35 +08:00
yuanke 5ac30fe09c Merge branch 'cxt_replies' into weixin_guange 2016-10-13 08:49:20 +08:00
yuanke a7aa0b3a84 微信回复加上root_id 2016-10-13 08:47:55 +08:00
Tim 8459779e6f 个人主页签名折行显示 2016-10-12 17:26:53 +08:00
huang b9b20ccc59 项目配置，各个页面高度JS控制 2016-10-12 17:18:35 +08:00
yuanke e52026142a 主页搜索功能的下一页修改 2016-10-12 17:10:38 +08:00
Tim 63a496d0d3 博客详情页面全文显示 2016-10-12 17:04:16 +08:00
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 4348ae653f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:05 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
daiao b925ee312e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 16:28:02 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
huang fabe6bd999 项目配置过短的时候JS控制底端留白 2016-10-12 14:38:46 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00