Commit Graph

14466 Commits

Author SHA1 Message Date
huang 8d56d8556f 完成模式6 2016-05-31 16:03:48 +08:00
txz 7e93518d41 app.js配置 2016-05-31 14:56:24 +08:00
txz e121d7d927 二级回复显示边框区分 2016-05-31 14:55:25 +08:00
huang bb7204846f 新版资源类型定制模式6 2016-05-31 14:41:50 +08:00
txz 80452ceef9 app.js文件更改 2016-05-31 14:38:55 +08:00
txz 91be3b9f85 回复提交时按钮变灰 2016-05-31 14:37:45 +08:00
cxt 796125bd1c 修改微信端的时间提示 2016-05-31 14:18:40 +08:00
huang 6bfe344cbf 组织模式一左侧权限控制 2016-05-31 13:59:29 +08:00
txz f166a951f3 详情页面文字格式问题 2016-05-31 13:49:39 +08:00
huang 8f897cbf89 组织管理员模式,二级目录局部刷新 2016-05-31 13:47:05 +08:00
huang c369b271a0 组织管理员配置后的权限控制及局部刷新 2016-05-31 11:24:47 +08:00
cxt 79c106a1c6 微信动态的缺失 2016-05-31 11:04:20 +08:00
txz 19de82359a 微信进入详情页面显示加载中 2016-05-31 10:53:11 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
cxt 30f1d87fbf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-31 08:57:39 +08:00
cxt c421933cf6 微信最新动态 2016-05-31 08:57:08 +08:00
guange 858ad47338 作业长度定为50 2016-05-30 18:40:22 +08:00
guange acc323e46d issue7890解决 2016-05-30 18:35:47 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
cxt f024764e29 课内学生看到的学生列表中学生“姓名”不应显示昵称 2016-05-30 14:59:05 +08:00
huang 471ed7cbd2 组织logo获取,添加样式图片 2016-05-30 14:58:46 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +08:00
huang 81ab73e286 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
2016-05-30 14:48:12 +08:00
huang 698e4bd7b3 header 2016-05-30 14:41:53 +08:00
Tim 9cc749bd57 门户样式统一,防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
huang 389172e5b2 CSS样式 2016-05-30 10:45:00 +08:00
guange 8b623e3a0c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-27 22:59:11 +08:00
guange bb30709fa1 window close 2016-05-27 22:54:57 +08:00
guange 63b9aaefe2 window close 2016-05-27 22:22:09 +08:00
guange be94d445a9 window close 2016-05-27 22:19:49 +08:00
guange 4561bdfd0d code=>params[:code] 2016-05-27 22:18:03 +08:00
guange 4137fe07f3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-27 22:14:55 +08:00
guange 622d71c476 已绑定成功的,直接提示 2016-05-27 22:14:41 +08:00
cxt 0cafebb3a2 新闻列表的点赞 2016-05-27 17:14:37 +08:00
huang 94dd8befc8 Merge branch 'yuanke' into develop 2016-05-27 17:13:39 +08:00
huang f7cb9bdffd Merge branch 'cxt_course' into develop 2016-05-27 17:13:01 +08:00
huang 4a8288d720 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-27 17:12:49 +08:00
huang 12ac353de9 北斗新base 2016-05-27 17:08:50 +08:00
yuanke e650dca1ed 修改用户反馈中二级回复 回复框不消失的问题 2016-05-27 17:06:34 +08:00
cxt 086ccedc08 先隐藏作业信息,再点击查询或分班后“显示作业信息”的按钮不见了 2016-05-27 16:45:04 +08:00
yuanke 98244d2a3d 将文章标题的颜色恢复正常 2016-05-27 16:42:05 +08:00
cxt 1535c4cd07 编辑分组作业时的基于项目实施总是默认选中 2016-05-27 15:54:55 +08:00
yuanke 5b7011e07b Merge branch 'develop' into yuanke 2016-05-27 15:37:11 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/project.css
2016-05-27 15:34:55 +08:00
yuanke 9d9e2ff613 自动识别URL正则匹配修改 2016-05-27 15:31:13 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang 5e2a4342fa Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-27 15:30:19 +08:00
huang 3ba4d09336 Merge branch 'weixin_guange' into develop 2016-05-27 15:29:25 +08:00
huang a207f48b94 Merge branch 'hjq_mail' into develop
Conflicts:
	app/models/news.rb
2016-05-27 15:27:02 +08:00