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

14057 Commits

Author SHA1 Message Date
Tim 97d79f1233 新建项目对齐 2016-10-31 14:49:23 +08:00
huang a2a40558f1 项目新建添加KE及样式调整 2016-10-31 14:39:50 +08:00
huang 5f078bbe94 Merge branch 'develop' into dev_newproject 2016-10-31 13:51:01 +08:00
huang 51eb550c78 邀请码颜色调整 2016-10-31 13:45:22 +08:00
huang 236665a739 issue动态回复中 回复框不见的问题 2016-10-31 13:35:49 +08:00
huang 74766e5e15 如何提交代码弹出新的页面 2016-10-31 13:22:48 +08:00
huang 60c064d27b 项目样式修改 2016-10-31 11:33:23 +08:00
huang c02b16e9c5 解决管理员访问项目配置500问题 2016-10-31 11:06:44 +08:00
huang 3d46085376 解决项目描述下面对于的空白 2016-10-31 10:51:44 +08:00
Tim 899e3c84a2 项目版本库底部文字清除浮动 2016-10-31 10:41:13 +08:00
cxt 157cf4262f 学生查看问卷答题结果时按题号排序 2016-10-31 10:41:00 +08:00
huang 00784e6587 个人主页指派给为空链接去掉 2016-10-28 19:13:09 +08:00
huang c64822d7a1 未指派链接问题 2016-10-28 19:05:39 +08:00
huang 6a113bdd7e 版本库一周统计导出去掉空格 2016-10-28 18:57:37 +08:00
huang 3e497d8621 Merge branch 'dev_newproject' into develop 2016-10-28 18:48:13 +08:00
daiao 34bcfd14b1 新建ISSUE选择提示修改 2016-10-28 18:47:23 +08:00
huang d5e2ae9407 Merge branch 'cxt_course' into develop 2016-10-28 18:42:29 +08:00
cxt 557f5d4e26 新建班级、新建课程的提示 2016-10-28 18:36:35 +08:00
huang d3599602d5 导出统计结果链接颜色 2016-10-28 18:34:06 +08:00
cxt 9f702bae1e 删除分班弹框的样式调整 2016-10-28 18:21:03 +08:00
cxt 0dbf8c7a8a 删除分班时更新班级的左侧导航 2016-10-28 18:18:14 +08:00
cxt 9b89b59d60 添加分班无反应 2016-10-28 18:16:35 +08:00
huang f6a37d903a Merge branch 'dev_newproject' into develop 2016-10-28 18:06:38 +08:00
huang 72f75b41d0 Merge branch 'cxt_course' into develop 2016-10-28 18:06:12 +08:00
daiao d6927f1598 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 18:05:10 +08:00
huang df07914fbc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-28 18:05:02 +08:00
daiao de63f6fbbc issue 指派给为空时，样式错误 2016-10-28 18:04:56 +08:00
huang d76ce0706e 统计页面JS实现 2016-10-28 18:04:49 +08:00
cxt 2a1549457b 学生身份成员应该在左侧导航处看到讨论区新建帖子的入口 2016-10-28 17:58:16 +08:00
cxt 21655565ea 班级分班进行删除时，根据是否有成员，做不同的提示 2016-10-28 17:49:09 +08:00
yuanke e018e301ef 项目关注BUG修改 2016-10-28 17:47:21 +08:00
cxt cfea5e9da4 分组作业的提示 2016-10-28 17:10:13 +08:00
huang df47c09fa4 版本库一些细节调整 2016-10-28 16:53:02 +08:00
huang 27cbfc712f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 16:39:32 +08:00
daiao 1279c27ffd Issue统计页面 2016-10-28 16:38:53 +08:00
huang 157d65826f 收藏用户列表的一些调整 2016-10-28 16:36:59 +08:00
huang 738d473ce1 里程碑统计数加上title及项目样式 2016-10-28 16:32:46 +08:00
huang 459c592f68 项目名称样式调整 2016-10-28 16:20:36 +08:00
huang 638205a7b7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-28 16:07:04 +08:00
huang 3af78a4b74 用户注册回调优化 2016-10-28 16:06:41 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang bab1cbea5d 新建issue里程碑不能选中的问题 2016-10-28 15:55:55 +08:00
huang 3699ddd398 pull request统计数显示所有 2016-10-28 15:47:05 +08:00
cxt d8cf9159c8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-28 15:42:56 +08:00
cxt 4d88fe727b 问卷 2016-10-28 15:42:45 +08:00
huang fe9731c11c MESSAGE中描述 2016-10-28 15:32:05 +08:00
daiao 79df11bc0c 项目Isuue列表，鼠标经过时，编辑与删除展示；配置成员中，点击编辑角色后，增加失去焦点属性。 2016-10-28 15:30:03 +08:00
huang 8b2c139a21 项目讨论区主题超出边框问题 2016-10-28 15:10:49 +08:00
huang 45c83a2219 讨论区标题过短问题 2016-10-28 15:08:06 +08:00
huang 540c8ffa8e 标题过长 2016-10-28 14:43:59 +08:00
huang c72236b87b 新建版本库中去掉新建 2016-10-28 14:29:18 +08:00
huang 68c0999a58 删除无版本库的项目报错 2016-10-28 14:24:26 +08:00
huang b0b5e203b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-28 14:20:12 +08:00
huang d2138dd872 里程碑中增加创建者、项目私有公开显示特性 2016-10-28 14:20:00 +08:00
yuanke abbf39848b Merge branch 'yuanke_youhua' into develop 2016-10-28 13:23:59 +08:00
huang 58da3924ab pull request设计效果验证修改 2016-10-28 12:28:41 +08:00
daiao 2aa1a3b8c9 issue列表最后一条issue下方的线条有两根，请去除虚线 2016-10-28 12:26:07 +08:00
huang 40620d139d 项目附件动态展开更多过滤条件中含有issue问题 2016-10-28 11:04:12 +08:00
daiao 9749d11314 Issue列表，点击清楚按钮Tab页错误的问题 2016-10-28 10:46:33 +08:00
huang 7e2834f680 退出项目成员以及项目邀请码显示权限 2016-10-28 10:46:00 +08:00
daiao 45f8b18270 Issue列表样式调整 2016-10-28 10:39:09 +08:00
Tim 2138b1cd56 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-28 10:38:05 +08:00
Tim 5f04358498 追加附件理由长单词折行 2016-10-28 10:37:52 +08:00
huang 52ae2ef5a3 解决项目收藏500问题 2016-10-28 10:18:30 +08:00
huang 279937a14e 项目描述全英文不换行问题 2016-10-28 10:02:44 +08:00
huang fbfe0038ee Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 09:44:03 +08:00
huang 03b8d081ce 一些细节的修改 2016-10-28 09:43:30 +08:00
huang 4df7e41515 里程碑详情局部刷新 2016-10-28 09:20:04 +08:00
daiao 1658682f5e 1.里程碑详情页面，当无里程碑结束时间时，历程详情页面右边单纯只有一个闹钟 2016-10-28 09:19:55 +08:00
huang a741bf70fb 配置鼠标经过变手型 2016-10-28 09:12:59 +08:00
huang 225b80d3b3 质量分析页面导航变色 2016-10-28 09:05:37 +08:00
daiao 3d5509593b 配置页面，里程碑页面点击名字跳错路径 2016-10-28 09:04:16 +08:00
cxt 8d1673d0ea Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-27 18:25:54 +08:00
cxt cc2ef93808 多选题的上限 2016-10-27 18:25:47 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
huang 8bc5d6edca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 17:32:46 +08:00
daiao f945896e06 还原 二级回复宽度 2016-10-27 17:32:20 +08:00
huang 8706d3b791 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 17:30:35 +08:00
huang d42417d9d5 里程碑编辑路径跳转 2016-10-27 17:30:22 +08:00
daiao 5089d2f9fd 里程碑列表排序，Issue详情回复宽度 2016-10-27 17:24:28 +08:00
Tim 8b2b6c2dfb 多选题插入与编辑页面加入限制样式 2016-10-27 16:59:34 +08:00
huang ee275455de 各个页面里程碑的新建跳转 2016-10-27 16:33:00 +08:00
cxt df4bb86cdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/poll/_show_mulit.html.erb
 2016-10-27 15:39:26 +08:00
cxt 2bd044bea7 问卷 2016-10-27 15:38:10 +08:00
Tim 437512a6d8 多行主观样式调整 2016-10-27 15:25:53 +08:00
Tim 36501a5f5e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-27 15:19:34 +08:00
Tim 4205cbf6de 多行主观样式调整 2016-10-27 15:19:26 +08:00
cxt 26d36358a9 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-27 15:12:00 +08:00
cxt c79676d426 问卷的上移、下移 2016-10-27 15:11:52 +08:00
huang 86c977ca2d issue为空是时候导出不显示 2016-10-27 15:10:52 +08:00
Tim c7c73ccfcb 多选题默认限制为空 2016-10-27 15:10:23 +08:00
Tim ae0db01569 插入题目菜单显隐控制；多选题答题限制js 2016-10-27 15:07:46 +08:00
huang f0b43a603e issue详情中样式问题 2016-10-27 15:04:20 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
yuanke 5d3ab1bb09 优化头像地址获取代码、屏蔽头像card代码 2016-10-27 14:30:07 +08:00
cxt a00fd27eee 问卷调整 2016-10-27 13:57:03 +08:00
yuanke 5595b45670 代码查重结果中加一行提示 2016-10-27 13:51:12 +08:00
huang d8f30f4dbe Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 12:39:56 +08:00
huang 05b206a7cf 收藏者列表 2016-10-27 12:39:44 +08:00
daiao 025ec0c9f1 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
 2016-10-27 11:17:23 +08:00
huang 0272e95eb7 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 11:17:15 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
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